diff --git a/res/drawable/ic_align.xml b/res/drawable/ic_align.xml
new file mode 100644
index 0000000..e1e2594
--- /dev/null
+++ b/res/drawable/ic_align.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,22H2V2h2V22zM22,7H6v3h16V7zM16,14H6v3h10V14z"/>
+</vector>
diff --git a/res/drawable/ic_arrow.xml b/res/drawable/ic_arrow.xml
index 4a4d330..605638f 100644
--- a/res/drawable/ic_arrow.xml
+++ b/res/drawable/ic_arrow.xml
@@ -1,4 +1,10 @@
-<vector android:height="24dp" android:viewportHeight="408"
-    android:viewportWidth="408" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M86.7,372.3l35.7,35.7l81.6,-81.6l81.6,81.6l35.7,-35.7L204,255L86.7,372.3zM321.3,35.7L285.6,0L204,81.6L122.4,0L86.7,35.7L204,153L321.3,35.7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6 -6,-6z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_cutout.xml b/res/drawable/ic_cutout.xml
index 8d1b239..294c5f0 100644
--- a/res/drawable/ic_cutout.xml
+++ b/res/drawable/ic_cutout.xml
@@ -7,6 +7,6 @@
     android:tint="?android:attr/colorAccent">
 
     <path
-        android:fillColor="?android:attr/colorPrimary"
+        android:fillColor="?android:attr/colorControlNormal"
         android:pathData="M17,1L7,1C5.9,1,5,1.9,5,3v18c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V3C19,1.9,18.1,1,17,1z M17,5v1.6h0V20c0,0.6-0.4,1-1,1H8 c-0.6,0-1-0.4-1-1V6.6V5l0-0.9c0-0.6,0.4-1,1-1h1.7v1.1c0,0.3,0.3,0.6,0.6,0.6h3.5c0.3,0,0.6-0.3,0.6-0.6V3.1H16c0.6,0,1,0.4,1,1 L17,5z" />
 </vector>
diff --git a/res/drawable/ic_event.xml b/res/drawable/ic_event.xml
new file mode 100644
index 0000000..6327f3a
--- /dev/null
+++ b/res/drawable/ic_event.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,10h14v10zM19,8L5,8L5,6h14v2zM12,13h5v5h-5z"/>
+</vector>
diff --git a/res/drawable/ic_font_size.xml b/res/drawable/ic_font_size.xml
new file mode 100644
index 0000000..4cfa4c7
--- /dev/null
+++ b/res/drawable/ic_font_size.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/res/drawable/ic_format_color.xml b/res/drawable/ic_format_color.xml
new file mode 100644
index 0000000..01e9277
--- /dev/null
+++ b/res/drawable/ic_format_color.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M4,17L6.75,14.25L6.72,14.23C6.14,13.64 6.14,12.69 6.72,12.11L11.46,7.37L15.7,11.61L10.96,16.35C10.39,16.93 9.46,16.93 8.87,16.37L8.24,17H4M15.91,2.91C16.5,2.33 17.45,2.33 18.03,2.91L20.16,5.03C20.74,5.62 20.74,6.57 20.16,7.16L16.86,10.45L12.62,6.21L15.91,2.91Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fwb.xml b/res/drawable/ic_fwb.xml
new file mode 100644
index 0000000..65175f0
--- /dev/null
+++ b/res/drawable/ic_fwb.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M12 3L2 12H5V20H10V14H14V15.11L19.43 9.68L12 3M21.04 11.14C20.9 11.14 20.76 11.2 20.65 11.3L19.65 12.3L21.7 14.35L22.7 13.35C22.91 13.14 22.91 12.79 22.7 12.58L21.42 11.3C21.32 11.2 21.18 11.14 21.04 11.14M19.06 12.88L13 18.94V21H15.06L21.11 14.93L19.06 12.88Z" />
+</vector>
diff --git a/res/drawable/ic_gradient.xml b/res/drawable/ic_gradient.xml
new file mode 100644
index 0000000..8cf579c
--- /dev/null
+++ b/res/drawable/ic_gradient.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,9h2v2h-2L11,9zM9,11h2v2L9,13v-2zM13,11h2v2h-2v-2zM15,9h2v2h-2L15,9zM7,9h2v2L7,11L7,9zM19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,18L7,18v-2h2v2zM13,18h-2v-2h2v2zM17,18h-2v-2h2v2zM19,11h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v2L9,15v-2L7,13v2L5,15v-2h2v-2L5,11L5,5h14v6z"/>
+</vector>
diff --git a/res/drawable/ic_hw.xml b/res/drawable/ic_hw.xml
new file mode 100644
index 0000000..cd2c9d8
--- /dev/null
+++ b/res/drawable/ic_hw.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.47,2 2,6.47 2,12c0,5.53 4.47,10 10,10s10,-4.47 10,-10C22,6.47 17.53,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,16.42 16.42,20 12,20z"/>
+</vector>
diff --git a/res/drawable/ic_invert_colors.xml b/res/drawable/ic_invert_colors.xml
new file mode 100644
index 0000000..9d4664a
--- /dev/null
+++ b/res/drawable/ic_invert_colors.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M12,19.58V19.58C10.4,19.58 8.89,18.96 7.76,17.83C6.62,16.69 6,15.19 6,13.58C6,12 6.62,10.47 7.76,9.34L12,5.1M17.66,7.93L12,2.27V2.27L6.34,7.93C3.22,11.05 3.22,16.12 6.34,19.24C7.9,20.8 9.95,21.58 12,21.58C14.05,21.58 16.1,20.8 17.66,19.24C20.78,16.12 20.78,11.05 17.66,7.93Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_light.xml b/res/drawable/ic_light.xml
new file mode 100644
index 0000000..ccb6932
--- /dev/null
+++ b/res/drawable/ic_light.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,19h2v3h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2,11h3v2h-3z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,11h3v2h-3z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.8941,17.8014l1.4071,-1.4071l2.1213,2.1213l-1.4071,1.4071z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4.5842,18.5085l2.1213,-2.1213l1.4071,1.4071l-2.1213,2.1213z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15,8.02V3H9v5.02C7.79,8.94 7,10.37 7,12c0,2.76 2.24,5 5,5s5,-2.24 5,-5C17,10.37 16.21,8.94 15,8.02zM11,5h2v2.1C12.68,7.04 12.34,7 12,7s-0.68,0.04 -1,0.1V5zM12,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3c1.65,0 3,1.35 3,3S13.65,15 12,15z"/>
+</vector>
diff --git a/res/drawable/ic_listview.xml b/res/drawable/ic_listview.xml
new file mode 100644
index 0000000..9cad84c
--- /dev/null
+++ b/res/drawable/ic_listview.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M2,6V8H14V6H2M2,10V12H14V10H2M20.04,10.13C19.9,10.13 19.76,10.19 19.65,10.3L18.65,11.3L20.7,13.35L21.7,12.35C21.92,12.14 21.92,11.79 21.7,11.58L20.42,10.3C20.31,10.19 20.18,10.13 20.04,10.13M18.07,11.88L12,17.94V20H14.06L20.12,13.93L18.07,11.88M2,14V16H10V14H2Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_media_art.xml b/res/drawable/ic_media_art.xml
new file mode 100644
index 0000000..fc039a2
--- /dev/null
+++ b/res/drawable/ic_media_art.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 crDroid Android Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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="?android:attr/colorControlNormal"
+        android:pathData="M18,4L20,8H17L15,4H13L15,8H12L10,4H8L10,8H7L5,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V4H18Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_night.xml b/res/drawable/ic_night.xml
new file mode 100644
index 0000000..95650be
--- /dev/null
+++ b/res/drawable/ic_night.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.78,17.51c-2.47,0 -6.57,-1.33 -8.68,-5.43C8.77,7.57 10.6,3.6 11.63,2.01C6.27,2.2 1.98,6.59 1.98,12c0,0.14 0.02,0.28 0.02,0.42C2.61,12.16 3.28,12 3.98,12c0,0 0,0 0,0c0,-3.09 1.73,-5.77 4.3,-7.1C7.78,7.09 7.74,9.94 9.32,13c1.57,3.04 4.18,4.95 6.8,5.86c-1.23,0.74 -2.65,1.15 -4.13,1.15c-0.5,0 -1,-0.05 -1.48,-0.14c-0.37,0.7 -0.94,1.27 -1.64,1.64c0.98,0.32 2.03,0.5 3.11,0.5c3.5,0 6.58,-1.8 8.37,-4.52C20.18,17.5 19.98,17.51 19.78,17.51z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,16l-0.18,0C6.4,14.84 5.3,14 4,14c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.62,0 2.49,0 3,0c1.1,0 2,-0.9 2,-2C9,16.9 8.1,16 7,16z"/>
+</vector>
diff --git a/res/drawable/ic_opacity.xml b/res/drawable/ic_opacity.xml
new file mode 100644
index 0000000..4750e9b
--- /dev/null
+++ b/res/drawable/ic_opacity.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.66,8L12,2.35 6.34,8C4.78,9.56 4,11.64 4,13.64s0.78,4.11 2.34,5.67 3.61,2.35 5.66,2.35 4.1,-0.79 5.66,-2.35S20,15.64 20,13.64 19.22,9.56 17.66,8zM6,14c0.01,-2 0.62,-3.27 1.76,-4.4L12,5.27l4.24,4.38C17.38,10.77 17.99,12 18,14H6z"/>
+</vector>
diff --git a/res/drawable/ic_qs_column.xml b/res/drawable/ic_qs_column.xml
new file mode 100644
index 0000000..6ed3a56
--- /dev/null
+++ b/res/drawable/ic_qs_column.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+	   android:pathData="M11,2A2,2 0 0,1 13,4V20A2,2 0 0,1 11,22H2V2H11M4,10V14H11V10H4M4,16V20H11V16H4M4,4V8H11V4H4M15,11H18V8H20V11H23V13H20V16H18V13H15V11Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_qs_column_landscape.xml b/res/drawable/ic_qs_column_landscape.xml
new file mode 100644
index 0000000..34f7483
--- /dev/null
+++ b/res/drawable/ic_qs_column_landscape.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+	   android:pathData="M13,2A2,2 0 0,0 11,4V20A2,2 0 0,0 13,22H22V2H13M20,10V14H13V10H20M20,16V20H13V16H20M20,4V8H13V4H20M9,11H6V8H4V11H1V13H4V16H6V13H9V11Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_qs_land.xml b/res/drawable/ic_qs_land.xml
new file mode 100644
index 0000000..faeb799
--- /dev/null
+++ b/res/drawable/ic_qs_land.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M18,16V13H15V22H13V2H15V11H18V8L22,12L18,16M2,12L6,16V13H9V22H11V2H9V11H6V8L2,12Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_qs_row.xml b/res/drawable/ic_qs_row.xml
new file mode 100644
index 0000000..662d0f0
--- /dev/null
+++ b/res/drawable/ic_qs_row.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+	   android:pathData="M8,18H11V15H2V13H22V15H13V18H16L12,22L8,18M12,2L8,6H11V9H2V11H22V9H13V6H16L12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_rounded.xml b/res/drawable/ic_rounded.xml
new file mode 100644
index 0000000..6d02006
--- /dev/null
+++ b/res/drawable/ic_rounded.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="16"
+    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M12.004,0H3.996C1.789,0 0,1.789 0,3.996v8.008C0,14.211 1.789,16 3.996,16h8.008C14.211,16 16,14.211 16,12.004V3.996C16,1.789 14.211,0 12.004,0zM15,11.997C15,13.657 13.655,15 11.997,15H4.003C2.343,15 1,13.655 1,11.997V4.003C1,2.343 2.345,1 4.003,1h7.994C13.657,1 15,2.345 15,4.003V11.997z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_run.xml b/res/drawable/ic_run.xml
new file mode 100644
index 0000000..8b39d6e
--- /dev/null
+++ b/res/drawable/ic_run.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M17,17H7V7H17M21,11V9H19V7C19,5.89 18.1,5 17,5H15V3H13V5H11V3H9V5H7C5.89,5 5,5.89 5,7V9H3V11H5V13H3V15H5V17A2,2 0 0,0 7,19H9V21H11V19H13V21H15V19H17A2,2 0 0,0 19,17V15H21V13H19V11M13,13H11V11H13M15,9H9V15H15V9Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_scroll.xml b/res/drawable/ic_scroll.xml
new file mode 100644
index 0000000..c806cb2
--- /dev/null
+++ b/res/drawable/ic_scroll.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+          android:pathData="M13,9V5L6,12L13,19V14.9C18,14.9 21.5,16.5 24,20C23,15 20,10 13,9M7,8V5L0,12L7,19V16L3,12L7,8Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_soff.xml b/res/drawable/ic_soff.xml
new file mode 100644
index 0000000..0b7c546
--- /dev/null
+++ b/res/drawable/ic_soff.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+android:pathData="M1,4.27L2.28,3L20,20.72L18.73,22L16.73,20H0V18H4C2.89,18 2,17.1 2,16V6C2,5.78 2.04,5.57 2.1,5.37L1,4.27M4,16H12.73L4,7.27V16M20,16V6H7.82L5.82,4H20A2,2 0 0,1 22,6V16A2,2 0 0,1 20,18H24V20H21.82L17.82,16H20Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_swipe.xml b/res/drawable/ic_swipe.xml
new file mode 100644
index 0000000..8c757b8
--- /dev/null
+++ b/res/drawable/ic_swipe.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.5,2v2.02C18.18,2.13 15.22,1 12,1S5.82,2.13 3.5,4.02V2H2v3.5V7h1.5H7V5.5H4.09c2.11,-1.86 4.88,-3 7.91,-3s5.79,1.14 7.91,3H17V7h3.5H22V5.5V2H20.5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18.89,13.77l-3.8,-1.67C14.96,12.04 14.81,12 14.65,12H14l0,-4.37c0,-1.32 -0.96,-2.5 -2.27,-2.62C10.25,4.88 9,6.05 9,7.5v8.15l-1.87,-0.4c-0.19,-0.03 -1.02,-0.15 -1.73,0.56L4,17.22l5.12,5.19C9.49,22.79 10,23 10.53,23h6.55c0.98,0 1.81,-0.7 1.97,-1.67l0.92,-5.44C20.12,15.03 19.68,14.17 18.89,13.77zM18,15.56L17.08,21h-6.55l-3.7,-3.78L11,18.11V7.5C11,7.22 11.22,7 11.5,7S12,7.22 12,7.5v6.18h1.76L18,15.56z"/>
+</vector>
diff --git a/res/drawable/ic_ticker.xml b/res/drawable/ic_ticker.xml
new file mode 100644
index 0000000..db1317d
--- /dev/null
+++ b/res/drawable/ic_ticker.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M18.5 2H5.5C3.6 2 2 3.6 2 5.5V18.5C2 20.4 3.6 22 5.5 22H16L22 16V5.5C22 3.6 20.4 2 18.5 2M13 16H11V13H8V11H11V8H13V11H16V13H13V16M15 20V18.5C15 16.6 16.6 15 18.5 15H20L15 20Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_ticker_animation.xml b/res/drawable/ic_ticker_animation.xml
new file mode 100644
index 0000000..85b505a
--- /dev/null
+++ b/res/drawable/ic_ticker_animation.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M15,2A7,7 0 0,1 22,9C22,11.71 20.46,14.05 18.22,15.22C17.55,16.5 16.5,17.55 15.22,18.22C14.05,20.46 11.71,22 9,22A7,7 0 0,1 2,15C2,12.29 3.54,9.95 5.78,8.78C6.45,7.5 7.5,6.45 8.78,5.78C9.95,3.54 12.29,2 15,2M12,19A7,7 0 0,1 5,12C4.37,12.84 4,13.87 4,15A5,5 0 0,0 9,20C10.13,20 11.16,19.63 12,19M15,16A7,7 0 0,1 8,9H8C7.37,9.84 7,10.87 7,12A5,5 0 0,0 12,17C13.13,17 14.16,16.63 15,16V16M15,4C13.87,4 12.84,4.37 12,5V5A7,7 0 0,1 19,12H19C19.63,11.16 20,10.13 20,9A5,5 0 0,0 15,4M10,9A5,5 0 0,0 15,14C15.6,14 16.17,13.9 16.7,13.7C16.9,13.17 17,12.6 17,12A5,5 0 0,0 12,7C11.4,7 10.83,7.1 10.3,7.3C10.1,7.83 10,8.4 10,9Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_toast.xml b/res/drawable/ic_toast.xml
new file mode 100644
index 0000000..a4260a3
--- /dev/null
+++ b/res/drawable/ic_toast.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M5,5V7H19V5H5M5,9V11H13V9H5M5,13V15H15V13H5Z" />
+</vector>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_animations.xml b/res/xml/cherish_settings_animations.xml
index fbc3254..330325c 100644
--- a/res/xml/cherish_settings_animations.xml
+++ b/res/xml/cherish_settings_animations.xml
@@ -22,6 +22,7 @@
 
     <ListPreference
         android:key="pref_scrollingcache"
+        android:icon="@drawable/ic_scroll"
         android:dialogTitle="@string/pref_scrollingcache_title"
         android:title="@string/pref_scrollingcache_title"
         android:summary="@string/pref_scrollingcache_summary"
@@ -30,6 +31,7 @@
 
     <ListPreference
         android:key="toast_animation"
+        android:icon="@drawable/ic_toast"
         android:title="@string/toast_animation_title"
         android:entries="@array/toast_animation_entries"
         android:entryValues="@array/toast_animation_values"
@@ -37,6 +39,7 @@
 
     <ListPreference
         android:key="listview_animation"
+        android:icon="@drawable/ic_listview"
         android:dialogTitle="@string/listview_animation_title"
         android:title="@string/listview_animation_title"
         android:entries="@array/listview_animation_entries"
@@ -45,6 +48,7 @@
 
     <ListPreference
         android:key="listview_interpolator"
+        android:icon="@drawable/ic_listview"
         android:dialogTitle="@string/listview_interpolator_title"
         android:title="@string/listview_interpolator_title"
         android:entries="@array/listview_interpolator_entries"
@@ -53,18 +57,20 @@
 	    
     <ListPreference
         android:key="screen_off_animation"
+        android:icon="@drawable/ic_soff"
         android:title="@string/screen_off_animation_title"
         android:entries="@array/screen_off_animation_entries"
         android:entryValues="@array/screen_off_animation_values"
         android:persistent="false"
         android:defaultValue="0" />
 		
-		<PreferenceCategory
+<PreferenceCategory
       android:key="quick_settings_animations"
       android:title="@string/qs_tiles">
 
         <com.cherish.settings.preferences.SystemSettingIntListPreference
             android:key="anim_tile_style"
+            android:icon="@drawable/ic_qs_tile"
             android:title="@string/qs_tile_animation_style_title"
             android:entries="@array/qs_tile_animation_style_entries"
             android:entryValues="@array/qs_tile_animation_style_values"
@@ -73,6 +79,7 @@
 
         <com.cherish.settings.preferences.SystemSettingIntListPreference
             android:key="anim_tile_duration"
+            android:icon="@drawable/ic_qs_tile"
             android:title="@string/qs_tile_animation_duration_title"
             android:entries="@array/qs_tile_animation_duration_entries"
             android:entryValues="@array/qs_tile_animation_duration_values"
@@ -81,6 +88,7 @@
 
         <com.cherish.settings.preferences.SystemSettingIntListPreference
             android:key="anim_tile_interpolator"
+            android:icon="@drawable/ic_qs_tile"
             android:title="@string/qs_tile_animation_interpolator_title"
             android:entries="@array/qs_tile_animation_interpolator_entries"
             android:entryValues="@array/qs_tile_animation_interpolator_values"
diff --git a/res/xml/cherish_settings_button.xml b/res/xml/cherish_settings_button.xml
index c961f88..76a676e 100644
--- a/res/xml/cherish_settings_button.xml
+++ b/res/xml/cherish_settings_button.xml
@@ -25,18 +25,21 @@
    <Preference
         android:key="system_navigation_settings_preferences"
         android:title="@string/navbar_gestures_title"
+        android:icon="@drawable/ic_swipe"
         android:summary="@string/navbar_gestures_summary"
         android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
         settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController" />
 
    <com.cherish.settings.preferences.SecureSettingSwitchPreference
         android:key="sysui_nav_bar_inverse"
+        android:icon="@drawable/ic_arrow"
         android:title="@string/navigation_bar_invert_layout_title"
         android:summary="@string/navigation_bar_invert_layout_summary"
         android:defaultValue="false" />
 		
 	<SwitchPreference
         android:key="navigation_bar_show_new"
+        android:icon="@drawable/ic_arrow"
         android:title="@string/navbar_visibility"
         android:summary="@string/navbar_vis_summary" />
 
@@ -55,6 +58,7 @@
 
     <Preference
         android:key="volume_key"
+        android:icon="@drawable/ic_hw"
         android:fragment="com.cherish.settings.fragments.VolumeRockerSettings"
         android:title="@string/volume_title" />
 
@@ -70,12 +74,14 @@
             android:key="button_brightness"
             android:title="@string/button_brightness_title"
             android:max="100"
+            android:icon="@drawable/ic_hw"
             settings:min="0"
             settings:units=""
             android:persistent="false" />
 
         <SwitchPreference
             android:key="button_brightness_sw"
+            android:icon="@drawable/ic_hw"
             android:title="@string/button_brightness_sw_title"
             android:persistent="false" />
 
@@ -84,6 +90,7 @@
             android:entries="@array/backlight_timeout_entries"
             android:entryValues="@array/backlight_timeout_values"
             android:key="backlight_timeout"
+            
             android:persistent="false"
             android:title="@string/backlight_timeout_title" />
 
@@ -95,6 +102,7 @@
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="anbi_enabled_option"
+            android:icon="@drawable/ic_hw"
             android:title="@string/anbi_title"
             android:summary="@string/anbi_summary"
             android:defaultValue="false" />
@@ -113,12 +121,14 @@
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_back_long_press"
+            android:icon="@drawable/ic_hw"
             android:summary="@string/hardware_keys_long_press_summary"
             android:title="@string/hardware_keys_long_press_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_back_double_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_double_tap_summary"
             android:title="@string/hardware_keys_double_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
@@ -130,24 +140,28 @@
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_home_single_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_single_tap_summary"
             android:title="@string/hardware_keys_single_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_home_long_press"
+            android:icon="@drawable/ic_hw"
             android:summary="@string/hardware_keys_long_press_summary"
             android:title="@string/hardware_keys_long_press_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_home_double_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_double_tap_summary"
             android:title="@string/hardware_keys_double_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="allow_incall_home"
+            android:icon="@drawable/ic_call"
             android:title="@string/allow_incall_home_title"
             android:summary="@string/allow_incall_home_summary"
             android:defaultValue="true" />
@@ -160,18 +174,21 @@
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_overview_single_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_single_tap_summary"
             android:title="@string/hardware_keys_single_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_overview_long_press"
+            android:icon="@drawable/ic_hw"
             android:summary="@string/hardware_keys_long_press_summary"
             android:title="@string/hardware_keys_long_press_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_overview_double_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_double_tap_summary"
             android:title="@string/hardware_keys_double_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
@@ -190,12 +207,14 @@
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_menu_long_press"
+            android:icon="@drawable/ic_hw"
             android:summary="@string/hardware_keys_long_press_summary"
             android:title="@string/hardware_keys_long_press_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_menu_double_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_double_tap_summary"
             android:title="@string/hardware_keys_double_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
@@ -208,18 +227,21 @@
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_assist_single_tap"
+            android:icon="@drawable/ic_hw"
             android:summary="@string/hardware_keys_single_tap_summary"
             android:title="@string/hardware_keys_single_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_assist_long_press"
+            android:icon="@drawable/ic_hw"
             android:summary="@string/hardware_keys_long_press_summary"
             android:title="@string/hardware_keys_long_press_title" >
         </com.cherish.settings.preferences.ActionPreference>
 
         <com.cherish.settings.preferences.ActionPreference
             android:key="hwkeys_button_assist_double_tap"
+            android:icon="@drawable/ic_tap"
             android:summary="@string/hardware_keys_double_tap_summary"
             android:title="@string/hardware_keys_double_tap_title" >
         </com.cherish.settings.preferences.ActionPreference>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 7968fba..e24abf2 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -74,6 +74,7 @@
     <com.cherish.settings.preferences.SecureSettingListPreference
         android:key="lockscreen_clock_selection"
         android:title="@string/lockscreen_clock_title"
+        android:icon="@drawable/ic_clock"
         android:dialogTitle="@string/lockscreen_clock_dialog_title"
         android:entries="@array/lockscreen_clock_titles"
         android:entryValues="@array/lockscreen_clock_values"
@@ -82,6 +83,7 @@
 
     <com.cherish.settings.preferences.CustomSeekBarPreference
         android:key="lockclock_font_size"
+        android:icon="@drawable/ic_font_size"
         android:title="@string/lockclock_font_size_title"
         android:max="101"
         settings:min="50"
@@ -91,6 +93,7 @@
 
     <com.cherish.settings.preferences.CustomSeekBarPreference
         android:key="custom_text_clock_font_size"
+        android:icon="@drawable/ic_font_size"
         android:title="@string/custom_text_clock_font_size_title"
         android:max="50"
         settings:min="35"
@@ -103,6 +106,7 @@
 
     <com.cherish.settings.preferences.SecureSettingListPreference
         android:key="lockscreen_date_selection"
+        android:icon="@drawable/ic_event"
         android:title="@string/lockscreen_date_selection_title"
         android:dialogTitle="@string/lockscreen_date_dialog_title"
         android:entries="@array/lockscreen_date_selection_entries"
@@ -112,6 +116,7 @@
 
     <com.cherish.settings.preferences.CustomSeekBarPreference
         android:key="lockdate_font_size"
+        android:icon="@drawable/ic_font_size"
         android:title="@string/lockdate_font_size_title"
         android:max="25"
         settings:min="10"
@@ -124,6 +129,7 @@
 
     <com.cherish.settings.preferences.CustomSeekBarPreference
         android:key="lockowner_font_size"
+        android:icon="@drawable/ic_font_size"
         android:title="@string/lockowner_font_size_title"
         android:max="25"
         settings:min="10"
@@ -136,6 +142,7 @@
 
     <com.cherish.settings.preferences.SecureSettingListPreference
         android:key="center_text_clock"
+        android:icon="@drawable/ic_align"
         android:title="@string/center_text_clock_title"
         android:dialogTitle="@string/center_text_clock_title"
         android:entries="@array/lockscreen_item_alignment_entries"
@@ -145,6 +152,7 @@
 
     <com.cherish.settings.preferences.SecureSettingListPreference
         android:key="lock_date_alignment"
+        android:icon="@drawable/ic_align"
         android:title="@string/lockscreen_date_alignment_title"
         android:dialogTitle="@string/lockscreen_date_alignment_title"
         android:entries="@array/lockscreen_item_alignment_entries"
@@ -154,6 +162,7 @@
 
     <com.cherish.settings.preferences.SecureSettingListPreference
         android:key="lockscreen_weather_alignment"
+        android:icon="@drawable/ic_align"
         android:title="@string/lockscreen_weather_alignment_title"
         android:dialogTitle="@string/lockscreen_weather_alignment_title"
         android:entries="@array/lockscreen_item_alignment_entries"
@@ -163,6 +172,7 @@
 
     <com.cherish.settings.preferences.SecureSettingListPreference
         android:key="lock_ownerinfo_alignment"
+        android:icon="@drawable/ic_align"
         android:title="@string/lockscreen_ownerinfo_alignment_title"
         android:dialogTitle="@string/lockscreen_ownerinfo_alignment_title"
         android:entries="@array/lockscreen_item_alignment_entries"
@@ -172,6 +182,7 @@
 
     <com.cherish.settings.preferences.SecureSettingSeekBarPreference
         android:key="lockscreen_item_padding"
+        android:icon="@drawable/ic_align"
         android:title="@string/lockscreen_item_padding_title"
         android:defaultValue="35"
         android:max="65"
@@ -181,6 +192,7 @@
 
     <PreferenceScreen
     	android:key="lockscreen_colors"
+        android:icon="@drawable/ic_accent_picker"
        	android:title="@string/lockscreen_colors"
         android:summary="@string/lockscreen_colors_summary"
        	android:fragment="com.cherish.settings.fragments.LockColors" />
@@ -206,6 +218,7 @@
 
             <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="lockscreen_weather_style"
+            android:icon="@drawable/ic_night"
             android:title="@string/lockscreen_weather_style_title"
             android:dialogTitle="@string/lockscreen_weather_style_title"
             android:entries="@array/lockscreen_weather_style_entries"
@@ -242,6 +255,7 @@
 		
 	<com.cherish.settings.preferences.SystemSettingListPreference
             android:key="lockscreen_albumart_filter"
+            android:icon="@drawable/ic_media_art"
             android:title="@string/lockscreen_albumart_filter_title"
             android:summary="%s"
             android:entries="@array/lockscreen_albumart_filter_entries"
@@ -251,6 +265,7 @@
 
     <Preference
         android:key="keygaurd_batterybar"
+        android:icon="@drawable/ic_battery_info"
         android:title="@string/keyguard_show_battery_title"
         android:summary="@string/keyguard_show_battery_summary"
         android:fragment="com.cherish.settings.fragments.KeygaurdBatteryBar" />
@@ -275,6 +290,7 @@
 
   <com.cherish.settings.preferences.SystemSettingListPreference 
             android:key="fod_recognizing_animation_list" 
+            android:icon="@drawable/ic_fingerprint"
             android:title="@string/fod_recog_animation_effect_title" 
             android:summary="%s" 
             android:entries="@array/fod_recognizing_animation_entries" 
@@ -285,6 +301,7 @@
   <!-- FOD pressed color -->
   <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="fod_color"
+            android:icon="@drawable/ic_fingerprint"
             android:dialogTitle="@string/fod_pressed_color_title"
             android:title="@string/fod_pressed_color_title"
             android:summary="%s"
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index b84cf08..dfd6b56 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -91,6 +91,7 @@
         <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="sysui_rounded_fwvals"
             android:title="@string/corner_fwvals"
+			android:icon="@drawable/ic_rounded"
             android:summary="@string/corner_fwvals_summary"
             android:defaultValue="true"
             android:disableDependentsState="true" />
diff --git a/res/xml/cherish_settings_notifications.xml b/res/xml/cherish_settings_notifications.xml
index a37cca7..6b2fc09 100644
--- a/res/xml/cherish_settings_notifications.xml
+++ b/res/xml/cherish_settings_notifications.xml
@@ -52,22 +52,10 @@
 
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="less_boring_heads_up"
+		android:icon="@drawable/ic_notification"
         android:title="@string/less_boring_heads_up_title"
         android:summary="@string/less_boring_heads_up_summary"
         android:defaultValue="false" />
-
-    <PreferenceCategory
-        android:key="media_category"
-        android:title="@string/media_category" >
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="artwork_media_background"
-            android:icon="@drawable/ic_media"
-            android:title="@string/artwork_media_background_title"
-            android:summary="@string/artwork_media_background_summary"
-            android:defaultValue="true" />
-
-    </PreferenceCategory>
 	
 	<!-- Notification background opacity -->
     <com.cherish.settings.preferences.SystemSettingSeekBarPreference
@@ -97,6 +85,7 @@
 
     <Preference
         android:key="notification_light"
+		android:icon="@drawable/ic_light"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         android:title="@string/notification_light_settings" >
         <extra
diff --git a/res/xml/cherish_settings_power.xml b/res/xml/cherish_settings_power.xml
index d8dc585..e02dc87 100644
--- a/res/xml/cherish_settings_power.xml
+++ b/res/xml/cherish_settings_power.xml
@@ -20,6 +20,7 @@
 
     <ListPreference
         android:key="power_menu_animations"
+		android:icon="@drawable/ic_power"
         android:title="@string/power_menu_animation_title"
         android:dialogTitle="@string/power_menu_animation_dialog_title"
         android:entries="@array/power_menu_animations_entries"
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index a2e82d9..40a1fbf 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -80,6 +80,7 @@
 		
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_running_services_toggle"
+            android:icon="@drawable/ic_run"
             android:title="@string/qs_running_services_title"
             android:summary="@string/qs_running_services_summary"
             android:defaultValue="false" />
@@ -97,6 +98,7 @@
 	
 	<com.cherish.settings.preferences.SecureSettingListPreference
         android:key="qs_show_brightness_slider"
+        android:icon="@drawable/ic_brightness_control"
         android:title="@string/qs_show_brightness_slider_title"
         android:summary="%s"
         android:dialogTitle="@string/qs_show_brightness_slider_title"
@@ -106,6 +108,7 @@
 		
 		<com.cherish.settings.preferences.SecureSettingListPreference
             android:key="qqs_show_brightness_slider"
+            android:icon="@drawable/ic_brightness_qs"
             android:title="@string/qqs_brightness_slider_title"
             android:entries="@array/qs_show_brightness_slider_values"
             android:entryValues="@array/qs_show_brightness_slider_values"
@@ -147,6 +150,7 @@
 
         <com.cherish.settings.preferences.CustomSystemSeekBarPreference
             android:key="qs_rows_portrait"
+            android:icon="@drawable/ic_qs_row"
             android:title="@string/qs_rows_portrait_title"
             android:max="5"
             android:min="1"
@@ -155,6 +159,7 @@
 
         <com.cherish.settings.preferences.CustomSystemSeekBarPreference
             android:key="qs_rows_landscape"
+            android:icon="@drawable/ic_qs_land"
             android:title="@string/qs_rows_landscape_title"
             android:max="5"
             android:min="1"
@@ -163,6 +168,7 @@
 
         <com.cherish.settings.preferences.CustomSystemSeekBarPreference
             android:key="qs_columns_portrait"
+            android:icon="@drawable/ic_qs_column"
             android:title="@string/qs_columns_portrait_title"
             android:max="7"
             android:min="1"
@@ -171,6 +177,7 @@
 
         <com.cherish.settings.preferences.CustomSystemSeekBarPreference
             android:key="qs_columns_landscape"
+            android:icon="@drawable/ic_qs_column_landscape"
             android:title="@string/qs_columns_landscape_title"
             android:max="9"
             android:min="1"
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 44bcc56..94dda31 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -91,6 +91,7 @@
 			
 	<com.cherish.settings.preferences.SystemSettingListPreference
         android:key="status_bar_show_ticker"
+        android:icon="@drawable/ic_ticker"
         android:title="@string/ticker_screen_title"
         android:entries="@array/ticker_mode_entries"
         android:entryValues="@array/ticker_mode_values"
@@ -98,6 +99,7 @@
 
     <com.cherish.settings.preferences.SystemSettingListPreference
         android:key="status_bar_ticker_animation_mode"
+        android:icon="@drawable/ic_ticker_animation"
         android:title="@string/ticker_animation_mode_title"
         android:entries="@array/ticker_animation_mode_entries"
         android:entryValues="@array/ticker_animation_mode_values"
@@ -105,6 +107,7 @@
 
     <com.cherish.settings.preferences.SystemSettingSeekBarPreference
         android:key="status_bar_ticker_tick_duration"
+        android:icon="@drawable/ic_clock"
         android:title="@string/ticker_tick_duration_title"
         settings:min="500"
         settings:interval="100"
@@ -115,6 +118,7 @@
 	<!-- Statusbar Lyric -->
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="status_bar_show_lyric"
+        android:icon="@drawable/ic_music"
         android:title="@string/status_bar_show_lyric_title"
         android:summary="@string/status_bar_show_lyric_summary"
         android:defaultValue="true" />
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 0fd17d9..03cd346 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -32,7 +32,7 @@
 
     <net.margaritov.preference.colorpicker.ColorPickerPreference
         android:key="gradient_color"
-        android:icon="@drawable/ic_accent_picker"
+        android:icon="@drawable/ic_gradient"
         android:title="@string/gradient_color"
         android:summary="@string/gradient_summary"
         android:defaultValue="0xffffff"
@@ -94,24 +94,28 @@
 		
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="statusbar_icons_style"
+            android:icon="@drawable/ic_invert_colors"
             android:title="@string/statusbar_icons_style"
             android:summary="@string/statusbar_icons_style_summary"
             android:defaultValue="true" />
 			
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="headers_icons_style"
+            android:icon="@drawable/ic_invert_colors"
             android:title="@string/header_icons_style"
             android:summary="@string/header_icons_style_summary"
             android:defaultValue="true" />
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_tiles_bg_disco"
+            android:icon="@drawable/ic_shape2_icon"
             android:title="@string/qs_panel_bg_disco_title"
             android:summary="@string/qs_panel_bg_disco_summary"
             android:defaultValue="false" />
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_panel_bg_use_new_tint"
+            android:icon="@drawable/ic_color"
             android:title="@string/qs_bg_use_new_tint"
 	    android:dialogTitle="@string/qs_bg_use_new_tint"
             android:entries="@array/qs_tint_entries"
@@ -128,6 +132,7 @@
         <!-- QS panel opacity -->
         <com.cherish.settings.preferences.SystemSettingSeekBarPreference
             android:key="qs_panel_bg_alpha"
+            android:icon="@drawable/ic_opacity"
             android:title="@string/qs_panel_bg_alpha_title"
             android:defaultValue="255"
             android:max="255"
@@ -136,6 +141,7 @@
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_panel_bg_use_fw"
+            android:icon="@drawable/ic_fwb"
             android:title="@string/qs_panel_bg_use_fw_title"
             android:summary="@string/qs_panel_bg_use_fw_summary"
             android:defaultValue="true"
@@ -151,6 +157,7 @@
 
         <net.margaritov.preference.colorpicker.ColorPickerPreference
             android:key="qs_panel_color"
+            android:icon="@drawable/ic_accent_picker"
             android:title="@string/qs_panel_bg_color_title"
             android:defaultValue="0xFFFFFFFF"
             android:persistent="false"
@@ -182,6 +189,7 @@
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="volume_panel_tint"
+            android:icon="@drawable/ic_format_color"
             android:summary="@string/volume_panel_tint_summary"
             android:title="@string/volume_panel_tint_title"
             android:defaultValue="false" />