diff --git a/res/drawable/ic_art.xml b/res/drawable/ic_art.xml
new file mode 100644
index 0000000..91a15c7
--- /dev/null
+++ b/res/drawable/ic_art.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="128"
+    android:viewportWidth="128" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m121.5,4.75h-115a1.75,1.75 0,0 0,-1.75 1.75v115c0,0.043 0.01,0.083 0.013,0.124a1.751,1.751 0,0 0,0.019 0.189,1.706 1.706,0 0,0 0.043,0.166c0.015,0.054 0.029,0.108 0.05,0.16a1.727,1.727 0,0 0,0.075 0.157c0.025,0.049 0.049,0.1 0.079,0.146a1.744,1.744 0,0 0,0.1 0.14c0.034,0.043 0.066,0.087 0.1,0.127a1.737,1.737 0,0 0,0.146 0.13c0.031,0.026 0.057,0.056 0.091,0.081 0.007,0.005 0.016,0.008 0.023,0.013a1.73,1.73 0,0 0,0.174 0.1c0.043,0.023 0.085,0.051 0.129,0.07s0.1,0.034 0.149,0.05a1.747,1.747 0,0 0,0.18 0.056c0.039,0.008 0.08,0.01 0.12,0.016a1.716,1.716 0,0 0,0.226 0.023h0.023,115a1.75,1.75 0,0 0,1.75 -1.75v-114.998a1.75,1.75 0,0 0,-1.74 -1.75zM119.75,8.25v81.838l-19.581,-27.112a1.814,1.814 0,0 0,-2.838 0l-16.814,23.287 -23.945,-33.155a1.813,1.813 0,0 0,-2.837 0l-45.485,62.98v-107.838zM100.385,119.75h-90.463l45.232,-62.628zM104.703,119.75 L82.677,89.25 98.75,66.989 119.75,96.066v23.684z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m48.536,73.543a1.751,1.751 0,0 0,-2.443 0.395l-13.179,18.249a1.75,1.75 0,1 0,2.837 2.049l13.179,-18.25a1.75,1.75 0,0 0,-0.394 -2.443z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m33.039,43.635a10.6,10.6 0,1 0,-10.6 -10.6,10.609 10.609,0 0,0 10.6,10.6zM33.039,25.943a7.1,7.1 0,1 1,-7.1 7.1,7.1 7.1,0 0,1 7.1,-7.101z"/>
+</vector>
diff --git a/res/drawable/ic_battery_percent.xml b/res/drawable/ic_battery_percent.xml
new file mode 100644
index 0000000..c409ebd
--- /dev/null
+++ b/res/drawable/ic_battery_percent.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m363,64h-21.332v-42.668c0,-11.781 -9.555,-21.332 -21.336,-21.332h-128c-11.781,0 -21.332,9.551 -21.332,21.332v42.668h-21.332c-23.527,0 -42.668,19.141 -42.668,42.668v362.664c0,23.527 19.141,42.668 42.668,42.668h213.332c23.523,0 42.668,-19.141 42.668,-42.668v-362.664c0,-23.527 -19.145,-42.668 -42.668,-42.668zM213.668,42.668h85.332v21.332h-85.332zM363,469.332h-213.332v-362.664h213.332l0.027,362.664s-0.008,0 -0.027,0zM363,469.332"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m177.246,326.266 l127.996,-128 30.172,30.168 -128,128zM177.246,326.266"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m320.332,320c0,11.781 -9.551,21.332 -21.332,21.332s-21.332,-9.551 -21.332,-21.332 9.551,-21.332 21.332,-21.332 21.332,9.551 21.332,21.332zM320.332,320"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m235,234.668c0,11.781 -9.551,21.332 -21.332,21.332 -11.785,0 -21.336,-9.551 -21.336,-21.332 0,-11.785 9.551,-21.336 21.336,-21.336 11.781,0 21.332,9.551 21.332,21.336zM235,234.668"/>
+</vector>
diff --git a/res/drawable/ic_battery_styles.xml b/res/drawable/ic_battery_styles.xml
new file mode 100644
index 0000000..d4f0eeb
--- /dev/null
+++ b/res/drawable/ic_battery_styles.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:tint="?android:attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z" />
+</vector>
diff --git a/res/drawable/ic_visualizer.xml b/res/drawable/ic_visualizer.xml
index e03c96d..d34a7fe 100644
--- a/res/drawable/ic_visualizer.xml
+++ b/res/drawable/ic_visualizer.xml
@@ -1,4 +1,8 @@
-<vector android:height="24dp" android:viewportHeight="125"
-    android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M32.356,41.667c-0.828,0 -1.5,0.672 -1.5,1.5v13.666c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5V43.167C33.856,42.339 33.185,41.667 32.356,41.667zM37.397,37.5c-0.828,0 -1.5,0.672 -1.5,1.5v22c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5V39C38.897,38.172 38.226,37.5 37.397,37.5zM42.438,32.334c-0.828,0 -1.5,0.671 -1.5,1.5v32.332c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5V33.834C43.938,33.005 43.267,32.334 42.438,32.334zM47.479,44.834c-0.828,0 -1.5,0.672 -1.5,1.5v7.333c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5v-7.333C48.979,45.506 48.308,44.834 47.479,44.834zM67.644,46.25c-0.828,0 -1.5,0.672 -1.5,1.5v4.5c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5v-4.5C69.144,46.922 68.472,46.25 67.644,46.25zM52.521,37.5c-0.828,0 -1.5,0.672 -1.5,1.5v22c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5V39C54.021,38.172 53.349,37.5 52.521,37.5zM57.562,32.334c-0.828,0 -1.5,0.671 -1.5,1.5v32.332c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5V33.834C59.062,33.005 58.39,32.334 57.562,32.334zM62.603,38.334c-0.828,0 -1.5,0.672 -1.5,1.5v20.333c0,0.828 0.672,1.5 1.5,1.5s1.5,-0.672 1.5,-1.5V39.834C64.103,39.006 63.431,38.334 62.603,38.334z"/>
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="510"
+    android:viewportWidth="510" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M0,420h67.5V225H0V420zM15,405v-30h37.5v30H15zM52.5,330v30H15v-30H52.5zM15,315v-30h37.5v30H15zM52.5,240v30H15v-30H52.5z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M110.625,420h67.5V315h-67.5V420zM125.625,405v-30h37.5v30H125.625zM163.125,330v30h-37.5v-30H163.125z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M221.25,420h67.5V270h-67.5V420zM236.25,405v-30h37.5v30H236.25zM236.25,360v-30h37.5v30H236.25zM273.75,285v30h-37.5v-30H273.75z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M331.875,420h67.5V90h-67.5V420zM346.875,405v-30h37.5v30H346.875zM384.375,195v30h-37.5v-30H384.375zM346.875,180v-30h37.5v30H346.875zM384.375,240v30h-37.5v-30H384.375zM384.375,285v30h-37.5v-30H384.375zM384.375,330v30h-37.5v-30H384.375zM384.375,105v30h-37.5v-30H384.375z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M442.5,180v240H510V180H442.5zM495,195v30h-37.5v-30H495zM457.5,315v-30H495v30H457.5zM495,330v30h-37.5v-30H495zM457.5,270v-30H495v30H457.5zM457.5,405v-30H495v30H457.5z"/>
+</vector>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 84b355f..f6ca20b 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -73,7 +73,7 @@
 
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="lockscreen_visualizer"
-            android:icon="@drawable/ic_media"
+            android:icon="@drawable/ic_visualizer"
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="false" />
 
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 5fc6654..9a0a869 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -87,6 +87,7 @@
 
        <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="status_bar_battery_style"
+            android:icon="@drawable/ic_battery_styles"
             android:title="@string/status_bar_battery_style_title"
             android:summary="%s"
             android:dialogTitle="@string/status_bar_battery_style_title"
@@ -96,6 +97,7 @@
 
        <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="status_bar_show_battery_percent"
+            android:icon="@drawable/ic_battery_percent"
             android:title="@string/battery_percent_title"
             android:dialogTitle="@string/battery_percent_title"
             android:entries="@array/battery_percent_entries"