diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d3b72e17c..dfc2f4b1a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -38,16 +38,21 @@
     <PreferenceCategory android:title="@string/project_pref">
         <Preference
             android:key="prefFaq"
-            android:title="@string/pref_faq"/>
+            android:title="@string/pref_faq"
+            android:icon="?attr/ic_question_answer" />
+
         <Preference
             android:key="prefKnownIssues"
-            android:title="@string/pref_known_issues"/>
+            android:title="@string/pref_known_issues"
+            android:icon="?attr/ic_known_issues" />
         <Preference
             android:key="prefSendCrashReport"
             android:title="@string/crash_report_title"
-            android:summary="@string/crash_report_sum"/>
+            android:summary="@string/crash_report_sum"
+            android:icon="?attr/ic_bug" />
         <Preference
             android:key="prefAbout"
-            android:title="@string/about_pref"/>
+            android:title="@string/about_pref"
+            android:icon="?attr/action_about" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/core/src/main/res/drawable-hdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..67924a5a2
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_baseline_question_answer_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..daadfb35f
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..549f67bf4
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..3668c9a00
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..a1a2c5b68
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..da5398d15
Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_forum_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..e87df752e
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_baseline_question_answer_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..4b372a4e3
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..9d7603552
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..726eae499
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..0cc401dff
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..d3bcfe7b6
Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_forum_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..731f89c83
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_baseline_question_answer_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..49e5deaa9
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..7416bde03
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..322adb6e0
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..c25860017
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..ac6876140
Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_forum_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..255b82707
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_baseline_question_answer_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..7bbf31c6b
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..fe2c2bee3
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..87f8073ea
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..da3433c61
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..7a3204693
Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_forum_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_baseline_question_answer_white_24db.png b/core/src/main/res/drawable-xxxhdpi/ic_baseline_question_answer_white_24db.png
new file mode 100755
index 000000000..0d697e0f9
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_baseline_question_answer_white_24db.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..b612b2aa9
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..32a3f5511
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..c56590fe0
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..5deea3286
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..0ae33696b
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_forum_grey600_24dp.png differ
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 9d168a1b9..82d0a39bf 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -55,6 +55,9 @@
     <attr name="ic_create_new_folder" format="reference"/>
     <attr name="ic_cast_disconnect" format="reference"/>
     <attr name="ic_swap" format="reference"/>
+    <attr name="ic_question_answer" format="reference" />
+    <attr name="ic_bug" format="reference" />
+    <attr name="ic_known_issues" format="reference" />
     <attr name="master_switch_background" format="color"/>
     <attr name="currently_playing_background" format="color"/>
 
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index cbd1dc88e..7bc27aa6a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -66,8 +66,13 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
+
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
         <item type="attr" name="currently_playing_background">@color/highlight_light</item>
+
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item type="attr" name="about_screen_background">#e5e5e5</item>
@@ -141,6 +146,9 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
         <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -238,6 +246,9 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
         <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -314,6 +325,9 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
         <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>