diff --git a/res/drawable/ic_24h.xml b/res/drawable/ic_24h.xml
new file mode 100644
index 0000000..bb8fea9
--- /dev/null
+++ b/res/drawable/ic_24h.xml
@@ -0,0 +1,16 @@
+<vector android:height="24dp" android:viewportHeight="480"
+    android:viewportWidth="480" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m72,160h40v-16h-32v-16h24c4.418,0 8,-3.582 8,-8v-32c0,-4.418 -3.582,-8 -8,-8h-32c-4.418,0 -8,3.582 -8,8v16h16v-8h16v16h-24c-4.418,0 -8,3.582 -8,8v32c0,4.418 3.582,8 8,8zM72,160"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m136,128h24v32h16v-80h-16v32h-16v-32h-16v40c0,4.418 3.582,8 8,8zM136,128"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m256,32c-8.313,0.004 -16.617,0.457 -24.879,1.359l1.758,15.914c87.73,-9.754 172.047,36.973 210.285,116.527 38.238,79.559 22.055,174.59 -40.359,237.004 -62.414,62.414 -157.445,78.598 -237.004,40.359 -79.555,-38.238 -126.281,-122.555 -116.527,-210.285l-15.914,-1.758c-0.902,8.262 -1.355,16.566 -1.359,24.879 0,123.711 100.289,224 224,224s224,-100.289 224,-224 -100.289,-224 -224,-224zM256,32"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m64.176,247.664c-0.113,2.734 -0.176,5.543 -0.176,8.336 0,106.039 85.961,192 192,192s192,-85.961 192,-192 -85.961,-192 -192,-192c-2.793,0 -5.602,0.063 -8.336,0.176l0.672,16c2.543,-0.117 5.098,-0.176 7.664,-0.176 97.203,0 176,78.797 176,176s-78.797,176 -176,176 -176,-78.797 -176,-176c0,-2.566 0.055,-5.121 0.168,-7.664zM64.176,247.664"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m248,96h16v16h-16zM248,96"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m96,248h16v16h-16zM96,248"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m137.207,363.48 l11.316,-11.316 11.313,11.316 -11.313,11.313zM137.207,363.48"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m248,400h16v16h-16zM248,400"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m352.168,363.48 l11.313,-11.313 11.316,11.313 -11.316,11.313zM352.168,363.48"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m400,248h16v16h-16zM400,248"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m352.168,148.52 l11.313,-11.313 11.316,11.313 -11.316,11.316zM352.168,148.52"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m152,248v16h78.055l20.289,20.289c3.125,3.121 8.188,3.121 11.313,0l22.633,-22.633c3.121,-3.125 3.121,-8.188 0,-11.313l-20.289,-20.289v-94.055h-16v94.055l-17.945,17.945zM256,244.68 L267.32,256 256,267.32 244.68,256zM256,244.68"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m120,240c66.273,0 120,-53.727 120,-120s-53.727,-120 -120,-120 -120,53.727 -120,120c0.074,66.242 53.758,119.926 120,120zM120,16c57.438,0 104,46.563 104,104s-46.563,104 -104,104 -104,-46.563 -104,-104c0.066,-57.41 46.59,-103.934 104,-104zM120,16"/>
+</vector>
diff --git a/res/drawable/ic_calendar.xml b/res/drawable/ic_calendar.xml
new file mode 100644
index 0000000..1a41dfe
--- /dev/null
+++ b/res/drawable/ic_calendar.xml
@@ -0,0 +1,19 @@
+<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="M414.09,199.328m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M335.046,199.328m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M256.001,199.328m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M176.957,199.328m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M97.912,199.328m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M414.09,278.373m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M335.046,278.373m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M256.001,278.373m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M97.912,278.373m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M414.09,357.417m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M335.046,357.417m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M256.001,357.417m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M176.957,357.417m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M97.912,357.417m-12.308,0a12.308,12.308 0,1 1,24.616 0a12.308,12.308 0,1 1,-24.616 0"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M214.1,230.65H139.81c-5.844,0 -10.58,4.736 -10.58,10.58v74.291c0,5.844 4.736,10.58 10.58,10.58H214.1c5.844,0 10.58,-4.736 10.58,-10.58v-74.289C224.68,235.387 219.943,230.65 214.1,230.65zM203.52,304.94H150.39v-53.129h53.129V304.94z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M476.733,89.114h-77.709V75.535c0,-6.493 -5.263,-11.756 -11.756,-11.756c-6.491,0 -11.756,5.264 -11.756,11.756v13.579h-64.001V75.535c0,-6.493 -5.264,-11.756 -11.756,-11.756c-6.493,0 -11.756,5.264 -11.756,11.756v13.579H224V75.535c0,-6.493 -5.263,-11.756 -11.756,-11.756s-11.756,5.264 -11.756,11.756v13.579h-64.001V75.535c0,-6.493 -5.263,-11.756 -11.756,-11.756s-11.756,5.264 -11.756,11.756v13.579h-77.71C15.821,89.114 0,104.934 0,124.38v288.573c0,19.446 15.821,35.267 35.267,35.267h441.467c19.446,0 35.267,-15.821 35.267,-35.267V124.38C512,104.934 496.178,89.114 476.733,89.114zM476.733,424.71H35.267c-6.482,0 -11.756,-5.274 -11.756,-11.756V124.38c0,-6.482 5.274,-11.756 11.756,-11.756h77.709v13.578c0,6.491 5.263,11.756 11.756,11.756c6.493,0 11.756,-5.264 11.756,-11.756v-13.578h64.001v13.578c0,6.491 5.263,11.756 11.756,11.756s11.756,-5.264 11.756,-11.756v-13.578H288v13.578c0,6.491 5.263,11.756 11.756,11.756c6.491,0 11.756,-5.264 11.756,-11.756v-13.578h64.001v13.578c0,6.491 5.264,11.756 11.756,11.756c6.493,0 11.756,-5.264 11.756,-11.756v-13.578h77.709c6.482,0 11.756,5.274 11.756,11.756v288.573h0.001C488.489,419.436 483.215,424.71 476.733,424.71z"/>
+</vector>
diff --git a/res/drawable/ic_clock.xml b/res/drawable/ic_clock.xml
new file mode 100644
index 0000000..551d3ea
--- /dev/null
+++ b/res/drawable/ic_clock.xml
@@ -0,0 +1,13 @@
+<vector android:height="24dp" android:viewportHeight="60"
+    android:viewportWidth="60" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M30,0C13.458,0 0,13.458 0,30s13.458,30 30,30s30,-13.458 30,-30S46.542,0 30,0zM30,58C14.561,58 2,45.439 2,30S14.561,2 30,2s28,12.561 28,28S45.439,58 30,58z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M31,26.021V15.879c0,-0.553 -0.448,-1 -1,-1s-1,0.447 -1,1v10.142c-1.399,0.364 -2.494,1.459 -2.858,2.858H19c-0.552,0 -1,0.447 -1,1s0.448,1 1,1h7.142c0.447,1.72 2,3 3.858,3c2.206,0 4,-1.794 4,-4C34,28.02 32.72,26.468 31,26.021zM30,31.879c-1.103,0 -2,-0.897 -2,-2s0.897,-2 2,-2s2,0.897 2,2S31.103,31.879 30,31.879z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M30,9.879c0.552,0 1,-0.447 1,-1v-1c0,-0.553 -0.448,-1 -1,-1s-1,0.447 -1,1v1C29,9.432 29.448,9.879 30,9.879z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M30,49.879c-0.552,0 -1,0.447 -1,1v1c0,0.553 0.448,1 1,1s1,-0.447 1,-1v-1C31,50.326 30.552,49.879 30,49.879z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M52,28.879h-1c-0.552,0 -1,0.447 -1,1s0.448,1 1,1h1c0.552,0 1,-0.447 1,-1S52.552,28.879 52,28.879z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M9,28.879H8c-0.552,0 -1,0.447 -1,1s0.448,1 1,1h1c0.552,0 1,-0.447 1,-1S9.552,28.879 9,28.879z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M44.849,13.615l-0.707,0.707c-0.391,0.391 -0.391,1.023 0,1.414c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293l0.707,-0.707c0.391,-0.391 0.391,-1.023 0,-1.414S45.24,13.225 44.849,13.615z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M14.444,44.021l-0.707,0.707c-0.391,0.391 -0.391,1.023 0,1.414c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293l0.707,-0.707c0.391,-0.391 0.391,-1.023 0,-1.414S14.834,43.631 14.444,44.021z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M45.556,44.021c-0.391,-0.391 -1.023,-0.391 -1.414,0s-0.391,1.023 0,1.414l0.707,0.707c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293c0.391,-0.391 0.391,-1.023 0,-1.414L45.556,44.021z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M15.151,13.615c-0.391,-0.391 -1.023,-0.391 -1.414,0s-0.391,1.023 0,1.414l0.707,0.707c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293c0.391,-0.391 0.391,-1.023 0,-1.414L15.151,13.615z"/>
+</vector>
diff --git a/res/drawable/ic_font.xml b/res/drawable/ic_font.xml
new file mode 100644
index 0000000..e21b6d9
--- /dev/null
+++ b/res/drawable/ic_font.xml
@@ -0,0 +1,9 @@
+<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="m192,469.668c-8.832,0 -16,-7.168 -16,-16v-394.668c0,-8.832 7.168,-16 16,-16s16,7.168 16,16v394.668c0,8.832 -7.168,16 -16,16zM192,469.668"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m368,128.332c-8.832,0 -16,-7.168 -16,-16v-37.332h-320v37.332c0,8.832 -7.168,16 -16,16s-16,-7.168 -16,-16v-53.332c0,-8.832 7.168,-16 16,-16h352c8.832,0 16,7.168 16,16v53.332c0,8.832 -7.168,16 -16,16zM368,128.332"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m240,469.668h-96c-8.832,0 -16,-7.168 -16,-16s7.168,-16 16,-16h96c8.832,0 16,7.168 16,16s-7.168,16 -16,16zM240,469.668"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m314.668,304.332c-8.832,0 -16,-7.168 -16,-16v-37.332c0,-8.832 7.168,-16 16,-16h181.332c8.832,0 16,7.168 16,16v32c0,8.832 -7.168,16 -16,16s-16,-7.168 -16,-16v-16h-149.332v21.332c0,8.832 -7.168,16 -16,16zM314.668,304.332"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m405.332,469.668c-8.832,0 -16,-7.168 -16,-16v-202.668c0,-8.832 7.168,-16 16,-16s16,7.168 16,16v202.668c0,8.832 -7.168,16 -16,16zM405.332,469.668"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m432,469.668h-53.332c-8.832,0 -16,-7.168 -16,-16s7.168,-16 16,-16h53.332c8.832,0 16,7.168 16,16s-7.168,16 -16,16zM432,469.668"/>
+</vector>
diff --git a/res/drawable/ic_qs.xml b/res/drawable/ic_qs.xml
new file mode 100644
index 0000000..0c74963
--- /dev/null
+++ b/res/drawable/ic_qs.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="86.006"
+    android:viewportWidth="86.006" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M59.13,16.126c1.857,0 3.664,-0.026 5.374,-0.026C64.5,7.208 57.287,0 48.395,0H16.11C7.213,0 0,7.213 0,16.11v32.285c0,8.897 7.213,16.109 16.11,16.109h0.017v-10.75H16.11c-2.923,0 -5.359,-2.394 -5.359,-5.359V16.11c0,-2.924 2.396,-5.36 5.359,-5.36h32.285c2.924,0 5.359,2.396 5.359,5.36v0.016H59.13z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M69.897,21.501H37.612c-8.898,0 -16.111,7.213 -16.111,16.111v32.283c0,8.899 7.213,16.111 16.111,16.111h32.285c8.897,0 16.109,-7.212 16.109,-16.111V37.612C86.006,28.714 78.794,21.501 69.897,21.501z"/>
+</vector>
diff --git a/res/drawable/ic_seconds.xml b/res/drawable/ic_seconds.xml
new file mode 100644
index 0000000..f83a36a
--- /dev/null
+++ b/res/drawable/ic_seconds.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="375.3967"
+    android:viewportWidth="375.3967" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m187.699,0c-103.5,0 -187.699,84.203 -187.699,187.699 0,103.496 84.199,187.699 187.699,187.699 103.496,0 187.699,-84.203 187.699,-187.699 0,-103.496 -84.203,-187.699 -187.699,-187.699zM187.699,361.742c-95.969,0 -174.047,-78.078 -174.047,-174.043 0,-95.973 78.078,-174.047 174.047,-174.047s174.043,78.074 174.043,174.047c0,95.965 -78.074,174.043 -174.043,174.043zM187.699,361.742"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m187.699,44.195c-77.602,0 -140.855,61.957 -143.273,138.98 -0.066,0.383 -0.227,0.73 -0.227,1.133 0,0.242 0.109,0.445 0.137,0.68 -0.02,0.91 -0.137,1.797 -0.137,2.711 0,79.125 64.371,143.5 143.5,143.5 79.125,0 143.5,-64.375 143.5,-143.5s-64.375,-143.504 -143.5,-143.504zM282.199,276.477 L265.715,260.523c-2.707,-2.629 -7.027,-2.555 -9.652,0.16 -2.621,2.711 -2.551,7.027 0.16,9.652l16.129,15.609c-21.07,18.18 -47.996,29.629 -77.551,31.242v-20.828c0,-3.77 -3.055,-6.828 -6.824,-6.828 -3.77,0 -6.828,3.059 -6.828,6.828v20.855c-29.695,-1.492 -56.773,-12.918 -77.953,-31.137l13.039,-13.469c2.625,-2.707 2.555,-7.031 -0.152,-9.652 -2.715,-2.621 -7.039,-2.551 -9.652,0.156l-13.086,13.516c-21.195,-22.477 -34.445,-52.438 -35.316,-85.492h24.125c3.77,0 6.824,-3.055 6.824,-6.824s-3.055,-6.828 -6.824,-6.828h-23.785c2.105,-26.852 12.344,-51.43 28.348,-71.234l17.438,16.879c1.32,1.281 3.035,1.918 4.746,1.918 1.781,0 3.566,-0.695 4.906,-2.078 2.617,-2.707 2.551,-7.031 -0.16,-9.656l-17.832,-17.262c22.07,-22.129 52.094,-36.199 85.336,-37.867v20.301c0,3.773 3.055,6.828 6.824,6.828 3.77,0 6.828,-3.055 6.828,-6.828v-20.273c30.105,1.641 57.469,13.52 78.711,32.293l-15.551,16.066c-2.621,2.707 -2.551,7.027 0.16,9.652 1.324,1.281 3.035,1.918 4.746,1.918 1.785,0 3.566,-0.695 4.906,-2.078l15.473,-15.984c19.059,20.762 31.449,47.656 33.781,77.406h-23.227c-3.773,0 -6.828,3.055 -6.828,6.824 0,3.77 3.055,6.828 6.828,6.828h23.57c-0.867,32.977 -14.063,62.875 -35.172,85.34zM282.199,276.477"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m212.875,152.582c-14.059,0 -25.5,11.441 -25.5,25.504v24.898c0,14.063 11.441,25.5 25.5,25.5 14.063,0 25.504,-11.438 25.504,-25.5v-24.898c0,-14.063 -11.441,-25.504 -25.504,-25.504zM224.723,202.984c0,6.535 -5.316,11.848 -11.848,11.848 -6.535,0 -11.848,-5.313 -11.848,-11.848v-24.898c0,-6.535 5.313,-11.852 11.848,-11.852 6.531,0 11.848,5.316 11.848,11.852zM224.723,202.984"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m156.848,177.484h-11.848v-5.113c0,-12.418 10.105,-22.52 22.52,-22.52 3.773,0 6.828,-3.059 6.828,-6.828 0,-3.77 -3.055,-6.828 -6.828,-6.828 -19.945,0 -36.172,16.23 -36.172,36.176v30.613c0,7.555 3.32,14.676 9.109,19.539 4.629,3.883 10.438,5.957 16.434,5.957 1.5,0 3.016,-0.129 4.527,-0.395 10.281,-1.809 18.727,-10.25 20.531,-20.535 1.324,-7.535 -0.703,-15.176 -5.566,-20.957 -4.859,-5.793 -11.98,-9.109 -19.535,-9.109zM168.504,205.188c-0.82,4.656 -4.793,8.633 -9.449,9.453 -3.625,0.621 -7.094,-0.289 -9.816,-2.574 -2.695,-2.262 -4.238,-5.57 -4.238,-9.082v-11.848h11.848c3.512,0 6.82,1.543 9.078,4.234 2.297,2.73 3.207,6.219 2.578,9.816zM168.504,205.188"/>
+</vector>
diff --git a/res/xml/cherish_settings_clock.xml b/res/xml/cherish_settings_clock.xml
index 17c0a3b..1e63ad7 100644
--- a/res/xml/cherish_settings_clock.xml
+++ b/res/xml/cherish_settings_clock.xml
@@ -21,6 +21,7 @@
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="status_bar_clock_auto_hide"
+            android:icon="@drawable/ic_clock"
             android:title="@string/status_bar_clock_auto_hide_title"
             android:summary="@string/status_bar_clock_auto_hide_summary"
             android:defaultValue="false" />
@@ -53,12 +54,14 @@
 
         <ListPreference
             android:key="status_bar_am_pm"
+            android:icon="@drawable/ic_24h"
             android:title="@string/status_bar_am_pm_title"
             android:entries="@array/status_bar_am_pm_entries"
             android:entryValues="@array/status_bar_am_pm_values" />
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="status_bar_clock_seconds"
+            android:icon="@drawable/ic_seconds"
             android:title="@string/clock_seconds_display"
             android:summary="@string/clock_seconds_display_summary"
             android:defaultValue="false" />
@@ -70,6 +73,7 @@
 
         <ListPreference
             android:key="clock_date_display"
+            android:icon="@drawable/ic_calendar"
             android:title="@string/clock_date_display"
             android:entries="@array/clock_date_display_entries"
             android:entryValues="@array/clock_date_display_values" />
@@ -77,12 +81,14 @@
         <ListPreference
             android:key="statusbar_clock_date_position"
             android:title="@string/clock_date_position"
+            android:icon="@drawable/ic_qs"
             android:entries="@array/clock_date_position_entries"
             android:entryValues="@array/clock_date_position_values"
             android:dependency="clock_date_display" />
 
         <ListPreference
             android:key="clock_date_style"
+            android:icon="@drawable/ic_font"
             android:title="@string/clock_date_style"
             android:entries="@array/clock_date_style_entries"
             android:entryValues="@array/clock_date_style_values"
@@ -90,6 +96,7 @@
 
         <ListPreference
             android:key="clock_date_format"
+            android:icon="@drawable/ic_qs"
             android:title="@string/clock_date_format"
             android:summary="@string/clock_date_format_summary"
             android:entries="@array/clock_date_format_entries_values"
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index ae3862b..9b5a9d1 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -26,6 +26,7 @@
 		
      <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
         android:key="status_bar_clock"
+        android:icon="@drawable/ic_clock"
         android:fragment="com.cherish.settings.fragments.ClockSettings" 
         android:title="@string/status_bar_clock_title"
         android:summary="@string/status_bar_clock_summary"