diff --git a/res/drawable/ic_settings_buttons.xml b/res/drawable/ic_settings_buttons.xml
index ad6d74b..e561396 100644
--- a/res/drawable/ic_settings_buttons.xml
+++ b/res/drawable/ic_settings_buttons.xml
@@ -1,23 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 Nitrogen 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="M19,3H5C3.895,3,3,3.895,3,5v14c0,1.105,0.895,2,2,2h14c1.105,0,2-0.895,2-2V5C21,3.895,20.105,3,19,3Z M11.678,9.989H8.45v1.958h2.729v1.099H8.45V16H7.024V8.891h4.653V9.989z M17.059,16h-1.431v-3.232c0-0.377-0.065-0.646-0.198-0.803 c-0.131-0.158-0.329-0.237-0.593-0.237c-0.212,0-0.397,0.04-0.56,0.12c-0.16,0.079-0.293,0.189-0.397,0.329V16h-1.426v-5.283h1.328 l0.063,0.757c0.176-0.271,0.393-0.479,0.649-0.63s0.545-0.225,0.864-0.225c0.534,0,0.95,0.172,1.25,0.516 c0.3,0.343,0.449,0.886,0.449,1.628V16z" />
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1005,2050c-209,-48 -376,-156 -509,-329 -53,-69 -98,-156 -132,-258 -23,-67 -27,-100 -31,-233 -4,-133 -2,-167 15,-241 75,-313 309,-551 629,-640 112,-32 324,-32 440,-1 254,68 460,238 569,467 65,138 79,204 79,380 0,162 -12,230 -63,348 -59,141 -190,300 -313,380 -198,130 -460,178 -684,127zM972,1644c55,-28 96,-114 82,-171 -18,-72 -89,-133 -155,-133 -128,0 -209,131 -148,239 47,82 136,108 221,65zM1580,1645c117,-60 116,-227 -2,-284 -78,-37 -155,-20 -205,45 -102,135 55,317 207,239zM967,1033c85,-40 114,-155 57,-234 -39,-55 -108,-84 -164,-69 -114,31 -165,152 -103,247 14,22 40,48 57,56 41,21 110,21 153,0zM1601,1018c77,-59 88,-145 29,-226 -21,-29 -42,-44 -77,-56 -45,-15 -53,-15 -93,-1 -137,48 -162,203 -47,286 32,23 50,29 93,29 44,0 59,-5 95,-32z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_gesture.xml b/res/drawable/ic_settings_gesture.xml
new file mode 100644
index 0000000..e26e76f
--- /dev/null
+++ b/res/drawable/ic_settings_gesture.xml
@@ -0,0 +1,11 @@
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1030,1961c-53,-29 -410,-393 -410,-418 0,-29 83,-103 115,-103 15,0 81,11 147,25 66,14 125,25 129,25 5,0 9,-195 9,-435l0,-434 38,-41c36,-37 43,-40 91,-40 45,0 56,4 89,34l37,34 3,255 3,254 41,6c24,3 128,49 246,109 180,90 208,107 226,139 22,40 24,9 -26,398 -13,97 -36,159 -71,185 -27,20 -41,21 -330,23 -280,2 -305,1 -337,-16z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1764,1229c-3,-6 -2,-15 4,-21 13,-13 32,-2 32,18 0,16 -26,19 -36,3z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1340,941c-5,-11 -10,-85 -10,-167 0,-168 -12,-211 -74,-252 -56,-38 -100,-46 -154,-27 -53,18 -78,37 -107,80 -17,26 -20,52 -25,190 -3,88 -9,166 -13,173 -25,37 -93,-21 -143,-124 -25,-52 -29,-70 -28,-144 0,-71 5,-95 28,-146 33,-74 109,-152 186,-190 49,-25 66,-28 150,-28 85,0 101,4 154,29 111,56 185,154 206,278 20,112 -12,216 -92,303 -45,48 -62,54 -78,25z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml
deleted file mode 100644
index 46b71e8..0000000
--- a/res/drawable/ic_settings_gestures.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 Nitrogen 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="M4.7,6.9c0.7-0.7,1.4-1.4,1.7-1.2c0.5,0.2,0,1-0.3,1.5c-0.2,0.4-2.8,3.9-2.8,6.3c0,1.3,0.5,2.3,1.3,3
-c0.7,0.6,1.7,0.7,2.6,0.5c1.1-0.3,1.9-1.4,3-2.8c1.2-1.5,2.8-3.4,4-3.4c1.6,0,1.6,1,1.7,1.8c-3.7,0.6-5.3,3.7-5.3,5.4
-s1.4,3.1,3.2,3.1c1.6,0,4.3-1.3,4.6-6.1H21v-2.5h-2.4c-0.1-1.7-1.1-4.2-4-4.2c-2.2,0-4.1,1.9-4.9,2.8c-0.6,0.7-2,2.5-2.3,2.7
-c-0.2,0.3-0.7,0.8-1.1,0.8c-0.4,0-0.7-0.8-0.4-1.9c0.3-1.1,1.4-2.9,1.8-3.5C8.5,8,9.1,7.2,9.1,5.9C9.1,3.7,7.4,3,6.6,3
-C5.3,3,4.1,4,3.9,4.3C3.5,4.6,3.2,4.9,3,5.2L4.7,6.9z
-M13.9,18.6c-0.3,0-0.7-0.3-0.7-0.7c0-0.6,0.7-2.2,2.8-2.8
-C15.8,17.8,14.6,18.6,13.9,18.6z" />
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_lockscreens.xml b/res/drawable/ic_settings_lockscreens.xml
index 6c90e49..347c627 100644
--- a/res/drawable/ic_settings_lockscreens.xml
+++ b/res/drawable/ic_settings_lockscreens.xml
@@ -1,22 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 Nitrogen 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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="8000.0"
+    android:viewportWidth="8000.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M3575,7918c-166,-14 -469,-68 -600,-106 -38,-11 -113,-32 -165,-47 -94,-25 -207,-67 -285,-105 -22,-11 -87,-38 -145,-60 -58,-23 -130,-56 -160,-73 -30,-18 -71,-39 -90,-47 -74,-30 -251,-138 -385,-235 -55,-40 -128,-92 -162,-116 -186,-132 -458,-396 -647,-629 -134,-163 -273,-356 -304,-420 -6,-14 -30,-53 -52,-88 -78,-124 -214,-399 -255,-517 -23,-66 -51,-140 -62,-165 -29,-64 -49,-129 -78,-255 -13,-60 -34,-139 -45,-175 -26,-86 -66,-290 -82,-420 -18,-143 -18,-787 0,-930 16,-127 56,-333 81,-415 11,-33 29,-103 40,-155 29,-126 68,-253 96,-315 13,-27 40,-97 60,-155 40,-112 154,-340 243,-490 15,-25 36,-60 47,-78 74,-125 176,-274 243,-354 188,-225 258,-302 384,-421 79,-74 179,-165 223,-201 44,-36 95,-78 114,-93 50,-41 205,-146 289,-195 40,-24 107,-65 149,-92 106,-68 409,-211 533,-251 30,-10 60,-21 65,-25 6,-4 44,-18 85,-30 41,-12 115,-35 165,-51 212,-71 445,-116 720,-139 155,-13 595,-13 750,0 161,14 411,49 460,65 22,7 63,18 91,24 28,5 91,23 140,40 49,16 123,39 164,51 41,12 89,28 105,35 17,7 66,25 110,40 44,15 91,34 105,41 14,7 75,36 135,63 138,64 155,73 290,154 199,119 340,213 410,272 28,24 73,60 100,81 118,89 345,308 482,465 73,84 148,179 253,324 130,177 327,531 396,710 12,33 34,83 48,112 33,67 60,148 96,286 15,62 40,146 54,188 26,78 65,289 88,484 18,149 18,831 0,975 -32,263 -69,453 -102,525 -5,11 -18,58 -29,105 -27,118 -78,274 -111,340 -15,30 -33,73 -40,95 -13,42 -218,449 -249,494 -10,14 -44,67 -77,116 -128,197 -390,522 -489,606 -16,14 -79,74 -140,133 -95,92 -166,153 -283,241 -113,86 -190,139 -258,180 -43,26 -99,62 -124,80 -45,33 -134,79 -200,105 -19,8 -60,29 -90,47 -30,17 -97,48 -148,68 -51,19 -116,46 -145,59 -90,42 -188,76 -292,102 -55,14 -129,34 -165,45 -120,36 -401,83 -583,98 -149,13 -627,12 -772,-1zM4445,7376c66,-9 129,-20 140,-25 27,-12 75,-24 238,-61 129,-29 283,-81 402,-134 28,-12 88,-38 135,-56 47,-18 90,-37 96,-42 6,-4 63,-35 127,-68 64,-33 172,-98 239,-145 68,-47 143,-98 167,-113 24,-15 67,-47 95,-72 28,-25 74,-65 102,-88 120,-98 378,-370 444,-467 18,-27 59,-81 89,-120 31,-38 62,-81 70,-95 8,-14 42,-70 76,-125 67,-109 200,-376 247,-495 17,-41 36,-88 44,-105 7,-16 29,-86 49,-154 19,-68 37,-126 39,-130 8,-13 68,-315 82,-411 34,-233 34,-716 0,-950 -17,-120 -73,-399 -86,-425 -5,-11 -24,-72 -41,-135 -17,-63 -35,-119 -39,-125 -4,-5 -13,-28 -20,-50 -7,-22 -19,-49 -25,-60 -7,-11 -16,-31 -20,-45 -4,-14 -50,-110 -102,-215 -102,-207 -212,-391 -284,-476 -25,-30 -50,-61 -55,-71 -5,-9 -45,-61 -89,-115 -89,-110 -235,-257 -402,-405 -85,-75 -113,-106 -113,-124 0,-21 -5,-24 -38,-24 -29,0 -53,-11 -105,-47 -130,-92 -250,-166 -370,-227 -67,-35 -133,-70 -147,-78 -14,-9 -104,-44 -200,-78 -96,-34 -186,-68 -200,-75 -34,-17 -268,-72 -465,-110 -38,-7 -99,-19 -135,-26 -85,-17 -747,-18 -835,-2 -291,55 -536,113 -624,148 -47,18 -140,52 -206,75 -66,23 -134,50 -151,59 -17,9 -82,42 -145,73 -63,31 -164,90 -226,130 -219,142 -246,158 -269,158 -16,0 -24,6 -24,18 0,10 -52,62 -125,125 -139,121 -321,303 -386,387 -23,30 -61,76 -83,101 -56,62 -166,221 -219,316 -24,43 -58,101 -75,128 -37,58 -156,298 -167,335 -4,14 -18,48 -30,75 -50,109 -95,263 -166,567 -54,233 -81,571 -69,848 7,151 41,435 60,495 5,17 23,95 41,175 63,293 178,580 356,888 29,51 53,95 53,99 0,3 33,51 72,106 40,56 84,118 98,138 70,105 361,419 455,493 27,22 69,57 91,79 88,83 420,305 579,386 66,34 188,89 270,123 83,34 155,64 160,68 33,23 252,84 495,137 14,3 30,9 35,13 8,7 160,27 320,44 104,10 655,-3 770,-18z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M6015,6491c-7,-12 12,-24 25,-16 11,7 4,25 -10,25 -5,0 -11,-4 -15,-9z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M2538,6461c-48,-3 -93,-12 -100,-18 -6,-7 -19,-13 -28,-13 -8,0 -40,-13 -70,-30 -30,-16 -66,-34 -78,-40 -13,-6 -26,-19 -29,-30 -3,-11 -13,-20 -23,-20 -21,0 -124,-110 -151,-162 -10,-20 -23,-39 -29,-43 -5,-3 -10,-14 -10,-24 0,-10 -6,-24 -14,-30 -34,-28 -37,-160 -33,-1326 2,-627 8,-1159 12,-1183 4,-24 13,-46 21,-49 8,-3 14,-18 14,-33 0,-15 7,-33 15,-40 8,-6 25,-31 39,-54 29,-49 164,-174 216,-199 19,-10 42,-22 50,-26 51,-31 102,-44 191,-48l99,-6 0,-463c0,-298 4,-465 10,-469 6,-3 10,-28 10,-54 0,-31 5,-53 15,-61 8,-7 15,-21 15,-31 0,-10 5,-21 10,-24 6,-3 10,-17 10,-30 0,-13 5,-27 10,-30 6,-3 10,-17 10,-30 0,-13 13,-39 29,-57 16,-18 32,-47 35,-65 4,-17 14,-37 22,-44 8,-6 14,-17 14,-23 0,-6 16,-28 35,-49 19,-21 35,-42 35,-48 0,-5 28,-38 63,-73 34,-35 78,-81 98,-103 65,-70 120,-110 207,-153 23,-11 42,-25 42,-30 0,-10 76,-50 96,-50 6,0 16,-6 22,-13 6,-7 34,-19 62,-27 28,-8 53,-18 56,-22 3,-4 21,-8 41,-8 20,0 45,-7 55,-16 39,-36 667,-36 706,-1 10,10 33,17 50,17 18,0 40,4 50,9 50,26 131,61 143,61 8,1 32,14 54,30 22,16 56,37 75,46 52,26 209,155 274,226 48,53 120,149 161,216 6,9 18,28 28,41 9,13 17,34 17,46 0,12 7,28 15,35 8,7 15,20 15,30 0,10 7,20 15,24 8,3 15,14 15,25 0,11 5,23 10,26 6,3 10,17 10,30 0,13 5,27 10,30 6,3 10,25 10,49 0,23 5,47 11,53 27,27 33,112 36,541l3,442 64,0c90,0 172,19 202,46 14,13 31,24 39,24 8,0 17,4 20,10 3,6 14,10 24,10 10,0 35,18 55,41 21,22 49,44 62,49 13,5 24,17 24,27 0,10 16,29 35,42 19,13 35,29 35,35 0,15 48,106 69,130 15,16 16,127 16,1266l0,1249 -27,28c-16,16 -28,39 -28,50 0,38 -141,213 -171,213 -10,0 -20,9 -24,19 -6,19 -73,61 -98,61 -7,0 -23,9 -37,20 -14,11 -36,20 -49,20 -13,0 -30,8 -37,18 -12,16 -93,17 -1451,18 -791,1 -1477,-2 -1525,-5zM3228,6198c9,-9 12,-228 12,-924 0,-530 4,-915 9,-918 10,-7 40,27 121,134 30,40 75,99 100,131 25,32 68,88 97,126 55,72 566,740 655,857 29,37 73,94 98,126 25,32 70,90 100,130 30,40 75,99 100,131 25,32 70,90 100,129 30,40 65,76 78,81 26,10 671,13 696,3 15,-6 16,-141 16,-1429 0,-1288 -1,-1423 -16,-1429 -20,-8 -618,-8 -638,0 -14,6 -16,97 -16,934 0,603 -3,931 -10,935 -12,7 -39,-20 -110,-115 -30,-40 -76,-100 -102,-134 -26,-34 -145,-189 -265,-346 -395,-516 -405,-529 -533,-695 -54,-69 -149,-194 -215,-281 -22,-29 -80,-104 -128,-168 -48,-64 -97,-120 -107,-126 -20,-11 -657,-15 -684,-4 -15,6 -16,141 -16,1429 0,1129 3,1424 13,1428 6,3 152,6 323,6 229,1 313,-2 322,-11zM4750,2701c0,-312 -3,-391 -13,-400 -8,-6 -20,-36 -27,-68 -13,-58 -15,-65 -44,-120 -9,-17 -16,-37 -16,-45 0,-7 -9,-19 -20,-26 -11,-7 -20,-18 -20,-26 0,-8 -7,-16 -15,-20 -8,-3 -15,-12 -15,-19 0,-17 -99,-124 -132,-143 -13,-7 -33,-17 -44,-23 -12,-5 -24,-17 -27,-25 -4,-9 -15,-16 -25,-16 -11,0 -25,-7 -32,-15 -7,-8 -21,-15 -31,-15 -10,0 -21,-4 -24,-10 -3,-5 -17,-10 -30,-10 -13,0 -27,-5 -30,-10 -3,-5 -21,-10 -39,-10 -19,0 -39,-7 -46,-15 -18,-22 -285,-22 -294,0 -3,8 -17,15 -31,15 -14,0 -35,5 -48,12 -48,24 -57,28 -76,28 -10,0 -24,7 -31,15 -7,8 -18,15 -24,15 -35,1 -203,146 -231,201 -9,16 -20,29 -25,29 -5,0 -19,21 -31,48 -12,26 -30,59 -40,74 -11,14 -19,35 -19,46 0,12 -4,24 -10,27 -5,3 -10,23 -10,44 0,22 -6,44 -15,51 -13,11 -15,68 -15,406l0,394 765,0 765,0 0,-389z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_miscs.xml b/res/drawable/ic_settings_miscs.xml
index 977af9e..7853f99 100644
--- a/res/drawable/ic_settings_miscs.xml
+++ b/res/drawable/ic_settings_miscs.xml
@@ -1,22 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 Nitrogen 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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M19,4h-4L7.11,16.63 4.5,12 9,4H5L0.5,12 5,20h4l7.89,-12.63L19.5,12 15,20h4l4.5,-8z"/>
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1012,2067c-10,-12 -4,-71 52,-527 8,-63 13,-116 11,-118 -3,-3 -259,187 -429,317 -44,34 -87,61 -97,61 -12,0 -44,-47 -103,-148 -47,-82 -86,-156 -86,-164 0,-9 6,-20 12,-26 7,-5 126,-58 263,-117 138,-59 266,-115 286,-123l36,-16 -284,-123c-157,-67 -291,-127 -299,-134 -18,-15 -18,-39 0,-64 7,-11 22,-36 33,-55 52,-97 115,-199 128,-210 19,-16 11,-21 304,197 128,96 234,173 236,171 1,-2 -4,-55 -11,-118 -8,-63 -25,-207 -39,-320 -13,-112 -21,-208 -16,-213 4,-4 90,-6 192,-5l184,3 -2,70c-1,65 -12,164 -49,459 -8,65 -13,120 -10,123 2,2 93,-63 203,-144 325,-244 314,-237 332,-226 12,8 155,242 177,291 11,22 -5,42 -48,62 -24,11 -156,69 -295,128l-252,108 287,124c158,67 293,127 300,133 18,14 15,38 -11,77 -13,19 -41,67 -62,105 -54,100 -88,149 -106,153 -9,1 -130,-83 -269,-187 -139,-105 -255,-189 -258,-187 -2,2 1,37 7,78 6,40 18,134 26,208 8,74 20,181 26,237 6,56 9,109 5,118 -4,13 -33,15 -184,15 -132,0 -182,-3 -190,-13z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_navbar.xml b/res/drawable/ic_settings_navbar.xml
index 9881de9..fab0fb7 100644
--- a/res/drawable/ic_settings_navbar.xml
+++ b/res/drawable/ic_settings_navbar.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 Nitrogen 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="M6,4h12v12H6V4Z
-M6,22h12c1.1,0,2-0.9,2-2V4c0-1.1-0.9-2-2-2H6C4.9,2,4,2.9,4,4v16C4,21.1,4.9,22,6,22L6,22z" />
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M680,1953c-27,-10 -71,-57 -86,-92 -12,-28 -14,-141 -14,-656 0,-683 -1,-667 60,-719 54,-45 80,-47 578,-44 461,3 467,3 502,25 20,12 46,40 58,61l22,40 0,636c0,696 3,661 -60,721l-31,30 -507,2c-279,1 -514,-1 -522,-4zM1628,1053l2,-443 -440,0 -440,0 0,438c0,241 3,442 7,445 3,4 200,6 437,5l431,-3 3,-442z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_notification.xml b/res/drawable/ic_settings_notification.xml
new file mode 100644
index 0000000..6021b84
--- /dev/null
+++ b/res/drawable/ic_settings_notification.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1108,2076c-55,-24 -118,-102 -118,-146 0,-36 20,-40 186,-40 187,0 197,4 175,68 -36,101 -153,158 -243,118z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M462,1808c-7,-7 -12,-27 -12,-45 0,-27 14,-47 90,-125l90,-92 0,-256c0,-283 10,-361 59,-465 68,-144 163,-230 314,-285 20,-7 27,-16 27,-37 0,-34 51,-126 82,-147 12,-9 42,-16 67,-16 77,0 141,70 141,154 0,26 5,38 18,43 128,43 253,149 309,263 57,115 66,176 72,477l6,273 82,82c86,87 106,126 84,167l-12,21 -702,0c-534,0 -706,-3 -715,-12z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_notifications.xml b/res/drawable/ic_settings_notifications.xml
deleted file mode 100644
index e4a3415..0000000
--- a/res/drawable/ic_settings_notifications.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 Nitrogen 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="M22.7999992,5c0-2.2056-1.7943993-4-4-4c-1.7875996,0-3.3043995,1.1791999-3.8155994,2.8H3.2940001
-C2.1396,3.8,1.2,4.7396002,1.2,5.8940001v15.0115995C1.2,22.0604,2.1396,23,3.2940001,23h15.0115986
-c1.1548004,0,2.0940018-0.9396,2.0940018-2.0939999V8.6636C21.8108006,8.0447998,22.7999992,6.6363997,22.7999992,5z
-M19.861599,8.0151997c-0.0792007,0.0279999-0.1591988,0.052-0.2395992,0.0740004
-c-0.0143986,0.0039997-0.0291996,0.0075998-0.0436001,0.0112c-0.0707989,0.0179996-0.1420002,0.0335999-0.2136002,0.0467997
-c-0.0368004,0.0068007-0.0743999,0.0116005-0.111599,0.0172005c-0.0536003,0.0079994-0.1076012,0.0159998-0.1612015,0.0211992
-c-0.0963993,0.0084009-0.1935997,0.0144005-0.2919998,0.0144005C17.0356007,8.1999998,15.6000004,6.7644,15.6000004,5
-c0-0.2319999,0.0275993-0.4707999,0.0824003-0.7108002C16.0067997,2.8659999,17.2800007,1.8,18.7999992,1.8
-C20.5643997,1.8,22,3.2356,22,5C22,6.3919997,21.1048012,7.5760002,19.861599,8.0151997z" />
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_powermenu.xml b/res/drawable/ic_settings_powermenu.xml
index caf06c2..c92fa01 100644
--- a/res/drawable/ic_settings_powermenu.xml
+++ b/res/drawable/ic_settings_powermenu.xml
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 Nitrogen 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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M7,24h2v-2L7,22v2zM11,24h2v-2h-2v2zM13,2h-2v10h2L13,2zM16.56,4.44l-1.45,1.45C16.84,6.94 18,8.83 18,11c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6c0,-2.17 1.16,-4.06 2.88,-5.12L7.44,4.44C5.36,5.88 4,8.28 4,11c0,4.42 3.58,8 8,8s8,-3.58 8,-8c0,-2.72 -1.36,-5.12 -3.44,-6.56zM15,24h2v-2h-2v2z"/>
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="8000.0"
+    android:viewportWidth="8000.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M3575,7918c-166,-14 -469,-68 -600,-106 -38,-11 -113,-32 -165,-47 -94,-25 -207,-67 -285,-105 -22,-11 -87,-38 -145,-60 -58,-23 -130,-56 -160,-73 -30,-18 -71,-39 -90,-47 -74,-30 -251,-138 -385,-235 -55,-40 -128,-92 -162,-116 -186,-132 -458,-396 -647,-629 -134,-163 -273,-356 -304,-420 -6,-14 -30,-53 -52,-88 -78,-124 -214,-399 -255,-517 -23,-66 -51,-140 -62,-165 -29,-64 -49,-129 -78,-255 -13,-60 -34,-139 -45,-175 -26,-86 -66,-290 -82,-420 -18,-143 -18,-787 0,-930 16,-127 56,-333 81,-415 11,-33 29,-103 40,-155 29,-126 68,-253 96,-315 13,-27 40,-97 60,-155 40,-112 154,-340 243,-490 15,-25 36,-60 47,-78 74,-125 176,-274 243,-354 188,-225 258,-302 384,-421 79,-74 179,-165 223,-201 44,-36 95,-78 114,-93 50,-41 205,-146 289,-195 40,-24 107,-65 149,-92 106,-68 409,-211 533,-251 30,-10 60,-21 65,-25 6,-4 44,-18 85,-30 41,-12 115,-35 165,-51 212,-71 445,-116 720,-139 155,-13 595,-13 750,0 161,14 411,49 460,65 22,7 63,18 91,24 28,5 91,23 140,40 49,16 123,39 164,51 41,12 89,28 105,35 17,7 66,25 110,40 44,15 91,34 105,41 14,7 75,36 135,63 138,64 155,73 290,154 199,119 340,213 410,272 28,24 73,60 100,81 118,89 345,308 482,465 73,84 148,179 253,324 130,177 327,531 396,710 12,33 34,83 48,112 33,67 60,148 96,286 15,62 40,146 54,188 26,78 65,289 88,484 18,149 18,831 0,975 -32,263 -69,453 -102,525 -5,11 -18,58 -29,105 -27,118 -78,274 -111,340 -15,30 -33,73 -40,95 -13,42 -218,449 -249,494 -10,14 -44,67 -77,116 -128,197 -390,522 -489,606 -16,14 -79,74 -140,133 -95,92 -166,153 -283,241 -113,86 -190,139 -258,180 -43,26 -99,62 -124,80 -45,33 -134,79 -200,105 -19,8 -60,29 -90,47 -30,17 -97,48 -148,68 -51,19 -116,46 -145,59 -90,42 -188,76 -292,102 -55,14 -129,34 -165,45 -120,36 -401,83 -583,98 -149,13 -627,12 -772,-1zM4445,7376c66,-9 129,-20 140,-25 27,-12 75,-24 238,-61 129,-29 283,-81 402,-134 28,-12 88,-38 135,-56 47,-18 90,-37 96,-42 6,-4 60,-33 120,-64 145,-74 431,-269 578,-393 156,-131 406,-392 476,-496 18,-27 59,-81 89,-120 31,-38 62,-81 70,-95 8,-14 42,-70 76,-125 67,-109 200,-376 247,-495 17,-41 36,-88 44,-105 7,-16 29,-86 49,-154 19,-68 37,-126 39,-130 8,-13 68,-315 82,-411 34,-233 34,-716 0,-950 -17,-120 -73,-399 -86,-425 -5,-11 -24,-72 -41,-135 -17,-63 -35,-119 -39,-125 -4,-5 -13,-28 -20,-50 -7,-22 -19,-49 -25,-60 -7,-11 -16,-31 -20,-45 -4,-14 -50,-110 -102,-215 -102,-207 -212,-391 -284,-476 -25,-30 -50,-61 -55,-71 -5,-9 -45,-61 -89,-115 -146,-180 -436,-449 -621,-576 -187,-128 -299,-197 -394,-244 -52,-26 -115,-59 -140,-74 -25,-15 -124,-55 -220,-89 -96,-34 -186,-68 -200,-75 -34,-17 -268,-72 -465,-110 -38,-7 -99,-19 -135,-26 -85,-17 -747,-18 -835,-2 -291,55 -536,113 -624,148 -47,18 -140,52 -206,75 -66,23 -134,50 -151,59 -17,9 -82,42 -145,73 -63,31 -132,69 -154,84 -22,15 -94,62 -160,103 -146,92 -203,135 -357,270 -133,115 -294,277 -359,361 -23,30 -61,76 -83,101 -56,62 -166,221 -219,316 -24,43 -58,101 -75,128 -37,58 -156,298 -167,335 -4,14 -18,48 -30,75 -50,109 -95,263 -166,567 -54,233 -81,571 -69,848 7,151 41,435 60,495 5,17 23,95 41,175 63,293 178,580 356,888 29,51 53,95 53,99 0,3 33,51 72,106 40,56 84,118 98,138 70,105 361,419 455,493 27,22 68,56 90,77 91,86 421,307 580,388 66,34 188,89 270,123 83,34 155,64 160,68 33,23 252,84 495,137 14,3 30,9 35,13 8,7 160,27 320,44 104,10 655,-3 770,-18z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M2980,6351l-25,-7 -3,-200c-2,-161 0,-203 12,-219 13,-19 27,-20 189,-20 172,0 176,0 201,24l26,24 0,178 0,177 -31,26c-30,26 -33,26 -187,25 -86,-1 -168,-4 -182,-8z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M3888,6352c-9,-4 -26,-19 -37,-34 -19,-24 -21,-39 -21,-190l0,-164 31,-30 30,-29 171,0c223,0 208,-16 208,227 0,177 0,179 -25,203 -24,25 -27,25 -182,24 -87,0 -166,-3 -175,-7z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M4782,6350c-36,-15 -42,-50 -42,-230 0,-230 -14,-215 213,-215 235,0 217,-19 217,230 0,167 -2,194 -17,206 -19,17 -334,24 -371,9z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M3935,5215c-5,-2 -66,-9 -135,-15 -88,-7 -137,-17 -167,-31 -24,-11 -66,-24 -95,-28 -29,-4 -84,-21 -123,-38 -38,-17 -81,-34 -95,-38 -14,-4 -35,-16 -48,-26 -13,-10 -36,-20 -52,-24 -16,-3 -34,-13 -41,-21 -6,-8 -17,-14 -24,-14 -6,0 -20,-9 -30,-20 -10,-11 -23,-20 -30,-20 -16,0 -145,-98 -145,-110 0,-6 -5,-10 -11,-10 -6,0 -28,-15 -49,-32 -20,-18 -50,-44 -66,-58 -40,-36 -188,-199 -193,-213 -2,-7 -12,-19 -22,-27 -46,-38 -210,-354 -254,-490 -15,-47 -31,-89 -35,-95 -5,-5 -12,-44 -15,-85 -4,-41 -11,-79 -15,-85 -5,-5 -16,-55 -25,-110 -14,-78 -16,-131 -11,-240 7,-165 20,-270 33,-287 6,-7 13,-45 17,-83 3,-44 15,-90 31,-123 14,-29 30,-76 36,-105 10,-44 49,-128 141,-298 9,-17 23,-38 32,-48 9,-10 16,-22 16,-28 0,-6 16,-28 35,-49 19,-21 35,-44 35,-51 0,-7 14,-22 30,-35 17,-12 30,-27 30,-32 0,-6 15,-27 33,-47 39,-44 192,-179 202,-179 4,0 20,-13 35,-30 22,-23 37,-30 67,-30 36,0 46,8 159,122 67,68 125,133 129,146 9,31 -11,60 -71,103 -58,41 -254,238 -254,255 0,6 -14,27 -31,45 -32,34 -39,47 -131,231 -63,126 -71,151 -89,258 -7,41 -17,81 -22,88 -15,19 -15,402 -1,433 12,24 44,156 44,179 0,6 14,42 31,78 17,37 37,84 45,105 7,21 27,55 44,75 16,20 30,44 30,52 0,9 20,40 45,69 25,29 45,56 45,59 0,7 58,76 85,102 9,8 35,34 58,58 22,23 45,42 51,42 6,0 25,15 41,32 17,17 45,37 63,45 18,7 41,22 51,32 27,27 198,111 260,127 30,8 68,21 85,28 62,27 229,50 361,51 122,0 296,-22 350,-46 11,-4 50,-17 86,-28 78,-23 241,-103 283,-138 17,-14 41,-29 55,-34 62,-24 263,-223 316,-313 15,-26 36,-53 46,-59 11,-7 19,-17 19,-23 0,-14 18,-48 45,-89 12,-17 31,-57 44,-90 13,-33 29,-74 37,-92 8,-17 14,-37 14,-45 0,-8 4,-18 9,-23 12,-13 41,-179 41,-232 0,-23 5,-45 10,-48 6,-3 10,-39 10,-80 0,-41 -4,-77 -10,-80 -5,-3 -10,-35 -10,-69 0,-71 -26,-226 -41,-240 -5,-6 -9,-16 -9,-24 0,-8 -6,-28 -14,-45 -8,-18 -24,-58 -35,-91 -12,-32 -34,-77 -50,-100 -15,-22 -32,-52 -36,-65 -8,-25 -77,-125 -123,-177 -76,-87 -132,-144 -140,-144 -5,0 -25,-16 -45,-35 -20,-19 -40,-35 -46,-35 -18,0 -61,-61 -61,-87 0,-19 32,-58 128,-155l127,-130 41,5c29,3 53,14 79,38 90,83 288,285 315,323 48,67 103,150 115,171 6,11 26,47 45,80 59,106 84,162 100,225 7,25 18,57 26,72 8,15 23,83 34,150 11,68 24,132 29,143 41,91 41,408 1,500 -5,11 -18,74 -29,140 -24,139 -57,238 -129,385 -75,153 -163,300 -181,300 -5,0 -17,17 -26,37 -18,37 -223,248 -272,280 -16,10 -36,28 -46,40 -10,13 -25,23 -33,23 -8,0 -14,4 -14,10 0,9 -25,25 -148,97 -65,38 -197,103 -208,103 -5,0 -35,12 -65,27 -30,14 -78,30 -107,34 -29,4 -71,17 -95,28 -26,13 -81,24 -147,31 -114,12 -389,22 -405,15z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M3859,3608l-29,-32 0,-1064 0,-1063 28,-35 27,-34 177,0 177,0 16,30c13,26 15,154 13,1116 -3,1062 -3,1086 -22,1100 -15,11 -59,14 -188,14l-169,0 -30,-32z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_quicksettings.xml b/res/drawable/ic_settings_quicksettings.xml
index 4a13631..9bd8f8d 100644
--- a/res/drawable/ic_settings_quicksettings.xml
+++ b/res/drawable/ic_settings_quicksettings.xml
@@ -1,90 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 Nitrogen 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="M6.0656328,8.3070564H1.6395614c-0.0870911,0-0.169046,0.0024567-0.1824447,0.0024567
-C1.148334,8.3095131,1,8.5391331,1,8.7884588C1,9.037673,1.1716142,9.267292,1.4571167,9.267292
-c0.0133429,0,0.0953536,0.0024004,0.1824447,0.0024004h4.4260712c0.087091,0,0.1582713-0.0711803,0.1582713-0.1582718V8.4653273
-C6.2239041,8.378293,6.1527238,8.3070564,6.0656328,8.3070564z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M6.0656328,10.227416H2.6230211c-0.087091,0-0.1690459,0.0024567-0.1824446,0.0024567
-c-0.3087828,0-0.4571167,0.229619-0.4571167,0.4789448c0,0.2492151,0.1716141,0.4788332,0.4571167,0.4788332
-c0.0133429,0,0.0953536,0.0024004,0.1824446,0.0024004h3.4426117c0.087091,0,0.1582713-0.0711794,0.1582713-0.1582718v-0.6460361
-C6.2239041,10.2986517,6.1527238,10.227416,6.0656328,10.227416z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M6.0656328,12.1767502H3.7118835c-0.0870912,0-0.1690462,0.0024567-0.1824448,0.0024567
-c-0.3087826,0-0.4571166,0.2295628-0.4571166,0.4789448c0,0.2492151,0.1716142,0.4787779,0.4571166,0.4787779
-c0.0133429,0,0.0953536,0.0024004,0.1824448,0.0024004h2.3537493c0.087091,0,0.1582713-0.0711241,0.1582713-0.1582155V12.335022
-C6.2239041,12.2478743,6.1527238,12.1767502,6.0656328,12.1767502z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M22.7976246,9.7769423l-0.2726059-0.0752001c-0.1113205-0.0307055-0.2332478-0.1423044-0.2708759-0.2480412
-c-0.0376282-0.1056824-0.1156731-0.4525394-0.0587864-0.5529728l0.1371689-0.2417345
-c0.0569992-0.1004896,0.0368462-0.2494926-0.0449409-0.3311691l-0.71945-0.7195072
-c-0.0816765-0.0816755-0.2307358-0.1018295-0.331171-0.0448856L21.009634,7.6925054
-c-0.1005459,0.0570002-0.2678051,0.0623593-0.3715897,0.0118909l-0.2221947-0.0932317
-c-0.108696-0.0391912-0.222641-0.1623468-0.2534008-0.2737231l-0.0776558-0.2814832
-c-0.0307617-0.1113763-0.1503429-0.2024307-0.2659645-0.2024307h-1.0176811c-0.1155643,0-0.2352028,0.0910544-0.2659645,0.2024307
-l-0.0777664,0.2814832c-0.0306511,0.1113763-0.1445942,0.2347555-0.2531796,0.2741699L17.9620552,7.714334
-c-0.1035595,0.0510263-0.2705402,0.0461693-0.3709736-0.0108867l-0.2128162-0.120811
-c-0.100544-0.0570002-0.2494926-0.0368466-0.3312798,0.0448298l-0.7196732,0.7195625
-c-0.0816765,0.0816202-0.1018295,0.2306795-0.0448303,0.3311138l0.134655,0.2371559
-c0.0569992,0.1004333,0.0663223,0.262948,0.0205994,0.3610926c-0.0456657,0.0981455-0.2314606,0.3946457-0.3428364,0.4253511
-l-0.2727184,0.0752001c-0.1112089,0.0307055-0.2023754,0.1503439-0.2023754,0.265851v1.0176258
-c0,0.1155081,0.0910559,0.2351465,0.2023754,0.265851l0.2727184,0.0752001
-c0.111208,0.0307055,0.3029213,0.3417206,0.3517704,0.44489s0.0420933,0.2697592-0.0150738,0.3702488l-0.1226521,0.2162762
-c-0.0571136,0.1004333-0.0369587,0.2494936,0.0448303,0.3311701l0.7196732,0.7196178
-c0.0816765,0.0816765,0.2306252,0.1018305,0.3311691,0.0448856l0.2065067-0.1172934
-c0.1005459-0.0570002,0.2676945-0.0623598,0.3717003-0.0121145l0.2260475,0.0944605
-c0.108696,0.0389671,0.2227516,0.1619558,0.2535114,0.2733879l0.0727444,0.2636747
-c0.0306492,0.1113205,0.1502323,0.202487,0.2658501,0.202487h1.017683c0.1155643,0,0.2352028-0.0911665,0.2659626-0.202487
-l0.0727444-0.2636747c0.0306511-0.1114321,0.1448174-0.2341967,0.2536259-0.2729406l0.206171-0.085248
-c0.1042309-0.0497437,0.2717133-0.043602,0.3722591,0.0133419l0.2209091,0.1253328
-c0.1004353,0.0570002,0.249382,0.0368471,0.3311691-0.0448294l0.7196751-0.7195616
-c0.0816765-0.0817318,0.1018295-0.2307358,0.0448303-0.3312254l-0.1254997-0.2209101
-c-0.0570011-0.1004896-0.0629196-0.2679167-0.0132885-0.3722029l0.0846348-0.2038269
-c0.0388012-0.1087523,0.1616764-0.2229195,0.2731647-0.2536249l0.2726059-0.0752001
-C22.9089451,11.2953987,23,11.1757603,23,11.0602531v-1.0176258C23,9.9272871,22.9089451,9.8076477,22.7976246,9.7769423z
-M19.3101826,12.4529285c-1.0546398,0-1.9094734-0.8549442-1.9094734-1.909584
-c0-1.0546961,0.8548336-1.9096966,1.9094734-1.9096966s1.909586,0.8550005,1.909586,1.9096966
-C21.2197685,11.597928,20.3647671,12.4529285,19.3101826,12.4529285z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M19.6223145,15.0244064c0,0-0.7196732-0.0013399-0.7362537-0.0021219c0,0-0.1343212-0.0005579-0.1343212,0.2297316
-c0,0.9818401,0,3.9273624,0,3.9273624c0,0.1576023-0.1262817,0.2865639-0.2803116,0.2865639H8.20506
-c-0.1540842,0-0.2803102-0.1289616-0.2803102-0.2865639V4.8459101c0-0.1576014,0.1262822-0.2865076,0.2803102-0.2865076
-h10.2664251c0.1540852,0,0.2803097,0.1289063,0.2803097,0.2865076c0,0,0,0.7755017,0,1.0339842
-c0,0.1884179,0.1692142,0.1845102,0.1692142,0.1845102c0.0165806-0.0008373,0.6978455-0.0021772,0.6978455-0.0021772
-S19.766798,6.064795,19.766798,5.8868165c0-0.6278934,0-2.5114622,0-2.5114622
-c0-0.6515086-0.5301399-1.1814246-1.1813126-1.1814246H8.0907803c-0.6516194,0-1.1813121,0.529916-1.1813121,1.1814246v17.2493458
-c0,0.6512871,0.5296926,1.1813698,1.181313,1.1813698h10.4947042c0.6511726,0,1.1813126-0.5300827,1.1813126-1.1813698
-c0,0,0-4.0242786,0-5.3657627C19.766798,15.0321665,19.6223145,15.0244064,19.6223145,15.0244064z
-M12.0436573,3.3989134
-h2.5890064c0.1235466,0,0.2238693,0.1001549,0.2238693,0.2239807c0,0.1236582-0.1003227,0.2238128-0.2238693,0.2238128h-2.5890064
-c-0.1237698,0-0.2237568-0.1001546-0.2237568-0.2238128C11.8199005,3.4990683,11.9198875,3.3989134,12.0436573,3.3989134z
-M13.5000334,20.9103146h-0.3235216c-0.2153826-0.0684986-0.3717003-0.2699814-0.3717003-0.5079746
-c0-0.2943249,0.2386627-0.5331535,0.5331535-0.5331535c0.2942677,0,0.5332098,0.238718,0.5332098,0.5331535
-C13.8711185,20.6403332,13.7153034,20.8419266,13.5000334,20.9103146z" />
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="8000.0"
+    android:viewportWidth="8000.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M3575,7918c-166,-14 -469,-68 -600,-106 -38,-11 -113,-32 -165,-47 -94,-25 -207,-67 -285,-105 -22,-11 -87,-38 -145,-60 -58,-23 -130,-56 -160,-73 -30,-18 -71,-39 -90,-47 -74,-30 -251,-138 -385,-235 -55,-40 -128,-92 -162,-116 -186,-132 -458,-396 -647,-629 -134,-163 -273,-356 -304,-420 -6,-14 -30,-53 -52,-88 -78,-124 -214,-399 -255,-517 -23,-66 -51,-140 -62,-165 -29,-64 -49,-129 -78,-255 -13,-60 -34,-139 -45,-175 -26,-86 -66,-290 -82,-420 -18,-143 -18,-787 0,-930 16,-127 56,-333 81,-415 11,-33 29,-103 40,-155 29,-126 68,-253 96,-315 13,-27 40,-97 60,-155 40,-112 154,-340 243,-490 15,-25 36,-60 47,-78 74,-125 176,-274 243,-354 188,-225 258,-302 384,-421 79,-74 179,-165 223,-201 44,-36 95,-78 114,-93 50,-41 205,-146 289,-195 40,-24 107,-65 149,-92 106,-68 409,-211 533,-251 30,-10 60,-21 65,-25 6,-4 44,-18 85,-30 41,-12 115,-35 165,-51 212,-71 445,-116 720,-139 155,-13 595,-13 750,0 161,14 411,49 460,65 22,7 63,18 91,24 28,5 91,23 140,40 49,16 123,39 164,51 41,12 89,28 105,35 17,7 66,25 110,40 44,15 91,34 105,41 14,7 75,36 135,63 138,64 155,73 290,154 199,119 340,213 410,272 28,24 73,60 100,81 118,89 345,308 482,465 73,84 148,179 253,324 130,177 327,531 396,710 12,33 34,83 48,112 33,67 60,148 96,286 15,62 40,146 54,188 26,78 65,289 88,484 18,149 18,831 0,975 -32,263 -69,453 -102,525 -5,11 -18,58 -29,105 -27,118 -78,274 -111,340 -15,30 -33,73 -40,95 -13,42 -218,449 -249,494 -10,14 -44,67 -77,116 -128,197 -390,522 -489,606 -16,14 -79,74 -140,133 -95,92 -166,153 -283,241 -113,86 -190,139 -258,180 -43,26 -99,62 -124,80 -45,33 -134,79 -200,105 -19,8 -60,29 -90,47 -30,17 -97,48 -148,68 -51,19 -116,46 -145,59 -90,42 -188,76 -292,102 -55,14 -129,34 -165,45 -120,36 -401,83 -583,98 -149,13 -627,12 -772,-1zM4445,7376c66,-9 129,-20 140,-25 27,-12 75,-24 238,-61 129,-29 283,-81 402,-134 28,-12 88,-38 135,-56 47,-18 90,-37 96,-42 6,-4 60,-33 120,-64 145,-74 431,-269 578,-393 156,-131 406,-392 476,-496 18,-27 59,-81 89,-120 31,-38 62,-81 70,-95 8,-14 42,-70 76,-125 67,-109 200,-376 247,-495 17,-41 36,-88 44,-105 7,-16 29,-86 49,-154 19,-68 37,-126 39,-130 8,-13 68,-315 82,-411 34,-233 34,-716 0,-950 -17,-120 -73,-399 -86,-425 -5,-11 -24,-72 -41,-135 -17,-63 -35,-119 -39,-125 -4,-5 -13,-28 -20,-50 -7,-22 -19,-49 -25,-60 -7,-11 -16,-31 -20,-45 -4,-14 -50,-110 -102,-215 -102,-207 -212,-391 -284,-476 -25,-30 -50,-61 -55,-71 -5,-9 -45,-61 -89,-115 -146,-180 -436,-449 -621,-576 -187,-128 -299,-197 -394,-244 -52,-26 -115,-59 -140,-74 -25,-15 -124,-55 -220,-89 -96,-34 -186,-68 -200,-75 -34,-17 -268,-72 -465,-110 -38,-7 -99,-19 -135,-26 -85,-17 -747,-18 -835,-2 -291,55 -536,113 -624,148 -47,18 -140,52 -206,75 -66,23 -134,50 -151,59 -17,9 -82,42 -145,73 -63,31 -132,69 -154,84 -22,15 -94,62 -160,103 -146,92 -203,135 -357,270 -133,115 -294,277 -359,361 -23,30 -61,76 -83,101 -56,62 -166,221 -219,316 -24,43 -58,101 -75,128 -37,58 -156,298 -167,335 -4,14 -18,48 -30,75 -50,109 -95,263 -166,567 -54,233 -81,571 -69,848 7,151 41,435 60,495 5,17 23,95 41,175 63,293 178,580 356,888 29,51 53,95 53,99 0,3 33,51 72,106 40,56 84,118 98,138 70,105 361,419 455,493 27,22 68,56 90,77 91,86 421,307 580,388 66,34 188,89 270,123 83,34 155,64 160,68 33,23 252,84 495,137 14,3 30,9 35,13 8,7 160,27 320,44 104,10 655,-3 770,-18z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M4565,5750c-3,-5 -15,-10 -26,-10 -71,0 -464,-181 -495,-228 -16,-25 -16,-28 8,-76 55,-109 58,-119 58,-192 0,-40 -4,-76 -10,-79 -5,-3 -10,-13 -10,-22 0,-53 -93,-161 -176,-203 -91,-46 -239,-39 -325,15 -59,38 -80,33 -116,-29 -26,-46 -121,-242 -128,-266 -4,-14 -13,-38 -20,-55 -47,-110 -62,-250 -27,-261 21,-8 79,-31 112,-47 39,-18 115,-101 139,-150 28,-57 37,-156 22,-229 -23,-110 -130,-218 -251,-253l-35,-11 -3,-73c-2,-40 1,-78 6,-84 6,-7 13,-28 17,-47 4,-19 11,-39 15,-45 4,-5 10,-23 14,-38 10,-41 125,-277 154,-314 13,-18 31,-33 40,-33 8,0 37,13 63,30 65,40 126,54 208,48 83,-6 150,-37 206,-95 35,-36 50,-61 96,-155 12,-23 11,-165 0,-172 -5,-3 -12,-17 -15,-31 -3,-13 -20,-48 -36,-76 -35,-58 -33,-81 8,-102 15,-8 70,-38 122,-66 52,-28 124,-63 160,-77 36,-14 74,-29 85,-34 49,-21 135,-40 189,-43 65,-2 60,-6 97,78 27,62 73,118 130,160 78,58 160,73 267,51 84,-17 141,-54 194,-124 32,-43 44,-64 77,-145l11,-28 73,7c39,3 77,10 82,14 6,4 26,11 45,15 19,4 40,10 45,14 6,4 28,13 50,20 104,36 338,160 354,189 6,11 -1,35 -25,81 -19,36 -34,73 -34,83 0,9 -4,20 -10,23 -5,3 -10,30 -10,60 0,30 5,57 10,60 6,3 10,16 10,27 0,37 51,126 96,168 24,22 69,52 101,66 51,24 66,26 147,22 79,-4 99,-9 149,-36 31,-18 64,-32 72,-32 28,0 144,217 185,345 7,22 16,45 20,50 5,6 11,27 15,48 4,20 11,40 16,43 5,3 9,32 9,64 0,63 -13,80 -59,80 -71,0 -196,106 -237,200 -34,79 -33,187 1,264 44,100 156,192 250,205l40,6 3,73c2,41 -1,79 -6,85 -5,7 -13,30 -17,52 -4,22 -10,45 -15,50 -4,6 -13,28 -20,50 -20,62 -104,236 -144,299 -20,31 -43,56 -52,56 -8,0 -34,-13 -57,-29 -54,-37 -106,-51 -187,-51 -87,0 -133,14 -196,61 -99,73 -135,140 -141,264l-5,90 46,87 45,87 -37,31c-44,37 -278,153 -342,170 -25,7 -49,16 -55,20 -5,5 -28,11 -50,15 -22,4 -45,12 -52,17 -6,5 -35,8 -64,6 -50,-3 -54,-5 -63,-33 -36,-123 -118,-218 -223,-260 -77,-31 -138,-32 -227,-5 -54,17 -77,31 -124,78 -31,31 -62,68 -69,82 -27,61 -41,96 -45,115 -3,17 -12,20 -60,23 -32,2 -59,-2 -63,-8zM5165,4516c136,-29 247,-104 329,-221 23,-33 49,-76 58,-95 9,-19 22,-48 29,-63 16,-35 18,-285 3,-319 -41,-89 -73,-149 -100,-185 -31,-42 -131,-133 -146,-133 -5,0 -25,-10 -46,-23 -68,-42 -118,-52 -264,-52 -96,0 -141,4 -150,13 -6,6 -20,12 -29,12 -61,0 -254,164 -295,251 -40,83 -54,120 -54,139 0,10 -4,22 -10,25 -12,8 -13,189 -1,213 5,9 16,42 26,72 61,190 236,341 435,373 54,9 158,6 215,-7z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1934,5067c-2,-7 -3,-80 -2,-162l3,-150 530,0 530,0 0,160 0,160 -528,3c-426,2 -529,0 -533,-11z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1504,4437c-2,-7 -3,-80 -2,-162l3,-150 745,0 745,0 0,160 0,160 -743,3c-602,2 -744,0 -748,-11z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1344,3777c-2,-7 -3,-80 -2,-162l3,-150 825,0 825,0 0,160 0,160 -823,3c-667,2 -824,0 -828,-11z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M1174,3107c-2,-7 -3,-80 -2,-162l3,-150 910,0 910,0 0,160 0,160 -908,3c-737,2 -909,0 -913,-11z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_recents.xml b/res/drawable/ic_settings_recents.xml
index 312a324..29b7390 100644
--- a/res/drawable/ic_settings_recents.xml
+++ b/res/drawable/ic_settings_recents.xml
@@ -1,28 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The PAC-ROM 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="M20.1,8V5c0-0.7-0.5-1.3-1.1-1.4V2.1c0-0.8-0.6-1.4-1.3-1.4H6.2C5.5,0.7,5,1.3,5,2.1v1.5
-C4.3,3.7,3.9,4.3,3.9,5v3C3.3,8.2,3,8.8,3,9.4v12.3c0,0.9,0.7,1.6,1.6,1.6h14.8c0.9,0,1.6-0.7,1.6-1.6V9.4C21,8.8,20.7,8.2,20.1,8z
-M18.3,5.2v2.6H5.7V5.2H18.3z M17.5,2.3v1.3H6.5V2.3H17.5z M19,21.6H5v-12h14V21.6z" />
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M604,1904l-34,-35 0,-468 0,-467 30,-29 30,-29 0,-122 0,-122 36,-32c34,-29 37,-37 42,-99 3,-44 11,-76 23,-92l18,-24 436,-3 436,-3 29,30c27,27 30,36 30,95 0,59 2,67 26,82 44,29 54,63 54,180 0,104 1,109 28,137l27,28 3,457c3,490 2,496 -48,532 -27,19 -47,20 -580,20l-553,0 -33,-36zM1665,1788c3,-13 4,-194 3,-403l-3,-380 -470,0 -470,0 -3,390c-1,214 0,396 3,402 3,10 106,13 469,13l466,0 5,-22zM1615,780l0,-75 -416,-3 -417,-2 -6,22c-3,13 -6,42 -6,65 0,80 -37,74 429,71l416,-3 0,-75zM1558,538l-3,-33 -356,-3c-381,-2 -385,-2 -372,46l5,22 365,0 364,0 -3,-32z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_statusbar.xml b/res/drawable/ic_settings_statusbar.xml
index 6b55ea3..d95f6bf 100644
--- a/res/drawable/ic_settings_statusbar.xml
+++ b/res/drawable/ic_settings_statusbar.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 Nitrogen 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,20H6V8h12V20Z
-M18,2H6C4.9,2,4,2.9,4,4v16c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V4C20,2.9,19.1,2,18,2L18,2z" />
-</vector>
\ No newline at end of file
+<vector android:height="24dp" android:viewportHeight="2400.0"
+    android:viewportWidth="2400.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M940,2365c-106,-24 -159,-43 -275,-100 -289,-143 -498,-382 -604,-691 -40,-118 -55,-257 -48,-449 7,-205 50,-366 135,-504 18,-28 32,-54 32,-57 0,-16 128,-170 196,-234 195,-186 424,-291 682,-312 396,-33 692,68 960,326 263,254 388,596 354,970 -44,488 -381,890 -872,1038 -88,27 -460,35 -560,13zM1425,2180c359,-94 620,-345 731,-705 26,-84 28,-102 29,-270 0,-156 -3,-191 -23,-265 -84,-318 -319,-578 -622,-690 -373,-137 -791,-44 -1068,239 -306,313 -374,807 -165,1191 160,292 429,474 778,524 67,10 262,-4 340,-24z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M670,1928c-18,-13 -43,-36 -54,-51 -21,-28 -21,-35 -21,-685l0,-657 24,-32c13,-18 44,-41 68,-53 41,-19 61,-20 504,-20 324,0 473,3 501,12 48,14 93,64 108,118 7,26 10,241 8,657l-3,618 -23,37c-12,20 -39,46 -58,57 -34,21 -47,21 -528,21l-493,0 -33,-22zM1644,1759c8,-40 8,-807 0,-836l-6,-23 -444,0 -444,0 0,445 0,445 444,0 444,0 6,-31z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/xml/cherish_settings.xml b/res/xml/cherish_settings.xml
index 853e1e1..a4b21cb 100644
--- a/res/xml/cherish_settings.xml
+++ b/res/xml/cherish_settings.xml
@@ -42,15 +42,7 @@
         <Preference
             android:key="navigationbar_category"
             android:title="@string/navbar_title"
-            android:fragment="com.cherish.settings.fragments.NavbarSettings"
-            android:icon="@drawable/ic_settings_navbar"/>
-
-        <!-- Gestures -->
-        <Preference
-            android:key="gestures_category"
-            android:title="@string/gestures_title"
-            android:fragment="com.cherish.settings.fragments.GestureSettings"
-            android:icon="@drawable/ic_settings_gestures"/>
+       
 
         <!-- Lock Screen -->
         <Preference
@@ -78,7 +70,7 @@
             android:key="notifications_category"
             android:title="@string/notifications_title"
             android:fragment="com.cherish.settings.fragments.NotificationSettings"
-            android:icon="@drawable/ic_settings_notifications"/>
+            android:icon="@drawable/ic_settings_notification"/>
 
         <!-- Misc -->
         <Preference