diff --git a/app/src/main/res/drawable/ic_calendar_today.xml b/app/src/main/res/drawable/ic_calendar_today.xml
new file mode 100644
index 000000000..714f97c91
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_today.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,10h16v11zM20,8L4,8L4,5h16v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_extension.xml b/app/src/main/res/drawable/ic_extension.xml
new file mode 100644
index 000000000..95025044c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_extension.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M10.5,4.5c0.28,0 0.5,0.22 0.5,0.5v2h6v6h2c0.28,0 0.5,0.22 0.5,0.5s-0.22,0.5 -0.5,0.5h-2v6h-2.12c-0.68,-1.75 -2.39,-3 -4.38,-3s-3.7,1.25 -4.38,3H4v-2.12c1.75,-0.68 3,-2.39 3,-4.38 0,-1.99 -1.24,-3.7 -2.99,-4.38L4,7h6V5c0,-0.28 0.22,-0.5 0.5,-0.5m0,-2C9.12,2.5 8,3.62 8,5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8h0.29c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-0.3c0,-1.49 1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7v0.3H17c1.1,0 2,-0.9 2,-2v-4c1.38,0 2.5,-1.12 2.5,-2.5S20.38,11 19,11V7c0,-1.1 -0.9,-2 -2,-2h-4c0,-1.38 -1.12,-2.5 -2.5,-2.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_remote.xml b/app/src/main/res/drawable/ic_settings_remote.xml
new file mode 100644
index 000000000..31311b28e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_remote.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M15,9L9,9c-0.55,0 -1,0.45 -1,1v12c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L16,10c0,-0.55 -0.45,-1 -1,-1zM14,21h-4L10,11h4v10z"/>
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M12,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M7.05,6.05l1.41,1.41C9.37,6.56 10.62,6 12,6s2.63,0.56 3.54,1.46l1.41,-1.41C15.68,4.78 13.93,4 12,4s-3.68,0.78 -4.95,2.05zM12,0C8.96,0 6.21,1.23 4.22,3.22l1.41,1.41C7.26,3.01 9.51,2 12,2s4.74,1.01 6.36,2.64l1.41,-1.41C17.79,1.23 15.04,0 12,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_smart_button.xml b/app/src/main/res/drawable/ic_smart_button.xml
new file mode 100644
index 000000000..714ac4b7d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_smart_button.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M22,9v6c0,1.1 -0.9,2 -2,2h-1l0,-2h1V9H4v6h6v2H4c-1.1,0 -2,-0.9 -2,-2V9c0,-1.1 0.9,-2 2,-2h16C21.1,7 22,7.9 22,9zM14.5,19l1.09,-2.41L18,15.5l-2.41,-1.09L14.5,12l-1.09,2.41L11,15.5l2.41,1.09L14.5,19zM17,14l0.62,-1.38L19,12l-1.38,-0.62L17,10l-0.62,1.38L15,12l1.38,0.62L17,14zM14.5,19l1.09,-2.41L18,15.5l-2.41,-1.09L14.5,12l-1.09,2.41L11,15.5l2.41,1.09L14.5,19zM17,14l0.62,-1.38L19,12l-1.38,-0.62L17,10l-0.62,1.38L15,12l1.38,0.62L17,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_switch_left.xml b/app/src/main/res/drawable/ic_switch_left.xml
new file mode 100644
index 000000000..087110caf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_switch_left.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M8.5,8.62v6.76L5.12,12L8.5,8.62M10,5l-7,7l7,7V5L10,5zM14,5v14l7,-7L14,5z"/>
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_buttonactions.xml b/app/src/main/res/xml/devicesettings_buttonactions.xml
index e8353657a..563b9d189 100644
--- a/app/src/main/res/xml/devicesettings_buttonactions.xml
+++ b/app/src/main/res/xml/devicesettings_buttonactions.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
         android:key="screen_button_actions"
+        android:icon="@drawable/ic_smart_button"
         android:persistent="false"
         android:summary="@string/mi2_prefs_button_actions_summary"
         android:title="@string/mi2_prefs_button_actions">
diff --git a/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml b/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
index 63e0034aa..56dda4f39 100644
--- a/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
+++ b/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
         android:key="screen_button_actions"
+        android:icon="@drawable/ic_smart_button"
         android:persistent="false"
         android:summary="@string/mi2_prefs_button_actions_summary"
         android:title="@string/mi2_prefs_button_actions">
diff --git a/app/src/main/res/xml/devicesettings_device_actions.xml b/app/src/main/res/xml/devicesettings_device_actions.xml
index ede0833eb..73a44bbb7 100644
--- a/app/src/main/res/xml/devicesettings_device_actions.xml
+++ b/app/src/main/res/xml/devicesettings_device_actions.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
         android:key="screen_events_forwarding"
+        android:icon="@drawable/ic_extension"
         android:persistent="false"
         android:summary="@string/prefs_events_forwarding_summary"
         android:title="@string/prefs_events_forwarding_title">
diff --git a/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml b/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml
index 4a5ab035c..38458b217 100644
--- a/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml
+++ b/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
         android:defaultValue="false"
+        android:icon="@drawable/ic_settings_remote"
         android:key="expose_hr_thirdparty"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_expose_hr"
diff --git a/app/src/main/res/xml/devicesettings_sync_calendar.xml b/app/src/main/res/xml/devicesettings_sync_calendar.xml
index 58c66b1b9..1d6c3ae34 100644
--- a/app/src/main/res/xml/devicesettings_sync_calendar.xml
+++ b/app/src/main/res/xml/devicesettings_sync_calendar.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
         android:defaultValue="false"
+        android:icon="@drawable/ic_calendar_today"
         android:key="sync_calendar"
         android:summary="@string/pref_summary_sync_calendar"
         android:title="@string/pref_title_sync_caldendar" />
diff --git a/app/src/main/res/xml/devicesettings_wearlocation.xml b/app/src/main/res/xml/devicesettings_wearlocation.xml
index 7dfa3c3e6..8452ffc63 100644
--- a/app/src/main/res/xml/devicesettings_wearlocation.xml
+++ b/app/src/main/res/xml/devicesettings_wearlocation.xml
@@ -3,6 +3,7 @@
 
     <ListPreference
         android:defaultValue="left"
+        android:icon="@drawable/ic_switch_left"
         android:entries="@array/wearside"
         android:entryValues="@array/wearside_values"
         android:key="wearlocation"