diff --git a/res/drawable-hdpi/ic_advanced_black.png b/res/drawable-hdpi/ic_advanced_black.png
new file mode 100644
index 0000000000..21f955b3ff
Binary files /dev/null and b/res/drawable-hdpi/ic_advanced_black.png differ
diff --git a/res/drawable-hdpi/ic_advanced_gray.png b/res/drawable-hdpi/ic_advanced_gray.png
new file mode 100644
index 0000000000..a095c66155
Binary files /dev/null and b/res/drawable-hdpi/ic_advanced_gray.png differ
diff --git a/res/drawable-hdpi/ic_app_protection_black.png b/res/drawable-hdpi/ic_app_protection_black.png
new file mode 100644
index 0000000000..5e61572be1
Binary files /dev/null and b/res/drawable-hdpi/ic_app_protection_black.png differ
diff --git a/res/drawable-hdpi/ic_app_protection_gray.png b/res/drawable-hdpi/ic_app_protection_gray.png
new file mode 100644
index 0000000000..8ee2c0b7ea
Binary files /dev/null and b/res/drawable-hdpi/ic_app_protection_gray.png differ
diff --git a/res/drawable-hdpi/ic_brightness_6_black.png b/res/drawable-hdpi/ic_brightness_6_black.png
new file mode 100644
index 0000000000..897bddf367
Binary files /dev/null and b/res/drawable-hdpi/ic_brightness_6_black.png differ
diff --git a/res/drawable-hdpi/ic_brightness_6_gray.png b/res/drawable-hdpi/ic_brightness_6_gray.png
new file mode 100644
index 0000000000..70c0dfa59a
Binary files /dev/null and b/res/drawable-hdpi/ic_brightness_6_gray.png differ
diff --git a/res/drawable-hdpi/ic_delete_black.png b/res/drawable-hdpi/ic_delete_black.png
new file mode 100644
index 0000000000..651fba938a
Binary files /dev/null and b/res/drawable-hdpi/ic_delete_black.png differ
diff --git a/res/drawable-hdpi/ic_delete_gray.png b/res/drawable-hdpi/ic_delete_gray.png
new file mode 100644
index 0000000000..cae6c1f903
Binary files /dev/null and b/res/drawable-hdpi/ic_delete_gray.png differ
diff --git a/res/drawable-hdpi/ic_message_black.png b/res/drawable-hdpi/ic_message_black.png
new file mode 100644
index 0000000000..21a3484c9f
Binary files /dev/null and b/res/drawable-hdpi/ic_message_black.png differ
diff --git a/res/drawable-hdpi/ic_message_gray.png b/res/drawable-hdpi/ic_message_gray.png
new file mode 100644
index 0000000000..165be3c950
Binary files /dev/null and b/res/drawable-hdpi/ic_message_gray.png differ
diff --git a/res/drawable-hdpi/ic_notifications_black.png b/res/drawable-hdpi/ic_notifications_black.png
new file mode 100644
index 0000000000..bae2907b41
Binary files /dev/null and b/res/drawable-hdpi/ic_notifications_black.png differ
diff --git a/res/drawable-hdpi/ic_notifications_gray.png b/res/drawable-hdpi/ic_notifications_gray.png
new file mode 100644
index 0000000000..af04f236de
Binary files /dev/null and b/res/drawable-hdpi/ic_notifications_gray.png differ
diff --git a/res/drawable-hdpi/ic_push_black.png b/res/drawable-hdpi/ic_push_black.png
new file mode 100644
index 0000000000..c26a83771c
Binary files /dev/null and b/res/drawable-hdpi/ic_push_black.png differ
diff --git a/res/drawable-hdpi/ic_push_gray.png b/res/drawable-hdpi/ic_push_gray.png
new file mode 100644
index 0000000000..c779f5eb4d
Binary files /dev/null and b/res/drawable-hdpi/ic_push_gray.png differ
diff --git a/res/drawable-mdpi/ic_advanced_black.png b/res/drawable-mdpi/ic_advanced_black.png
new file mode 100644
index 0000000000..be6c2d76c6
Binary files /dev/null and b/res/drawable-mdpi/ic_advanced_black.png differ
diff --git a/res/drawable-mdpi/ic_advanced_gray.png b/res/drawable-mdpi/ic_advanced_gray.png
new file mode 100644
index 0000000000..782eee96a3
Binary files /dev/null and b/res/drawable-mdpi/ic_advanced_gray.png differ
diff --git a/res/drawable-mdpi/ic_app_protection_black.png b/res/drawable-mdpi/ic_app_protection_black.png
new file mode 100644
index 0000000000..0f5ff12b19
Binary files /dev/null and b/res/drawable-mdpi/ic_app_protection_black.png differ
diff --git a/res/drawable-mdpi/ic_app_protection_gray.png b/res/drawable-mdpi/ic_app_protection_gray.png
new file mode 100644
index 0000000000..31e38a6da4
Binary files /dev/null and b/res/drawable-mdpi/ic_app_protection_gray.png differ
diff --git a/res/drawable-mdpi/ic_brightness_6_black.png b/res/drawable-mdpi/ic_brightness_6_black.png
new file mode 100644
index 0000000000..88f0da4732
Binary files /dev/null and b/res/drawable-mdpi/ic_brightness_6_black.png differ
diff --git a/res/drawable-mdpi/ic_brightness_6_gray.png b/res/drawable-mdpi/ic_brightness_6_gray.png
new file mode 100644
index 0000000000..4eb5746c0e
Binary files /dev/null and b/res/drawable-mdpi/ic_brightness_6_gray.png differ
diff --git a/res/drawable-mdpi/ic_delete_black.png b/res/drawable-mdpi/ic_delete_black.png
new file mode 100644
index 0000000000..ba22d333d1
Binary files /dev/null and b/res/drawable-mdpi/ic_delete_black.png differ
diff --git a/res/drawable-mdpi/ic_delete_gray.png b/res/drawable-mdpi/ic_delete_gray.png
new file mode 100644
index 0000000000..ee112dfc10
Binary files /dev/null and b/res/drawable-mdpi/ic_delete_gray.png differ
diff --git a/res/drawable-mdpi/ic_message_black.png b/res/drawable-mdpi/ic_message_black.png
new file mode 100644
index 0000000000..5d08ca89b9
Binary files /dev/null and b/res/drawable-mdpi/ic_message_black.png differ
diff --git a/res/drawable-mdpi/ic_message_gray.png b/res/drawable-mdpi/ic_message_gray.png
new file mode 100644
index 0000000000..a0627f6d63
Binary files /dev/null and b/res/drawable-mdpi/ic_message_gray.png differ
diff --git a/res/drawable-mdpi/ic_notifications_black.png b/res/drawable-mdpi/ic_notifications_black.png
new file mode 100644
index 0000000000..3bc2d671b0
Binary files /dev/null and b/res/drawable-mdpi/ic_notifications_black.png differ
diff --git a/res/drawable-mdpi/ic_notifications_gray.png b/res/drawable-mdpi/ic_notifications_gray.png
new file mode 100644
index 0000000000..f36b4efca6
Binary files /dev/null and b/res/drawable-mdpi/ic_notifications_gray.png differ
diff --git a/res/drawable-mdpi/ic_push_black.png b/res/drawable-mdpi/ic_push_black.png
new file mode 100644
index 0000000000..1144dcb673
Binary files /dev/null and b/res/drawable-mdpi/ic_push_black.png differ
diff --git a/res/drawable-mdpi/ic_push_gray.png b/res/drawable-mdpi/ic_push_gray.png
new file mode 100644
index 0000000000..568c2b27af
Binary files /dev/null and b/res/drawable-mdpi/ic_push_gray.png differ
diff --git a/res/drawable-xhdpi/ic_advanced_black.png b/res/drawable-xhdpi/ic_advanced_black.png
new file mode 100644
index 0000000000..3620a1c2ac
Binary files /dev/null and b/res/drawable-xhdpi/ic_advanced_black.png differ
diff --git a/res/drawable-xhdpi/ic_advanced_gray.png b/res/drawable-xhdpi/ic_advanced_gray.png
new file mode 100644
index 0000000000..9d6a35ab6b
Binary files /dev/null and b/res/drawable-xhdpi/ic_advanced_gray.png differ
diff --git a/res/drawable-xhdpi/ic_app_protection_black.png b/res/drawable-xhdpi/ic_app_protection_black.png
new file mode 100644
index 0000000000..0fb36e5bec
Binary files /dev/null and b/res/drawable-xhdpi/ic_app_protection_black.png differ
diff --git a/res/drawable-xhdpi/ic_app_protection_gray.png b/res/drawable-xhdpi/ic_app_protection_gray.png
new file mode 100644
index 0000000000..c4001ab5a3
Binary files /dev/null and b/res/drawable-xhdpi/ic_app_protection_gray.png differ
diff --git a/res/drawable-xhdpi/ic_brightness_6_black.png b/res/drawable-xhdpi/ic_brightness_6_black.png
new file mode 100644
index 0000000000..f41d1e6474
Binary files /dev/null and b/res/drawable-xhdpi/ic_brightness_6_black.png differ
diff --git a/res/drawable-xhdpi/ic_brightness_6_gray.png b/res/drawable-xhdpi/ic_brightness_6_gray.png
new file mode 100644
index 0000000000..57f841a909
Binary files /dev/null and b/res/drawable-xhdpi/ic_brightness_6_gray.png differ
diff --git a/res/drawable-xhdpi/ic_delete_black.png b/res/drawable-xhdpi/ic_delete_black.png
new file mode 100644
index 0000000000..13f3858a3d
Binary files /dev/null and b/res/drawable-xhdpi/ic_delete_black.png differ
diff --git a/res/drawable-xhdpi/ic_delete_gray.png b/res/drawable-xhdpi/ic_delete_gray.png
new file mode 100644
index 0000000000..6fc64e5ec5
Binary files /dev/null and b/res/drawable-xhdpi/ic_delete_gray.png differ
diff --git a/res/drawable-xhdpi/ic_message_black.png b/res/drawable-xhdpi/ic_message_black.png
new file mode 100644
index 0000000000..cafb791232
Binary files /dev/null and b/res/drawable-xhdpi/ic_message_black.png differ
diff --git a/res/drawable-xhdpi/ic_message_gray.png b/res/drawable-xhdpi/ic_message_gray.png
new file mode 100644
index 0000000000..5eb1a27ae4
Binary files /dev/null and b/res/drawable-xhdpi/ic_message_gray.png differ
diff --git a/res/drawable-xhdpi/ic_notifications_black.png b/res/drawable-xhdpi/ic_notifications_black.png
new file mode 100644
index 0000000000..336329f61a
Binary files /dev/null and b/res/drawable-xhdpi/ic_notifications_black.png differ
diff --git a/res/drawable-xhdpi/ic_notifications_gray.png b/res/drawable-xhdpi/ic_notifications_gray.png
new file mode 100644
index 0000000000..506d85c004
Binary files /dev/null and b/res/drawable-xhdpi/ic_notifications_gray.png differ
diff --git a/res/drawable-xhdpi/ic_push_black.png b/res/drawable-xhdpi/ic_push_black.png
new file mode 100644
index 0000000000..465e6135dc
Binary files /dev/null and b/res/drawable-xhdpi/ic_push_black.png differ
diff --git a/res/drawable-xhdpi/ic_push_gray.png b/res/drawable-xhdpi/ic_push_gray.png
new file mode 100644
index 0000000000..112bc73de5
Binary files /dev/null and b/res/drawable-xhdpi/ic_push_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_advanced_black.png b/res/drawable-xxhdpi/ic_advanced_black.png
new file mode 100644
index 0000000000..fbab1e5668
Binary files /dev/null and b/res/drawable-xxhdpi/ic_advanced_black.png differ
diff --git a/res/drawable-xxhdpi/ic_advanced_gray.png b/res/drawable-xxhdpi/ic_advanced_gray.png
new file mode 100644
index 0000000000..d7dfd11e5d
Binary files /dev/null and b/res/drawable-xxhdpi/ic_advanced_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_app_protection_black.png b/res/drawable-xxhdpi/ic_app_protection_black.png
new file mode 100644
index 0000000000..959c7c6076
Binary files /dev/null and b/res/drawable-xxhdpi/ic_app_protection_black.png differ
diff --git a/res/drawable-xxhdpi/ic_app_protection_gray.png b/res/drawable-xxhdpi/ic_app_protection_gray.png
new file mode 100644
index 0000000000..b445adc26b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_app_protection_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_brightness_6_black.png b/res/drawable-xxhdpi/ic_brightness_6_black.png
new file mode 100644
index 0000000000..ecf9e4e217
Binary files /dev/null and b/res/drawable-xxhdpi/ic_brightness_6_black.png differ
diff --git a/res/drawable-xxhdpi/ic_brightness_6_gray.png b/res/drawable-xxhdpi/ic_brightness_6_gray.png
new file mode 100644
index 0000000000..c591d93077
Binary files /dev/null and b/res/drawable-xxhdpi/ic_brightness_6_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_delete_black.png b/res/drawable-xxhdpi/ic_delete_black.png
new file mode 100644
index 0000000000..348a93e514
Binary files /dev/null and b/res/drawable-xxhdpi/ic_delete_black.png differ
diff --git a/res/drawable-xxhdpi/ic_delete_gray.png b/res/drawable-xxhdpi/ic_delete_gray.png
new file mode 100644
index 0000000000..5caa4e95a5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_delete_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_message_black.png b/res/drawable-xxhdpi/ic_message_black.png
new file mode 100644
index 0000000000..2bd629d9bb
Binary files /dev/null and b/res/drawable-xxhdpi/ic_message_black.png differ
diff --git a/res/drawable-xxhdpi/ic_message_gray.png b/res/drawable-xxhdpi/ic_message_gray.png
new file mode 100644
index 0000000000..5eb0acf50b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_message_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_notifications_black.png b/res/drawable-xxhdpi/ic_notifications_black.png
new file mode 100644
index 0000000000..fe9be8cc8a
Binary files /dev/null and b/res/drawable-xxhdpi/ic_notifications_black.png differ
diff --git a/res/drawable-xxhdpi/ic_notifications_gray.png b/res/drawable-xxhdpi/ic_notifications_gray.png
new file mode 100644
index 0000000000..2043b8e337
Binary files /dev/null and b/res/drawable-xxhdpi/ic_notifications_gray.png differ
diff --git a/res/drawable-xxhdpi/ic_push_black.png b/res/drawable-xxhdpi/ic_push_black.png
new file mode 100644
index 0000000000..b642256ede
Binary files /dev/null and b/res/drawable-xxhdpi/ic_push_black.png differ
diff --git a/res/drawable-xxhdpi/ic_push_gray.png b/res/drawable-xxhdpi/ic_push_gray.png
new file mode 100644
index 0000000000..24ba43f8ba
Binary files /dev/null and b/res/drawable-xxhdpi/ic_push_gray.png differ
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 3b8a3d94b9..e41ded01f8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -88,4 +88,12 @@
         <attr name="android:foregroundInsidePadding" />
         <attr name="android:foregroundGravity" />
     </declare-styleable>
+
+    <attr name="pref_ic_push" format="reference" />
+    <attr name="pref_ic_sms_mms" format="reference" />
+    <attr name="pref_ic_notifications" format="reference" />
+    <attr name="pref_ic_app_protection" format="reference" />
+    <attr name="pref_ic_appearance" format="reference" />
+    <attr name="pref_ic_storage" format="reference" />
+    <attr name="pref_ic_advanced" format="reference" />
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 74fc1eaa2b..4ca76a77bc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -13,4 +13,5 @@
     <dimen name="conversation_item_drop_shadow_dist">1.5dp</dimen>
     <dimen name="contact_selection_photo_size">50dp</dimen>
     <dimen name="thumbnail_max_size">230dp</dimen>
+    <dimen name="preference_fragment_padding_side">8dp</dimen>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index ea3b6d6f96..0ccc1fd316 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -95,6 +95,14 @@
         <item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
 
         <item name="reminder_header_background">#ff1d85d7</item>
+
+        <item name="pref_ic_push">@drawable/ic_push_black</item>
+        <item name="pref_ic_sms_mms">@drawable/ic_message_black</item>
+        <item name="pref_ic_notifications">@drawable/ic_notifications_black</item>
+        <item name="pref_ic_app_protection">@drawable/ic_app_protection_black</item>
+        <item name="pref_ic_appearance">@drawable/ic_brightness_6_black</item>
+        <item name="pref_ic_storage">@drawable/ic_delete_black</item>
+        <item name="pref_ic_advanced">@drawable/ic_advanced_black</item>
     </style>
 
     <style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
@@ -184,6 +192,14 @@
         <item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
 
         <item name="reminder_header_background">@color/textsecure_primary_dark</item>
+
+        <item name="pref_ic_push">@drawable/ic_push_gray</item>
+        <item name="pref_ic_sms_mms">@drawable/ic_message_gray</item>
+        <item name="pref_ic_notifications">@drawable/ic_notifications_gray</item>
+        <item name="pref_ic_app_protection">@drawable/ic_app_protection_gray</item>
+        <item name="pref_ic_appearance">@drawable/ic_brightness_6_gray</item>
+        <item name="pref_ic_storage">@drawable/ic_delete_gray</item>
+        <item name="pref_ic_advanced">@drawable/ic_advanced_gray</item>
     </style>
 
     <style name="TextSecure.Light.Dialog"
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c86197a658..3d4ef492c2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -4,23 +4,30 @@
     <CheckBoxPreference android:defaultValue="false"
                         android:key="pref_toggle_push_messaging"
                         android:title="@string/preferences__use_data_channel"
-                        android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"/>
+                        android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"
+                        android:icon="?pref_ic_push"/>
 
     <Preference android:key="preference_category_sms_mms"
-                android:title="@string/preferences__sms_mms"/>
+                android:title="@string/preferences__sms_mms"
+                android:icon="?pref_ic_sms_mms"/>
 
     <Preference android:key="preference_category_notifications"
-                android:title="@string/preferences__notifications"/>
+                android:title="@string/preferences__notifications"
+                android:icon="?pref_ic_notifications"/>
 
     <Preference android:key="preference_category_app_protection"
-                android:title="@string/preferences__app_protection"/>
+                android:title="@string/preferences__app_protection"
+                android:icon="?pref_ic_app_protection"/>
 
     <Preference android:key="preference_category_appearance"
-                android:title="@string/preferences__appearance"/>
+                android:title="@string/preferences__appearance"
+                android:icon="?pref_ic_appearance"/>
 
     <Preference android:key="preference_category_storage"
-                android:title="@string/preferences__delete_old_messages"/>
+                android:title="@string/preferences__delete_old_messages"
+                android:icon="?pref_ic_storage"/>
 
     <Preference android:key="preference_category_advanced"
-                android:title="@string/preferences__advanced"/>
+                android:title="@string/preferences__advanced"
+                android:icon="?pref_ic_advanced"/>
 </PreferenceScreen>