diff --git a/app/src/main/assets/shortcut_black.svg b/app/src/main/assets/shortcut_black.svg
new file mode 100644
index 000000000..0de5b3085
--- /dev/null
+++ b/app/src/main/assets/shortcut_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><path d="M15,5l-1.41,1.41L15,7.83L17.17,10H8c-2.76,0-5,2.24-5,5v4h2v-4c0-1.65,1.35-3,3-3h9.17L15,14.17l-1.41,1.41L15,17l6-6 L15,5z"/></g></svg>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_beep.xml b/app/src/main/res/drawable/ic_beep.xml
new file mode 100644
index 000000000..b47055417
--- /dev/null
+++ b/app/src/main/res/drawable/ic_beep.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4L14,7h4L18,3h-6zM10,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bolt.xml b/app/src/main/res/drawable/ic_bolt.xml
new file mode 100644
index 000000000..6aed899d5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bolt.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,21h-1l1,-7H7.5c-0.88,0 -0.33,-0.75 -0.31,-0.78C8.48,10.94 10.42,7.54 13.01,3h1l-1,7h3.51c0.4,0 0.62,0.19 0.4,0.66C12.97,17.55 11,21 11,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_circle.xml b/app/src/main/res/drawable/ic_circle.xml
new file mode 100644
index 000000000..f33abf1fc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_circle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.47,2 2,6.47 2,12c0,5.53 4.47,10 10,10s10,-4.47 10,-10C22,6.47 17.53,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,16.42 16.42,20 12,20z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_developer_mode.xml b/app/src/main/res/drawable/ic_developer_mode.xml
new file mode 100644
index 000000000..b1dc1979b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_developer_mode.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,5h10v2h2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99L7,1c-1.1,0 -2,0.9 -2,2v4h2L7,5zM15.41,16.59L20,12l-4.59,-4.59L14,8.83 17.17,12 14,15.17l1.41,1.42zM10,15.17L6.83,12 10,8.83 8.59,7.41 4,12l4.59,4.59L10,15.17zM17,19L7,19v-2L5,17v4c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-4h-2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_done_all.xml b/app/src/main/res/drawable/ic_done_all.xml
new file mode 100644
index 000000000..b2f2f575b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_all.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_drink.xml b/app/src/main/res/drawable/ic_drink.xml
new file mode 100644
index 000000000..0fefc5eb3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drink.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,2l2.01,18.23C5.13,21.23 5.97,22 7,22h10c1.03,0 1.87,-0.77 1.99,-1.77L21,2L3,2zM17,20l-10,0.01L5.89,10L18.1,10L17,20zM18.33,8L5.67,8l-0.44,-4h13.53l-0.43,4zM12,19c1.66,0 3,-1.34 3,-3 0,-2 -3,-5.4 -3,-5.4S9,14 9,16c0,1.66 1.34,3 3,3zM12,13.91c0.59,0.91 1,1.73 1,2.09 0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1c0,-0.37 0.41,-1.19 1,-2.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_filter_1.xml b/app/src/main/res/drawable/ic_filter_1.xml
new file mode 100644
index 000000000..edb92acc7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_1.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM14,15h2L16,5h-4v2h2v8zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,17L7,17L7,3h14v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_filter_2.xml b/app/src/main/res/drawable/ic_filter_2.xml
new file mode 100644
index 000000000..e2166a493
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_2.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,17L7,17L7,3h14v14zM17,13h-4v-2h2c1.1,0 2,-0.89 2,-2L17,7c0,-1.11 -0.9,-2 -2,-2h-4v2h4v2h-2c-1.1,0 -2,0.89 -2,2v4h6v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_filter_3.xml b/app/src/main/res/drawable/ic_filter_3.xml
new file mode 100644
index 000000000..d18f833dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_3.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,17L7,17L7,3h14v14zM3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM17,13v-1.5c0,-0.83 -0.67,-1.5 -1.5,-1.5 0.83,0 1.5,-0.67 1.5,-1.5L17,7c0,-1.11 -0.9,-2 -2,-2h-4v2h4v2h-2v2h2v2h-4v2h4c1.1,0 2,-0.89 2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_filter_b_and_w.xml b/app/src/main/res/drawable/ic_filter_b_and_w.xml
new file mode 100644
index 000000000..c0f83e1da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_b_and_w.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19l-7,-8v8L5,19l7,-8L12,5h7v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_font_download.xml b/app/src/main/res/drawable/ic_font_download.xml
index 22b1354ec..9151be990 100644
--- a/app/src/main/res/drawable/ic_font_download.xml
+++ b/app/src/main/res/drawable/ic_font_download.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#7E7E7E"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M9.93 13.5h4.14L12 7.98 9.93 13.5zM20 2H4C2.9 2 2 2.9 2 4v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-4.29 15.88l-0.9-2.38H9.17l-0.89 2.37c-0.14 0.38-0.5 0.63-0.91 0.63-0.68 0-1.15-0.69-0.9-1.32l4.25-10.81C10.94 5.84 11.44 5.5 12 5.5s1.06 0.34 1.27 0.87l4.25 10.81c0.25 0.63-0.22 1.32-0.9 1.32-0.4 0-0.76-0.25-0.91-0.62z" />
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9.17,15.5h5.64l1.14,3h2.09l-5.11,-13h-1.86l-5.11,13h2.09l1.12,-3zM12,7.98l2.07,5.52L9.93,13.5L12,7.98zM20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20L4,20L4,4h16v16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_numbered.xml b/app/src/main/res/drawable/ic_list_numbered.xml
new file mode 100644
index 000000000..5756c42f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_numbered.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_outline.xml b/app/src/main/res/drawable/ic_message_outline.xml
index 3570859ea..30c13a348 100644
--- a/app/src/main/res/drawable/ic_message_outline.xml
+++ b/app/src/main/res/drawable/ic_message_outline.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#7E7E7E"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_monochrome_photos.xml b/app/src/main/res/drawable/ic_monochrome_photos.xml
new file mode 100644
index 000000000..85fb57d09
--- /dev/null
+++ b/app/src/main/res/drawable/ic_monochrome_photos.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,5h-3.2L15,3L9,3L7.2,5L4,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM20,19h-8v-1c-2.8,0 -5,-2.2 -5,-5s2.2,-5 5,-5L12,7h8v12zM17,13c0,-2.8 -2.2,-5 -5,-5v1.8c1.8,0 3.2,1.4 3.2,3.2s-1.4,3.2 -3.2,3.2L12,18c2.8,0 5,-2.2 5,-5zM8.8,13c0,1.8 1.4,3.2 3.2,3.2L12,9.8c-1.8,0 -3.2,1.4 -3.2,3.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mtu.xml b/app/src/main/res/drawable/ic_mtu.xml
new file mode 100644
index 000000000..1e9bda266
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mtu.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.77,6.76L6.23,5.48 0.82,12l5.41,6.52 1.54,-1.28L3.42,12l4.35,-5.24zM7,13h2v-2L7,11v2zM17,11h-2v2h2v-2zM11,13h2v-2h-2v2zM17.77,5.48l-1.54,1.28L20.58,12l-4.35,5.24 1.54,1.28L23.18,12l-5.41,-6.52z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pending_actions.xml b/app/src/main/res/drawable/ic_pending_actions.xml
new file mode 100644
index 000000000..46732b5f9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pending_actions.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,12c-2.76,0 -5,2.24 -5,5s2.24,5 5,5c2.76,0 5,-2.24 5,-5S19.76,12 17,12zM18.65,19.35l-2.15,-2.15V14h1v2.79l1.85,1.85L18.65,19.35zM18,3h-3.18C14.4,1.84 13.3,1 12,1S9.6,1.84 9.18,3H6C4.9,3 4,3.9 4,5v15c0,1.1 0.9,2 2,2h6.11c-0.59,-0.57 -1.07,-1.25 -1.42,-2H6V5h2v3h8V5h2v5.08c0.71,0.1 1.38,0.31 2,0.6V5C20,3.9 19.1,3 18,3zM12,5c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1c0.55,0 1,0.45 1,1C13,4.55 12.55,5 12,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_phone_msg.xml b/app/src/main/res/drawable/ic_phone_msg.xml
new file mode 100644
index 000000000..70167ffe1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_phone_msg.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.1,-0.03 -0.21,-0.05 -0.31,-0.05 -0.26,0 -0.51,0.1 -0.71,0.29l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM5.03,5h1.5c0.07,0.88 0.22,1.75 0.46,2.59L5.79,8.8c-0.41,-1.21 -0.67,-2.48 -0.76,-3.8zM19,18.97c-1.32,-0.09 -2.6,-0.35 -3.8,-0.76l1.2,-1.2c0.85,0.24 1.72,0.39 2.6,0.45v1.51zM12,3v10l3,-3h6L21,3h-9zM19,8h-5L14,5h5v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
new file mode 100644
index 000000000..8d3246cae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reply.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_screen_rotation.xml b/app/src/main/res/drawable/ic_screen_rotation.xml
new file mode 100644
index 000000000..cd55d0cd4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_screen_rotation.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16.48,2.52c3.27,1.55 5.61,4.72 5.97,8.48h1.5C23.44,4.84 18.29,0 12,0l-0.66,0.03 3.81,3.81 1.33,-1.32zM10.23,1.75c-0.59,-0.59 -1.54,-0.59 -2.12,0L1.75,8.11c-0.59,0.59 -0.59,1.54 0,2.12l12.02,12.02c0.59,0.59 1.54,0.59 2.12,0l6.36,-6.36c0.59,-0.59 0.59,-1.54 0,-2.12L10.23,1.75zM14.83,21.19L2.81,9.17l6.36,-6.36 12.02,12.02 -6.36,6.36zM7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sensor_calibration.xml b/app/src/main/res/drawable/ic_sensor_calibration.xml
new file mode 100644
index 000000000..d273e893f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sensor_calibration.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,12c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,20c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3 3,1.35 3,3 -1.35,3 -3,3zM12,3C8.1,3 4.56,4.59 2,7.15l5,5c1.28,-1.28 3.05,-2.08 5,-2.08s3.72,0.79 5,2.07l5,-5C19.44,4.59 15.9,3 12,3zM16.84,9.47c-1.44,-0.91 -3.1,-1.4 -4.84,-1.4 -1.74,0 -3.41,0.49 -4.85,1.41L4.94,7.26C6.99,5.79 9.44,5 12,5c2.56,0 5,0.79 7.05,2.26l-2.21,2.21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shortcut.xml b/app/src/main/res/drawable/ic_shortcut.xml
new file mode 100644
index 000000000..e8a2dad7c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shortcut.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,5l-1.41,1.41L15,7.83L17.17,10H8c-2.76,0 -5,2.24 -5,5v4h2v-4c0,-1.65 1.35,-3 3,-3h9.17L15,14.17l-1.41,1.41L15,17l6,-6L15,5z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs.xml
new file mode 100644
index 000000000..21d9a1a37
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tabs.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
new file mode 100644
index 000000000..b7d0aeb2a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_verified.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M23,11.99l-2.44,-2.79l0.34,-3.69l-3.61,-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,11.99l2.44,2.79l-0.34,3.7l3.61,0.82L8.6,22.5l3.4,-1.47l3.4,1.46l1.89,-3.19l3.61,-0.82l-0.34,-3.69L23,11.99zM19.05,13.47l-0.56,0.65l0.08,0.85l0.18,1.95l-1.9,0.43l-0.84,0.19l-0.44,0.74l-0.99,1.68l-1.78,-0.77L12,18.85l-0.79,0.34l-1.78,0.77l-0.99,-1.67l-0.44,-0.74l-0.84,-0.19l-1.9,-0.43l0.18,-1.96l0.08,-0.85l-0.56,-0.65l-1.29,-1.47l1.29,-1.48l0.56,-0.65L5.43,9.01L5.25,7.07l1.9,-0.43l0.84,-0.19l0.44,-0.74l0.99,-1.68l1.78,0.77L12,5.14l0.79,-0.34l1.78,-0.77l0.99,1.68l0.44,0.74l0.84,0.19l1.9,0.43l-0.18,1.95l-0.08,0.85l0.56,0.65l1.29,1.47L19.05,13.47z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.09,13.75l-2.32,-2.33l-1.48,1.49l3.8,3.81l7.34,-7.36l-1.48,-1.49z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_watch.xml b/app/src/main/res/drawable/ic_watch.xml
new file mode 100644
index 000000000..aaf26a314
--- /dev/null
+++ b/app/src/main/res/drawable/ic_watch.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#7E7E7E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14.31,2l0.41,2.48C13.87,4.17 12.96,4 12,4c-0.95,0 -1.87,0.17 -2.71,0.47L9.7,2h4.61m0.41,17.52L14.31,22L9.7,22l-0.41,-2.47c0.84,0.3 1.76,0.47 2.71,0.47 0.96,0 1.87,-0.17 2.72,-0.48M16,0L8,0l-0.95,5.73C5.19,7.19 4,9.45 4,12s1.19,4.81 3.05,6.27L8,24h8l0.96,-5.73C18.81,16.81 20,14.54 20,12s-1.19,-4.81 -3.04,-6.27L16,0zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_amazfitband5.xml b/app/src/main/res/xml/devicesettings_amazfitband5.xml
index 7a2dd852e..9b396fd43 100644
--- a/app/src/main/res/xml/devicesettings_amazfitband5.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitband5.xml
@@ -11,6 +11,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_shortcut"
         android:defaultValue="@array/pref_amazfitband5_shortcuts_default"
         android:dialogTitle="@string/bip_prefs_shortcuts"
         android:entries="@array/pref_amazfitband5_shortcuts"
diff --git a/app/src/main/res/xml/devicesettings_amazfitbip.xml b/app/src/main/res/xml/devicesettings_amazfitbip.xml
index bfa4b17e5..0a8456d69 100644
--- a/app/src/main/res/xml/devicesettings_amazfitbip.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitbip.xml
@@ -11,6 +11,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_shortcut"
         android:defaultValue="@array/pref_bip_shortcuts_default"
         android:dialogTitle="@string/bip_prefs_shortcuts"
         android:entries="@array/pref_bip_shortcuts"
diff --git a/app/src/main/res/xml/devicesettings_amazfitbips.xml b/app/src/main/res/xml/devicesettings_amazfitbips.xml
index 69bc2f5db..de3a162ac 100644
--- a/app/src/main/res/xml/devicesettings_amazfitbips.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitbips.xml
@@ -11,6 +11,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_shortcut"
         android:defaultValue="@array/pref_bips_shortcuts_default"
         android:dialogTitle="@string/bip_prefs_shortcuts"
         android:entries="@array/pref_bips_shortcuts"
diff --git a/app/src/main/res/xml/devicesettings_amazfitneo.xml b/app/src/main/res/xml/devicesettings_amazfitneo.xml
index 8ba1ad604..4551b4b53 100644
--- a/app/src/main/res/xml/devicesettings_amazfitneo.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitneo.xml
@@ -21,6 +21,7 @@
         android:title="@string/pref_title_language" />
 
     <MultiSelectListPreference
+        android:icon="@drawable/ic_beep"
         android:defaultValue="@array/pref_amazfitneo_sounds_default"
         android:dialogTitle="@string/prefs_sounds"
         android:entries="@array/pref_amazfitneo_sounds"
diff --git a/app/src/main/res/xml/devicesettings_amazfitx.xml b/app/src/main/res/xml/devicesettings_amazfitx.xml
index 7a2dd852e..9b396fd43 100644
--- a/app/src/main/res/xml/devicesettings_amazfitx.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitx.xml
@@ -11,6 +11,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_shortcut"
         android:defaultValue="@array/pref_amazfitband5_shortcuts_default"
         android:dialogTitle="@string/bip_prefs_shortcuts"
         android:entries="@array/pref_amazfitband5_shortcuts"
diff --git a/app/src/main/res/xml/devicesettings_autoremove_notifications.xml b/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
index 7f41a3cf5..80c09d97c 100644
--- a/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
+++ b/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
+        android:icon="@drawable/ic_done_all"
         android:defaultValue="true"
         android:key="autoremove_notifications"
         android:summary="@string/pref_summary_autoremove_notifications"
diff --git a/app/src/main/res/xml/devicesettings_buttonactions.xml b/app/src/main/res/xml/devicesettings_buttonactions.xml
index 563b9d189..8002be183 100644
--- a/app/src/main/res/xml/devicesettings_buttonactions.xml
+++ b/app/src/main/res/xml/devicesettings_buttonactions.xml
@@ -14,18 +14,21 @@
 
         <SwitchPreference
             android:defaultValue="false"
+            android:icon="@drawable/ic_smart_button"
             android:key="button_action_enable"
             android:summary="@string/mi2_prefs_button_action_summary"
             android:title="@string/mi2_prefs_button_action" />
 
         <SwitchPreference
             android:defaultValue="false"
+            android:icon="@drawable/ic_vibration"
             android:dependency="button_action_enable"
             android:key="button_action_vibrate"
             android:summary="@string/mi2_prefs_button_action_vibrate_summary"
             android:title="@string/mi2_prefs_button_action_vibrate" />
 
         <ListPreference
+            android:icon="@drawable/ic_filter_1"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -35,6 +38,7 @@
             android:title="@string/prefs_button_single_press_action_selection_title" />
 
         <ListPreference
+            android:icon="@drawable/ic_filter_2"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -44,6 +48,7 @@
             android:title="@string/prefs_button_double_press_action_selection_title" />
 
         <ListPreference
+            android:icon="@drawable/ic_filter_3"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -55,6 +60,7 @@
         <PreferenceCategory android:title="@string/prefs_button_variable_actions">
 
             <EditTextPreference
+                android:icon="@drawable/ic_list_numbered"
                 android:defaultValue="6"
                 android:dependency="button_action_enable"
                 android:inputType="number"
@@ -65,11 +71,13 @@
             <EditTextPreference
                 android:defaultValue="@string/mi2_prefs_button_press_broadcast_default_value"
                 android:dependency="button_action_enable"
+                android:icon="@drawable/ic_message_outline"
                 android:key="button_action_broadcast"
                 android:summary="@string/mi2_prefs_button_press_broadcast_summary"
                 android:title="@string/mi2_prefs_button_press_broadcast" />
 
             <EditTextPreference
+                android:icon="@drawable/ic_timer"
                 android:defaultValue="2000"
                 android:dependency="button_action_enable"
                 android:inputType="number"
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 56dda4f39..719ef466f 100644
--- a/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
+++ b/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
@@ -14,18 +14,21 @@
 
         <SwitchPreference
             android:defaultValue="false"
+            android:icon="@drawable/ic_smart_button"
             android:key="button_action_enable"
             android:summary="@string/mi2_prefs_button_action_summary"
             android:title="@string/mi2_prefs_button_action" />
 
         <SwitchPreference
             android:defaultValue="false"
+            android:icon="@drawable/ic_vibration"
             android:dependency="button_action_enable"
             android:key="button_action_vibrate"
             android:summary="@string/mi2_prefs_button_action_vibrate_summary"
             android:title="@string/mi2_prefs_button_action_vibrate" />
 
         <ListPreference
+            android:icon="@drawable/ic_filter_1"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -35,6 +38,7 @@
             android:title="@string/prefs_button_single_press_action_selection_title" />
 
         <ListPreference
+            android:icon="@drawable/ic_filter_2"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -44,6 +48,7 @@
             android:title="@string/prefs_button_double_press_action_selection_title" />
 
         <ListPreference
+            android:icon="@drawable/ic_filter_3"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -53,6 +58,7 @@
             android:title="@string/prefs_button_triple_press_action_selection_title" />
 
         <ListPreference
+            android:icon="@drawable/ic_smart_button"
             android:dependency="button_action_enable"
             android:entries="@array/button_action_options"
             android:entryValues="@array/button_action_values"
@@ -63,6 +69,7 @@
         <PreferenceCategory android:title="@string/prefs_button_variable_actions">
 
             <EditTextPreference
+                android:icon="@drawable/ic_list_numbered"
                 android:defaultValue="6"
                 android:dependency="button_action_enable"
                 android:inputType="number"
@@ -71,6 +78,7 @@
                 android:title="@string/mi2_prefs_button_press_count" />
 
             <EditTextPreference
+                android:icon="@drawable/ic_message_outline"
                 android:defaultValue="@string/mi2_prefs_button_press_broadcast_default_value"
                 android:dependency="button_action_enable"
                 android:key="button_action_broadcast"
@@ -78,6 +86,7 @@
                 android:title="@string/mi2_prefs_button_press_broadcast" />
 
             <EditTextPreference
+                android:icon="@drawable/ic_timer"
                 android:defaultValue="2000"
                 android:dependency="button_action_enable"
                 android:inputType="number"
diff --git a/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml b/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
index 248c3fb48..b472b5c0a 100644
--- a/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
+++ b/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceScreen
+        android:icon="@drawable/ic_phone_msg"
         android:key="screen_canned_messages_dismisscall"
         android:persistent="false"
         android:title="@string/pref_title_canned_messages_dismisscall"
diff --git a/app/src/main/res/xml/devicesettings_canned_reply_16.xml b/app/src/main/res/xml/devicesettings_canned_reply_16.xml
index d35d4197b..bf223332b 100644
--- a/app/src/main/res/xml/devicesettings_canned_reply_16.xml
+++ b/app/src/main/res/xml/devicesettings_canned_reply_16.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceScreen
+        android:icon="@drawable/ic_reply"
         android:key="screen_canned_messages_reply"
         android:persistent="false"
         android:title="@string/pref_title_canned_replies">
diff --git a/app/src/main/res/xml/devicesettings_chartstabs.xml b/app/src/main/res/xml/devicesettings_chartstabs.xml
index e8bda6f60..b5da76998 100644
--- a/app/src/main/res/xml/devicesettings_chartstabs.xml
+++ b/app/src/main/res/xml/devicesettings_chartstabs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <com.mobeta.android.dslv.DragSortListPreference
-        android:icon="@drawable/ic_activity_graphs"
+        android:icon="@drawable/ic_tabs"
         android:defaultValue="@array/pref_charts_tabs_items_default"
         android:dialogTitle="@string/mi2_prefs_display_items"
         android:entries="@array/pref_charts_tabs_items"
diff --git a/app/src/main/res/xml/devicesettings_custom_deviceicon.xml b/app/src/main/res/xml/devicesettings_custom_deviceicon.xml
index 5c6137434..2c37f6ad1 100644
--- a/app/src/main/res/xml/devicesettings_custom_deviceicon.xml
+++ b/app/src/main/res/xml/devicesettings_custom_deviceicon.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
+        android:icon="@drawable/ic_devices_other"
         android:defaultValue="true"
         android:key="use_custom_deviceicon"
         android:summary="@string/pref_summary_custom_deviceicon"
diff --git a/app/src/main/res/xml/devicesettings_fake_timeoffset.xml b/app/src/main/res/xml/devicesettings_fake_timeoffset.xml
index 7f603d6f5..7db798c4e 100644
--- a/app/src/main/res/xml/devicesettings_fake_timeoffset.xml
+++ b/app/src/main/res/xml/devicesettings_fake_timeoffset.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <EditTextPreference
+        android:icon="@drawable/ic_access_time"
         android:defaultValue="0"
         android:inputType="number"
         android:key="device_time_offset_hours"
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
index d6d89136d..3fcafff70 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
@@ -4,6 +4,7 @@
 
     <PreferenceScreen
         android:key="button_configuration"
+        android:icon="@drawable/ic_smart_button"
         android:title="@string/pref_title_physical_buttons"
         android:summary="@string/pref_summary_physical_buttons">
         <ListPreference
@@ -74,6 +75,7 @@
 
     <Preference
         android:title="@string/qhybrid_pref_title_actions"
+        android:icon="@drawable/ic_pending_actions"
         android:summary="@string/qhybrid_pref_summary_actions">
         <intent
             android:targetPackage="nodomain.freeyourgadget.gadgetbridge"
@@ -82,6 +84,7 @@
 
     <SeekBarPreference
         android:defaultValue="2"
+        android:icon="@drawable/ic_vibration"
         android:key="vibration_strength"
         android:max="3"
         android:title="@string/pref_title_vibration_strength"
@@ -89,6 +92,7 @@
 
     <Preference
         android:title="@string/qhybrid_title_calibration"
+        android:icon="@drawable/ic_sensor_calibration"
         android:summary="@string/qhybrid_summary_calibration">
         <intent
             android:targetPackage="nodomain.freeyourgadget.gadgetbridge"
@@ -97,6 +101,7 @@
 
     <PreferenceScreen
         android:key="developer_settings"
+        android:icon="@drawable/ic_developer_mode"
         android:title="@string/pref_title_developer_settings"
         android:summary="@string/pref_summary_developer_settings">
 
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
index 8d9be4173..e646899cd 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
@@ -4,6 +4,7 @@
 
     <Preference
         android:title="@string/qhybrid_title_watchface"
+        android:icon="@drawable/ic_watch"
         android:summary="@string/qhybrid_watchface_configuration_old_firmware">
         <intent
             android:targetPackage="nodomain.freeyourgadget.gadgetbridge"
@@ -12,11 +13,13 @@
 
     <SwitchPreference
         android:defaultValue="false"
+        android:icon="@drawable/ic_filter_b_and_w"
         android:key="force_white_color_scheme"
         android:summary="@string/pref_summary_force_white_color_scheme"
         android:title="@string/pref_title_force_white_color_scheme" />
     <SwitchPreference
         android:defaultValue="false"
+        android:icon="@drawable/ic_circle"
         android:key="widget_draw_circles"
         android:title="@string/pref_qhybrid_title_widget_draw_circles" />
 
diff --git a/app/src/main/res/xml/devicesettings_high_mtu.xml b/app/src/main/res/xml/devicesettings_high_mtu.xml
index 9751da642..68a982397 100644
--- a/app/src/main/res/xml/devicesettings_high_mtu.xml
+++ b/app/src/main/res/xml/devicesettings_high_mtu.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
+        android:icon="@drawable/ic_mtu"
         android:defaultValue="false"
         android:key="allow_high_mtu"
         android:summary="@string/pref_summary_allow_high_mtu"
diff --git a/app/src/main/res/xml/devicesettings_hydration_reminder.xml b/app/src/main/res/xml/devicesettings_hydration_reminder.xml
index 95edf232b..b290974c1 100644
--- a/app/src/main/res/xml/devicesettings_hydration_reminder.xml
+++ b/app/src/main/res/xml/devicesettings_hydration_reminder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
-        android:icon="@drawable/ic_settings"
+        android:icon="@drawable/ic_drink"
         android:key="screen_hydration_reminder"
         android:persistent="false"
         android:summary="@string/lefun_prefs_hydration_reminder_summary"
diff --git a/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml b/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml
index 93375f42d..7e12b0e6f 100644
--- a/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml
+++ b/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
+        android:icon="@drawable/ic_mtu"
         android:defaultValue="true"
         android:key="low_latency_fw_update"
         android:summary="@string/pref_summary_low_latency_fw_update"
diff --git a/app/src/main/res/xml/devicesettings_miband5.xml b/app/src/main/res/xml/devicesettings_miband5.xml
index fc3d179ca..e71977fcb 100644
--- a/app/src/main/res/xml/devicesettings_miband5.xml
+++ b/app/src/main/res/xml/devicesettings_miband5.xml
@@ -11,6 +11,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_shortcut"
         android:defaultValue="@array/pref_miband5_shortcuts_default"
         android:dialogTitle="@string/bip_prefs_shortcuts"
         android:entries="@array/pref_miband5_shortcuts"
diff --git a/app/src/main/res/xml/devicesettings_miband6.xml b/app/src/main/res/xml/devicesettings_miband6.xml
index cb2efc038..c63722450 100644
--- a/app/src/main/res/xml/devicesettings_miband6.xml
+++ b/app/src/main/res/xml/devicesettings_miband6.xml
@@ -11,6 +11,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_shortcut"
         android:defaultValue="@array/pref_miband6_shortcuts_default"
         android:dialogTitle="@string/bip_prefs_shortcuts"
         android:entries="@array/pref_miband6_shortcuts"
diff --git a/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml b/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml
index aad1eca53..3940d854f 100644
--- a/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml
+++ b/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
+        android:icon="@drawable/ic_verified"
         android:defaultValue="false"
         android:key="relax_firmware_checks"
         android:summary="@string/pref_summary_relax_firmware_checks"
diff --git a/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml b/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml
index 4b2d5b7b4..0785e4589 100644
--- a/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml
+++ b/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <EditTextPreference
+        android:icon="@drawable/ic_access_alarms"
         android:defaultValue="0"
         android:digits="0123"
         android:inputType="number"
diff --git a/app/src/main/res/xml/devicesettings_screenorientation.xml b/app/src/main/res/xml/devicesettings_screenorientation.xml
index b8ed5301c..7cc696586 100644
--- a/app/src/main/res/xml/devicesettings_screenorientation.xml
+++ b/app/src/main/res/xml/devicesettings_screenorientation.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <ListPreference
+        android:icon="@drawable/ic_screen_rotation"
         android:defaultValue="horizontal"
         android:entries="@array/orientation"
         android:entryValues="@array/orientation_values"
diff --git a/app/src/main/res/xml/devicesettings_sonyswr12.xml b/app/src/main/res/xml/devicesettings_sonyswr12.xml
index e67a0ba1d..32d6859e4 100644
--- a/app/src/main/res/xml/devicesettings_sonyswr12.xml
+++ b/app/src/main/res/xml/devicesettings_sonyswr12.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
+        android:icon="@drawable/ic_bolt"
         android:key="stamina_preference"
         android:title="@string/sonyswr12_settings_stamina"
         android:defaultValue="false"
         android:summary="@string/sonyswr12_settings_stamina_summary" />
     <SwitchPreference
+        android:icon="@drawable/ic_vibration"
         android:key="vibration_preference"
         android:title="@string/sonyswr12_settings_low_vibration"
         android:defaultValue="false"
diff --git a/app/src/main/res/xml/devicesettings_watchxplus.xml b/app/src/main/res/xml/devicesettings_watchxplus.xml
index 733d6b8ba..0ef7be393 100644
--- a/app/src/main/res/xml/devicesettings_watchxplus.xml
+++ b/app/src/main/res/xml/devicesettings_watchxplus.xml
@@ -48,7 +48,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="@drawable/ic_widgets"
+        android:icon="@drawable/ic_settings"
         android:key="pref_category_device_spec_settings"
         android:title="@string/pref_header_device_spec_settings">
         <ListPreference
@@ -71,7 +71,7 @@
             android:title="@string/pref_title_device_spec_settings_show_raw_graph" />
     </PreferenceScreen>
     <PreferenceScreen
-        android:icon="@drawable/ic_activity_unknown"
+        android:icon="@drawable/ic_sensor_calibration"
         android:key="pref_sensors_calibration"
         android:title="@string/pref_header_sensors_calibration">
         <EditTextPreference