diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24px.xml b/app/src/main/res/drawable/ic_arrow_back_black_24px.xml
new file mode 100644
index 00000000..9b1cf975
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_black_24px.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24px.xml b/app/src/main/res/drawable/ic_bug_report_black_24px.xml
new file mode 100644
index 00000000..58308de9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bug_report_black_24px.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M20 8h-2.81c-.45-.78-1.07-1.45-1.82-1.96L17 4.41 15.59 3l-2.17 2.17C12.96 5.06
+12.49 5 12 5c-.49 0-.96 .06 -1.41 .17 L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26
+7.22 6.81 8H4v2h2.09c-.05 .33 -.09 .66 -.09 1v1H4v2h2v1c0 .34 .04 .67 .09
+1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33 .09 -.66
+.09 -1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8zm-6 8h-4v-2h4v2zm0-4h-4v-2h4v2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_clear_black_24px.xml b/app/src/main/res/drawable/ic_clear_black_24px.xml
new file mode 100644
index 00000000..178a0127
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear_black_24px.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
+19 19 17.59 13.41 12z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_color_lens_black_24px.xml b/app/src/main/res/drawable/ic_color_lens_black_24px.xml
new file mode 100644
index 00000000..9294749e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens_black_24px.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c.83 0 1.5-.67 1.5-1.5
+0-.39-.15-.74-.39-1.01-.23-.26-.38-.61-.38-.99 0-.83 .67 -1.5 1.5-1.5H16c2.76 0
+5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-.83 0-1.5-.67-1.5-1.5S5.67 9 6.5 9 8 9.67
+8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5 .67 1.5
+1.5S10.33 8 9.5 8zm5 0c-.83 0-1.5-.67-1.5-1.5S13.67 5 14.5 5s1.5 .67 1.5
+1.5S15.33 8 14.5 8zm3 4c-.83 0-1.5-.67-1.5-1.5S16.67 9 17.5 9s1.5 .67 1.5
+1.5-.67 1.5-1.5 1.5z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_file_download_black_24px.xml b/app/src/main/res/drawable/ic_file_download_black_24px.xml
new file mode 100644
index 00000000..102d4970
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_download_black_24px.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml b/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml
new file mode 100644
index 00000000..3eef7771
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M4 10.5c-.83 0-1.5 .67 -1.5 1.5s.67 1.5 1.5 1.5 1.5-.67
+1.5-1.5-.67-1.5-1.5-1.5zm0-6c-.83 0-1.5 .67 -1.5 1.5S3.17 7.5 4 7.5 5.5 6.83 5.5
+6 4.83 4.5 4 4.5zm0 12c-.83 0-1.5 .68 -1.5 1.5s.68 1.5 1.5 1.5 1.5-.68
+1.5-1.5-.67-1.5-1.5-1.5zM7 19h14v-2H7v2zm0-6h14v-2H7v2zm0-8v2h14V5H7z" />
+    <path
+        android:pathData="M0 0h24v24H0V0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_format_size_black_24px.xml b/app/src/main/res/drawable/ic_format_size_black_24px.xml
new file mode 100644
index 00000000..184d252f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_size_black_24px.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M9 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_notifications_black_24px.xml b/app/src/main/res/drawable/ic_notifications_black_24px.xml
new file mode 100644
index 00000000..d74fba00
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_black_24px.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M12 22c1.1 0 2-.9 2-2h-4c0 1.1 .89 2 2
+2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5 .67 -1.5
+1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_open_in_new_black_24px.xml b/app/src/main/res/drawable/ic_open_in_new_black_24px.xml
new file mode 100644
index 00000000..d6abe89b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_new_black_24px.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1 .89 2 2 2h14c1.1 0 2-.9
+2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_people_black_24px.xml b/app/src/main/res/drawable/ic_people_black_24px.xml
new file mode 100644
index 00000000..8cbf2980
--- /dev/null
+++ b/app/src/main/res/drawable/ic_people_black_24px.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8
+0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7
+1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62 .02 -.97 .05 1.16
+.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_person_black_24px.xml b/app/src/main/res/drawable/ic_person_black_24px.xml
new file mode 100644
index 00000000..ecd54ce8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_black_24px.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8
+4v2h16v-2c0-2.66-5.33-4-8-4z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_share_black_24px.xml b/app/src/main/res/drawable/ic_share_black_24px.xml
new file mode 100644
index 00000000..a1b46680
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_black_24px.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M18 16.08c-.76 0-1.44 .3 -1.96 .77 L8.91 12.7c.05-.23 .09 -.46 .09
+-.7s-.04-.47-.09-.7l7.05-4.11c.54 .5 1.25 .81 2.04 .81 1.66 0 3-1.34
+3-3s-1.34-3-3-3-3 1.34-3 3c0 .24 .04 .47 .09 .7L8.04 9.81C7.5 9.31 6.79 9 6
+9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05 .21 -.08
+.43 -.08 .65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31
+2.92-2.92s-1.31-2.92-2.92-2.92z" />
+</vector>
+
diff --git a/app/src/main/res/drawable/ic_short_text_black_24px.xml b/app/src/main/res/drawable/ic_short_text_black_24px.xml
new file mode 100644
index 00000000..178a0127
--- /dev/null
+++ b/app/src/main/res/drawable/ic_short_text_black_24px.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
+19 19 17.59 13.41 12z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_thumb_up_black_24px.xml b/app/src/main/res/drawable/ic_thumb_up_black_24px.xml
new file mode 100644
index 00000000..5d721440
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_up_black_24px.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57 .03
+-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1 .9 2
+2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23 .14 -.47 .14
+-.73v-1.91l-.01-.01L23 10z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml b/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml
new file mode 100644
index 00000000..14dd79ed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M22 4v-.5C22 2.12 20.88 1 19.5 1S17 2.12 17 3.5V4c-.55 0-1 .45-1 1v4c0 .55 .45 1
+1 1h5c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zm-.8 0h-3.4v-.5c0-.94 .76 -1.7
+1.7-1.7s1.7 .76 1.7 1.7V4zm-2.28 8c.04 .33 .08 .66 .08 1 0 2.08-.8 3.97-2.1
+5.39-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H7v-2h2c.55 0 1-.45
+1-1V8h2c1.1 0 2-.9 2-2V3.46c-.95-.3-1.95-.46-3-.46C5.48 3 1 7.48 1 13s4.48 10 10
+10 10-4.48 10-10c0-.34-.02-.67-.05-1h-2.03zM10 20.93c-3.95-.49-7-3.85-7-7.93
+0-.62 .08 -1.21 .21 -1.79L8 16v1c0 1.1 .9 2 2 2v1.93z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_zoom_out_map_black_24px.xml b/app/src/main/res/drawable/ic_zoom_out_map_black_24px.xml
new file mode 100644
index 00000000..8fc5ffb1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zoom_out_map_black_24px.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M15 3l2.3 2.3-2.89 2.87 1.42 1.42L18.7 6.7 21 9V3zM3 9l2.3-2.3 2.87 2.89
+1.42-1.42L6.7 5.3 9 3H3zm6 12l-2.3-2.3 2.89-2.87-1.42-1.42L5.3 17.3 3
+15v6zm12-6l-2.3 2.3-2.87-2.89-1.42 1.42 2.89 2.87L15 21h6z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml
index b5f0caca..87be0a87 100644
--- a/app/src/main/res/xml/preferences__master.xml
+++ b/app/src/main/res/xml/preferences__master.xml
@@ -8,12 +8,14 @@
         <Preference
             android:key="@string/pref_key__cat_themes"
             android:title="@string/pref_title__themes"
-            android:summary="@string/pref_desc__themes" />
+            android:summary="@string/pref_desc__themes"
+            android:icon="@drawable/ic_color_lens_black_24px"/>
 
         <Preference
             android:key="@string/pref_key__cat_nav_slider"
             android:summary="@string/pref_desc__sub_nav_slider"
-            android:title="@string/pref_title__sub_nav_slider" />
+            android:title="@string/pref_title__sub_nav_slider"
+            android:icon="@drawable/ic_visibility_on_black_24px"/>
 
         <ListPreference
             android:dialogTitle="@string/pref_title__font_size"
@@ -21,31 +23,36 @@
             android:entryValues="@array/pref_entries_values__font_size"
             android:key="@string/pref_key__font_size"
             android:summary="%s"
-            android:title="@string/pref_title__font_size"/>
+            android:title="@string/pref_title__font_size"
+            android:icon="@drawable/ic_format_size_black_24px"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:key="@string/pref_key__intellihide_toolbars"
             android:summary="@string/pref_desc__intellihide_toolbars"
-            android:title="@string/pref_title__intellihide_toolbars"/>
+            android:title="@string/pref_title__intellihide_toolbars"
+            android:icon="@drawable/ic_zoom_out_map_black_24px"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:key="@string/pref_key__extended_notifications"
             android:summary="@string/pref_desc__extended_notifications"
-            android:title="@string/pref_title__extended_notifications"/>
+            android:title="@string/pref_title__extended_notifications"
+            android:icon="@drawable/ic_notifications_black_24px"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:key="@string/pref_key__append_shared_via_app"
             android:summary="@string/pref_desc__append_shared_via_app"
-            android:title="@string/pref_title__append_shared_via_app"/>
+            android:title="@string/pref_title__append_shared_via_app"
+            android:icon="@drawable/ic_thumb_up_black_24px"/>
 
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="true"
             android:key="@string/pref_key__chrome_custom_tabs_enabled"
             android:summary="@string/pref_desc__chrome_custom_tabs_enabled"
-            android:title="@string/pref_title__chrome_custom_tabs_enabled"/>
+            android:title="@string/pref_title__chrome_custom_tabs_enabled"
+            android:icon="@drawable/ic_open_in_new_black_24px"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
@@ -56,22 +63,26 @@
         <Preference
             android:key="@string/pref_key__personal_settings"
             android:summary="@string/pref_desc__personal_settings"
-            android:title="@string/pref_title__personal_settings"/>
-
-        <Preference
-            android:key="@string/pref_key__manage_tags"
-            android:summary="@string/pref_desc__manage_tags"
-            android:title="@string/pref_title__manage_tags"/>
+            android:title="@string/pref_title__personal_settings"
+            android:icon="@drawable/ic_person_black_24px"/>
 
         <Preference
             android:key="@string/pref_key__manage_contacts"
             android:summary="@string/pref_desc__manage_contacts"
-            android:title="@string/pref_title__manage_contacts"/>
+            android:title="@string/pref_title__manage_contacts"
+            android:icon="@drawable/ic_people_black_24px"/>
+        
+        <Preference
+            android:key="@string/pref_key__manage_tags"
+            android:summary="@string/pref_desc__manage_tags"
+            android:title="@string/pref_title__manage_tags"
+            android:icon="@drawable/ic_format_list_bulleted_black_24px"/>
 
         <Preference
             android:key="@string/pref_key__change_account"
             android:summary="@string/pref_desc__change_account"
-            android:title="@string/pref_title__change_account"/>
+            android:title="@string/pref_title__change_account"
+            android:icon="@drawable/ic_arrow_back_black_24px"/>
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
     <!-- Networking -->
@@ -82,17 +93,20 @@
             android:defaultValue="true"
             android:key="@string/pref_key__load_images"
             android:summary="@string/pref_desc__load_images"
-            android:title="@string/pref_title__load_images"/>
+            android:title="@string/pref_title__load_images"
+            android:icon="@drawable/ic_file_download_black_24px"/>
 
         <Preference
             android:key="@string/pref_key__clear_cache"
             android:summary="@string/pref_desc__clear_cache"
-            android:title="@string/pref_title__clear_cache"/>
+            android:title="@string/pref_title__clear_cache"
+            android:icon="@drawable/ic_clear_black_24px"/>
 
         <Preference
             android:key="@string/pref_key__cat_proxy"
             android:summary="@string/pref_desc__sub_proxy"
-            android:title="@string/pref_title__sub_proxy" />
+            android:title="@string/pref_title__sub_proxy"
+            android:icon="@drawable/ic_vpn_lock_black_24px"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 
@@ -104,7 +118,8 @@
         <Preference
             android:key="@string/pref_key__cat_debugging"
             android:summary="@string/pref_desc__sub_logging"
-            android:title="@string/pref_title__sub_logging" />
+            android:title="@string/pref_title__sub_logging"
+            android:icon="@drawable/ic_bug_report_black_24px"/>
 
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file