diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
new file mode 100644
index 000000000..e5a15e1e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_language.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.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_vpn_key.xml b/app/src/main/res/drawable/ic_vpn_key.xml
new file mode 100644
index 000000000..88053a611
--- /dev/null
+++ b/app/src/main/res/drawable/ic_vpn_key.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.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-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_widgets.xml b/app/src/main/res/drawable/ic_widgets.xml
new file mode 100644
index 000000000..638ce0000
--- /dev/null
+++ b/app/src/main/res/drawable/ic_widgets.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.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z" />
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_huami.xml b/app/src/main/res/xml/devicesettings_huami.xml
index a1c271313..422a5c619 100644
--- a/app/src/main/res/xml/devicesettings_huami.xml
+++ b/app/src/main/res/xml/devicesettings_huami.xml
@@ -2,6 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <EditTextPreference
+        android:icon="@drawable/ic_vpn_key"
         android:key="authkey"
         android:maxLength="16"
         android:summary="@string/pref_summary_authkey"
diff --git a/app/src/main/res/xml/devicesettings_huami_bip.xml b/app/src/main/res/xml/devicesettings_huami_bip.xml
index 6586215e1..d2133e176 100644
--- a/app/src/main/res/xml/devicesettings_huami_bip.xml
+++ b/app/src/main/res/xml/devicesettings_huami_bip.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <MultiSelectListPreference
+        android:icon="@drawable/ic_widgets"
         android:defaultValue="@array/pref_bip_display_items_default"
         android:dialogTitle="@string/mi2_prefs_display_items"
         android:entries="@array/pref_bip_display_items"
@@ -9,6 +10,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <ListPreference
+        android:icon="@drawable/ic_language"
         android:defaultValue="auto"
         android:entries="@array/pref_amazfitbip_language"
         android:entryValues="@array/pref_amazfitbip_language_values"
diff --git a/app/src/main/res/xml/devicesettings_huami_cor.xml b/app/src/main/res/xml/devicesettings_huami_cor.xml
index 69d6a4368..c21801512 100644
--- a/app/src/main/res/xml/devicesettings_huami_cor.xml
+++ b/app/src/main/res/xml/devicesettings_huami_cor.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <MultiSelectListPreference
+        android:icon="@drawable/ic_widgets"
         android:defaultValue="@array/pref_cor_display_items_default"
         android:dialogTitle="@string/mi2_prefs_display_items"
         android:entries="@array/pref_cor_display_items"
@@ -9,6 +10,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <ListPreference
+        android:icon="@drawable/ic_language"
         android:defaultValue="auto"
         android:entries="@array/pref_amazfitbip_language"
         android:entryValues="@array/pref_amazfitbip_language_values"
diff --git a/app/src/main/res/xml/devicesettings_huami_miband2.xml b/app/src/main/res/xml/devicesettings_huami_miband2.xml
index 068ee8180..9f7374621 100644
--- a/app/src/main/res/xml/devicesettings_huami_miband2.xml
+++ b/app/src/main/res/xml/devicesettings_huami_miband2.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <MultiSelectListPreference
+        android:icon="@drawable/ic_widgets"
         android:defaultValue="@array/pref_mi2_display_items_default"
         android:dialogTitle="@string/mi2_prefs_display_items"
         android:entries="@array/pref_mi2_display_items"
diff --git a/app/src/main/res/xml/devicesettings_huami_miband3.xml b/app/src/main/res/xml/devicesettings_huami_miband3.xml
index 5b6aff840..7ff8378e8 100644
--- a/app/src/main/res/xml/devicesettings_huami_miband3.xml
+++ b/app/src/main/res/xml/devicesettings_huami_miband3.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <MultiSelectListPreference
+        android:icon="@drawable/ic_widgets"
         android:defaultValue="@array/pref_miband3_display_items_default"
         android:dialogTitle="@string/mi2_prefs_display_items"
         android:entries="@array/pref_miband3_display_items"
@@ -9,6 +10,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
     <ListPreference
+        android:icon="@drawable/ic_language"
         android:defaultValue="auto"
         android:entries="@array/pref_miband3_language"
         android:entryValues="@array/pref_miband3_language_values"