diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml
index 84793f87f27e3f52166e0d848e810e2470506f7a..c1805653e936959b63cc81535872d00c7a0836f1 100644
--- a/app/src/main/res/layout/custom_preference.xml
+++ b/app/src/main/res/layout/custom_preference.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2022  MURENA SAS
   ~ Copyright (C) 2021  E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -52,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
-                android:layout_marginEnd="21dp"
+                android:layout_marginEnd="16dp"
                 android:gravity="end"
                 android:text="@string/terms_services"
                 android:textColor="@color/colorAccent"
@@ -102,7 +104,7 @@
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="10dp"
+                android:layout_marginEnd="16dp"
                 android:text="@string/logout"
                 android:textSize="14sp"
                 app:layout_constraintBottom_toBottomOf="@id/avatar"
diff --git a/app/src/main/res/layout/layout_custom_checkbox_preference.xml b/app/src/main/res/layout/layout_custom_checkbox_preference.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa82ea7f32527796cc25223ea731b10c8fddac96
--- /dev/null
+++ b/app/src/main/res/layout/layout_custom_checkbox_preference.xml
@@ -0,0 +1,71 @@
+<!--
+  ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2022  MURENA SAS
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="24dp">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="0dip"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:maxLines="4"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary" />
+    </RelativeLayout>
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_category_material.xml b/app/src/main/res/layout/preference_category_material.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9acd4195f94eb34dedac573c3c3371ac0125bbc4
--- /dev/null
+++ b/app/src/main/res/layout/preference_category_material.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2022  MURENA SAS
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources"
+    android:id="@android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="0dip"
+    android:textAppearance="@android:style/TextAppearance.Material.Body2"
+    android:textColor="?android:attr/colorAccent"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+    android:paddingTop="32dip"
+    android:paddingBottom="16dip" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_widget_checkbox.xml b/app/src/main/res/layout/preference_widget_checkbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4fa5dee95b3d4d725c16cf5b49b46e7d2aa3ea72
--- /dev/null
+++ b/app/src/main/res/layout/preference_widget_checkbox.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (C) 2022  MURENA SAS
+  ~
+  ~   This program is free software: you can redistribute it and/or modify
+  ~   it under the terms of the GNU General Public License as published by
+  ~   the Free Software Foundation, either version 3 of the License, or
+  ~   (at your option) any later version.
+  ~
+  ~   This program is distributed in the hope that it will be useful,
+  ~   but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~   GNU General Public License for more details.
+  ~
+  ~   You should have received a copy of the GNU General Public License
+  ~   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources"
+    android:id="@android:id/checkbox"
+    android:layout_width="25dp"
+    android:layout_height="25dp"
+    android:focusable="false"
+    android:clickable="false"
+    android:background="@null" />
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1e6723b29c856b158095134f86b4375aa4f3b6c4..1523963d7bc133cbf4c0a663befc70e5da905534 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,6 @@
 <!--
   ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2022  MURENA SAS
   ~ Copyright (C) 2021  E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -36,6 +37,7 @@
 
     <style name="CustomPreferenceThemeOverlay" parent="PreferenceThemeOverlay">
         <item name="android:layout">@layout/custom_preference</item>
+        <item name="iconSpaceReserved">false</item>
     </style>
 
     <style name="AppTheme.ActionBarStyle" parent="Widget.MaterialComponents.ActionBar.Surface">
diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index 8aa5f70520c0b479c3af5da6f99f7d2515990514..90bf05a8f4b1d954448af2cba4136aa7de4e7013 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -1,5 +1,6 @@
 <!--
   ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2022  MURENA SAS
   ~ Copyright (C) 2021  E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -20,9 +21,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:iconSpaceReserved="false">
     <PreferenceCategory
         android:title="@string/preference_updates_title"
+        app:allowDividerBelow="true"
         app:iconSpaceReserved="false">
         <ListPreference
             android:defaultValue="@string/preference_update_interval_default"
@@ -30,6 +33,7 @@
             android:entries="@array/update_interval_names"
             android:entryValues="@array/update_interval_values"
             android:key="@string/update_check_intervals"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:summary="%s"
             android:title="@string/preference_update_interval_title"
             app:iconSpaceReserved="false" />
@@ -37,6 +41,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/updateNotify"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:summary="@string/preference_update_notify_available_description"
             android:title="@string/preference_update_notify_available_title"
             app:iconSpaceReserved="false" />
@@ -44,6 +49,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/auto_install_enabled"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:summary="@string/preference_update_install_automatically_description"
             android:title="@string/preference_update_install_automatically_title"
             app:iconSpaceReserved="false" />
@@ -51,6 +57,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/only_unmetered_network"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:summary="@string/preference_update_wifi_only_description"
             android:title="@string/preference_update_wifi_only_title"
             app:iconSpaceReserved="false" />
@@ -63,6 +70,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showFOSSApplications"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:title="@string/show_only_open_source_apps"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
@@ -70,6 +78,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showPWAApplications"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:title="@string/show_only_pwa_apps"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
@@ -77,6 +86,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="showAllApplications"
+            android:layout="@layout/layout_custom_checkbox_preference"
             android:title="@string/Show_common_apps"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />