diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java
index f4f830647..67b9d8ad5 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java
@@ -47,6 +47,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment {
         setHasOptionsMenu(true);
         setInputMethodSettingsCategoryTitle(R.string.language_selection_title);
         setSubtypeEnablerTitle(R.string.select_language);
+        setSubtypeEnablerIcon(R.drawable.ic_settings_languages);
         addPreferencesFromResource(R.xml.prefs);
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         preferenceScreen.setTitle(
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_advanced_white.png b/app/src/main/res/drawable-hdpi/ic_settings_advanced_white.png
new file mode 100644
index 000000000..a5fedb675
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_advanced_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_appearance_white.png b/app/src/main/res/drawable-hdpi/ic_settings_appearance_white.png
new file mode 100644
index 000000000..3b74e4421
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_appearance_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_correction_white.png b/app/src/main/res/drawable-hdpi/ic_settings_correction_white.png
new file mode 100644
index 000000000..02a007a8f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_correction_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_gesture_white.png b/app/src/main/res/drawable-hdpi/ic_settings_gesture_white.png
new file mode 100644
index 000000000..9661be325
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_gesture_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_languages_white.png b/app/src/main/res/drawable-hdpi/ic_settings_languages_white.png
new file mode 100644
index 000000000..e08d9bce5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_languages_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_preferences_white.png b/app/src/main/res/drawable-hdpi/ic_settings_preferences_white.png
new file mode 100644
index 000000000..1e3fe8015
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_preferences_white.png differ
diff --git a/app/src/main/res/drawable-v21/ic_settings_advanced.xml b/app/src/main/res/drawable-v21/ic_settings_advanced.xml
new file mode 100644
index 000000000..9c8d68db7
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_settings_advanced.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+   android:inset="@dimen/settings_screen_icon_inset">
+    <bitmap android:src="@drawable/ic_settings_advanced_white"
+        android:tint="?android:colorForeground"/>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_settings_appearance.xml b/app/src/main/res/drawable-v21/ic_settings_appearance.xml
new file mode 100644
index 000000000..aee8d4cbf
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_settings_appearance.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+   android:inset="@dimen/settings_screen_icon_inset">
+    <bitmap android:src="@drawable/ic_settings_appearance_white"
+        android:tint="?android:colorForeground"/>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_settings_correction.xml b/app/src/main/res/drawable-v21/ic_settings_correction.xml
new file mode 100644
index 000000000..8c3d04290
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_settings_correction.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+   android:inset="@dimen/settings_screen_icon_inset">
+    <bitmap android:src="@drawable/ic_settings_correction_white"
+        android:tint="?android:colorForeground"/>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_settings_gesture.xml b/app/src/main/res/drawable-v21/ic_settings_gesture.xml
new file mode 100644
index 000000000..a0b58fbd5
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_settings_gesture.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+   android:inset="@dimen/settings_screen_icon_inset">
+    <bitmap android:src="@drawable/ic_settings_gesture_white"
+        android:tint="?android:colorForeground"/>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_settings_languages.xml b/app/src/main/res/drawable-v21/ic_settings_languages.xml
new file mode 100644
index 000000000..a14b49759
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_settings_languages.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+   android:inset="@dimen/settings_screen_icon_inset">
+    <bitmap android:src="@drawable/ic_settings_languages_white"
+        android:tint="?android:colorForeground"/>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_settings_preferences.xml b/app/src/main/res/drawable-v21/ic_settings_preferences.xml
new file mode 100644
index 000000000..b73eb1a6d
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_settings_preferences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+   android:inset="@dimen/settings_screen_icon_inset">
+    <bitmap android:src="@drawable/ic_settings_preferences_white"
+        android:tint="?android:colorForeground"/>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_advanced_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_advanced_white.png
new file mode 100644
index 000000000..7bd8359a3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_advanced_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_appearance_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_appearance_white.png
new file mode 100644
index 000000000..06e1bb712
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_appearance_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_correction_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_correction_white.png
new file mode 100644
index 000000000..aed95fbf6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_correction_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_gesture_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_gesture_white.png
new file mode 100644
index 000000000..c60a1379a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_gesture_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_languages_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_languages_white.png
new file mode 100644
index 000000000..58e366f76
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_languages_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_preferences_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_preferences_white.png
new file mode 100644
index 000000000..780b4672d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_preferences_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_advanced_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_advanced_white.png
new file mode 100644
index 000000000..fbd27d097
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_advanced_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_appearance_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_appearance_white.png
new file mode 100644
index 000000000..70ce5bae3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_appearance_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_correction_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_correction_white.png
new file mode 100644
index 000000000..29cb13b79
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_correction_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_gesture_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_gesture_white.png
new file mode 100644
index 000000000..bf8c32be7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_gesture_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_languages_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_languages_white.png
new file mode 100644
index 000000000..b25bb9cb7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_languages_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_preferences_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_preferences_white.png
new file mode 100644
index 000000000..507d27f75
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_preferences_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_advanced_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_advanced_white.png
new file mode 100644
index 000000000..aff3c4c8f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_advanced_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_appearance_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_appearance_white.png
new file mode 100644
index 000000000..8fb94eed9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_appearance_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_correction_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_correction_white.png
new file mode 100644
index 000000000..0d4e64afd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_correction_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_gesture_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_gesture_white.png
new file mode 100644
index 000000000..009fe68cf
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_gesture_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_languages_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_languages_white.png
new file mode 100644
index 000000000..163c37e37
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_languages_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_preferences_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_preferences_white.png
new file mode 100644
index 000000000..c3fc5d242
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_preferences_white.png differ
diff --git a/app/src/main/res/drawable/ic_settings_advanced.xml b/app/src/main/res/drawable/ic_settings_advanced.xml
new file mode 100644
index 000000000..6565978e1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_advanced.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_advanced_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_appearance.xml b/app/src/main/res/drawable/ic_settings_appearance.xml
new file mode 100644
index 000000000..fc9b8ffaa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_appearance.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_appearance_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_correction.xml b/app/src/main/res/drawable/ic_settings_correction.xml
new file mode 100644
index 000000000..1fc515b05
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_correction.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_correction_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_gesture.xml b/app/src/main/res/drawable/ic_settings_gesture.xml
new file mode 100644
index 000000000..4b3cca671
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_gesture.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_gesture_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_languages.xml b/app/src/main/res/drawable/ic_settings_languages.xml
new file mode 100644
index 000000000..992d1b92d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_languages.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_languages_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_preferences.xml b/app/src/main/res/drawable/ic_settings_preferences.xml
new file mode 100644
index 000000000..0affecb33
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_preferences.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_settings_preferences_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..2c03e9556
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="settings_screen_icon_inset">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 53e8789f2..f5f9f0495 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -19,21 +19,26 @@
     <PreferenceScreen
         android:fragment="org.dslul.openboard.inputmethod.latin.settings.PreferencesSettingsFragment"
         android:title="@string/settings_screen_preferences"
-        android:key="screen_preferences" />
+        android:key="screen_preferences"
+        android:icon="@drawable/ic_settings_preferences"/>
     <PreferenceScreen
         android:fragment="org.dslul.openboard.inputmethod.latin.settings.AppearanceSettingsFragment"
         android:title="@string/settings_screen_appearance"
-        android:key="screen_appearance" />
+        android:key="screen_appearance"
+        android:icon="@drawable/ic_settings_appearance"/>
     <PreferenceScreen
         android:fragment="org.dslul.openboard.inputmethod.latin.settings.GestureSettingsFragment"
         android:title="@string/settings_screen_gesture"
-        android:key="screen_gesture" />
+        android:key="screen_gesture"
+        android:icon="@drawable/ic_settings_gesture"/>
     <PreferenceScreen
         android:fragment="org.dslul.openboard.inputmethod.latin.settings.CorrectionSettingsFragment"
         android:title="@string/settings_screen_correction"
-        android:key="screen_correction" />
+        android:key="screen_correction"
+        android:icon="@drawable/ic_settings_correction"/>
     <PreferenceScreen
         android:fragment="org.dslul.openboard.inputmethod.latin.settings.AdvancedSettingsFragment"
         android:title="@string/settings_screen_advanced"
-        android:key="screen_advanced" />
+        android:key="screen_advanced"
+        android:icon="@drawable/ic_settings_advanced"/>
 </PreferenceScreen>