SmartBar: New button vectorso8.1

* Cleanup tint and use existing fillcolor lines (wight554) Change-Id: I089c7cda8ac7afe9c7470832f1ac9e5d59cab29b
author: westcripp <korukaltan@gmail.com> 2018-06-19 19:12:50 +0000
committer: doc HD <doc.divxm@gmail.com> 2018-06-22 10:23:46 +0300
commit: ca0bc0ae505db0576d208ab5652129e3e236e888 (patch)
tree: 538864ed18fad58fdf99bbb90c0d64021b821e96
parent: aa5a264ed0594ba7b2f4537c58f3b45cbe57e29b (diff)
89 files changed, 601 insertions, 2129 deletions
diff --git a/res/drawable/action_item_selected.xml b/res/drawable/action_item_selected.xml
index 25e3404..ec9c0fc 100644
--- a/res/drawable/action_item_selected.xml
+++ b/res/drawable/action_item_selected.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@*android:color/accent_device_default_dark" android:pathData="M0,0H24V24H0" />
+    <path android:fillColor="#267a7a7a" android:pathData="M0,0H24V24H0" />
 </vector>
diff --git a/res/drawable/ic_skip_next.xml b/res/drawable/ic_skip_next.xml
index e4a57b2..b5c2025 100644
--- a/res/drawable/ic_skip_next.xml
+++ b/res/drawable/ic_skip_next.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#ffffff"
-        android:pathData="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" />
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 </vector>
diff --git a/res/drawable/ic_skip_next_dark.xml b/res/drawable/ic_skip_next_dark.xml
index 5368018..3097e68 100644
--- a/res/drawable/ic_skip_next_dark.xml
+++ b/res/drawable/ic_skip_next_dark.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" />
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 </vector>
diff --git a/res/drawable/ic_skip_previous.xml b/res/drawable/ic_skip_previous.xml
index 7cdddde..5f126d7 100644
--- a/res/drawable/ic_skip_previous.xml
+++ b/res/drawable/ic_skip_previous.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#ffffff"
-        android:pathData="M6 6h2v12H6zm3.5 6l8.5 6V6z" />
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
 </vector>
diff --git a/res/drawable/ic_skip_previous_dark.xml b/res/drawable/ic_skip_previous_dark.xml
index 70201b7..b2f16e0 100644
--- a/res/drawable/ic_skip_previous_dark.xml
+++ b/res/drawable/ic_skip_previous_dark.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M6 6h2v12H6zm3.5 6l8.5 6V6z" />
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_cancel.xml b/res/drawable/ic_smartbar_editor_cancel.xml
index 16e0a8d..41d7313 100644
--- a/res/drawable/ic_smartbar_editor_cancel.xml
+++ b/res/drawable/ic_smartbar_editor_cancel.xml
@@ -1,8 +1,7 @@
-<!-- drawable/block_helper.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M12,0A12,12 0 0,1 24,12A12,12 0 0,1 12,24A12,12 0 0,1 0,12A12,12 0 0,1 12,0M12,2A10,10 0 0,0 2,12C2,14.4 2.85,16.6 4.26,18.33L18.33,4.26C16.6,2.85 14.4,2 12,2M12,22A10,10 0 0,0 22,12C22,9.6 21.15,7.4 19.74,5.67L5.67,19.74C7.4,21.15 9.6,22 12,22Z" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_finish.xml b/res/drawable/ic_smartbar_editor_finish.xml
index 9a4500d..87a7684 100644
--- a/res/drawable/ic_smartbar_editor_finish.xml
+++ b/res/drawable/ic_smartbar_editor_finish.xml
@@ -1,8 +1,7 @@
-<!-- drawable/window_close.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M13.46,12L19,17.54V19H17.54L12,13.46L6.46,19H5V17.54L10.54,12L5,6.46V5H6.46L12,10.54L17.54,5H19V6.46L13.46,12Z" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_icon.xml b/res/drawable/ic_smartbar_editor_icon.xml
index 24065d8..f514296 100644
--- a/res/drawable/ic_smartbar_editor_icon.xml
+++ b/res/drawable/ic_smartbar_editor_icon.xml
@@ -1,8 +1,7 @@
-<!-- drawable/eyedropper.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M19.35,11.72L17.22,13.85L15.81,12.43L8.1,20.14L3.5,22L2,20.5L3.86,15.9L11.57,8.19L10.15,6.78L12.28,4.65L19.35,11.72M16.76,3C17.93,1.83 19.83,1.83 21,3C22.17,4.17 22.17,6.07 21,7.24L19.08,9.16L14.84,4.92L16.76,3M5.56,17.03L4.5,19.5L6.97,18.44L14.4,11L13,9.6L5.56,17.03Z" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M7,14.94L13.06,8.88L15.12,10.94L9.06,17H7V14.94M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M16.7,9.35L15.7,10.35L13.65,8.3L14.65,7.3C14.86,7.08 15.21,7.08 15.42,7.3L16.7,8.58C16.92,8.79 16.92,9.14 16.7,9.35M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_icon_gallery.xml b/res/drawable/ic_smartbar_editor_icon_gallery.xml
index 4239cb6..4e13b6a 100644
--- a/res/drawable/ic_smartbar_editor_icon_gallery.xml
+++ b/res/drawable/ic_smartbar_editor_icon_gallery.xml
@@ -1,8 +1,7 @@
-<!-- drawable/harddisk.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_icon_pack.xml b/res/drawable/ic_smartbar_editor_icon_pack.xml
index 6eed2d9..9d454ee 100644
--- a/res/drawable/ic_smartbar_editor_icon_pack.xml
+++ b/res/drawable/ic_smartbar_editor_icon_pack.xml
@@ -1,8 +1,7 @@
-<!-- drawable/image_multiple.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M22,16V4A2,2 0 0,0 20,2H8A2,2 0 0,0 6,4V16A2,2 0 0,0 8,18H20A2,2 0 0,0 22,16M11,12L13.03,14.71L16,11L20,16H8M2,6V20A2,2 0 0,0 4,22H18V20H4V6" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M5.12,5H18.87L17.93,4H5.93L5.12,5M20.54,5.23C20.83,5.57 21,6 21,6.5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V6.5C3,6 3.17,5.57 3.46,5.23L4.84,3.55C5.12,3.21 5.53,3 6,3H18C18.47,3 18.88,3.21 19.15,3.55L20.54,5.23M6,18H12V15H6V18Z" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_icon_reset.xml b/res/drawable/ic_smartbar_editor_icon_reset.xml
index 34df500..c34cad9 100644
--- a/res/drawable/ic_smartbar_editor_icon_reset.xml
+++ b/res/drawable/ic_smartbar_editor_icon_reset.xml
@@ -1,8 +1,7 @@
-<!-- drawable/undo.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M12.5,8C9.85,8 7.45,9 5.6,10.6L2,7V16H11L7.38,12.38C8.77,11.22 10.54,10.5 12.5,10.5C16.04,10.5 19.05,12.81 20.1,16L22.47,15.22C21.08,11.03 17.15,8 12.5,8Z" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3Z" />
 </vector>
diff --git a/res/drawable/ic_smartbar_editor_remove.xml b/res/drawable/ic_smartbar_editor_remove.xml
index 048d891..c92359e 100644
--- a/res/drawable/ic_smartbar_editor_remove.xml
+++ b/res/drawable/ic_smartbar_editor_remove.xml
@@ -1,8 +1,7 @@
-<!-- drawable/content_cut.xml -->
 <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="@color/smartbar_editor_popup_icon_fill" android:pathData="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.9,16 6,16A2,2 0 0,1 8,18C8,19.11 7.1,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.9,4 6,4A2,2 0 0,1 8,6C8,7.11 7.1,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" />
+    <path android:fillColor="@color/smartbar_editor_popup_icon_fill" android:pathData="M19,13H5V11H19V13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_assist.xml b/res/drawable/ic_sysbar_assist.xml
index 213c82b..3eaaf38 100644
--- a/res/drawable/ic_sysbar_assist.xml
+++ b/res/drawable/ic_sysbar_assist.xml
@@ -1,28 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/assistant.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_search_assistant"
-        android:pathData="M64,16H32c-3.3,0-6,2.7-6,6v30c0,1.4,0.5,2.7,1.3,3.7h0l17.6,22.8h0c0.7,0.9,1.9,1.5,3.1,1.5
-s2.4-0.6,3.1-1.5h0l17.4-22.6c0.9-1,1.4-2.4,1.4-3.8V22C70,18.7,67.3,16,64,16z
-M61.2,39.2L61.2,39.2l-9.6,2.4l-2.4,9.6h0
-C49,51.7,48.5,52,48,52s-1-0.3-1.2-0.8h0l-2.4-9.5l-9.7-2.5v0C34.3,39,34,38.5,34,38c0-0.5,0.3-1,0.8-1.2v0l9.6-2.4l2.4-9.5h0
-c0.1-0.5,0.6-0.9,1.2-0.9s1.1,0.4,1.2,0.9h0l2.4,9.5l9.6,2.4v0C61.7,37,62,37.5,62,38C62,38.5,61.7,39,61.2,39.2z" />
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_search_assistant" android:pathData="M19,2H5A2,2 0 0,0 3,4V18A2,2 0 0,0 5,20H9L12,23L15,20H19A2,2 0 0,0 21,18V4A2,2 0 0,0 19,2M13.88,12.88L12,17L10.12,12.88L6,11L10.12,9.12L12,5L13.88,9.12L18,11" />
 </vector>
diff --git a/res/drawable/ic_sysbar_assist_dark.xml b/res/drawable/ic_sysbar_assist_dark.xml
index 8c98091..821c948 100644
--- a/res/drawable/ic_sysbar_assist_dark.xml
+++ b/res/drawable/ic_sysbar_assist_dark.xml
@@ -1,28 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/assistant.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M64,16H32c-3.3,0-6,2.7-6,6v30c0,1.4,0.5,2.7,1.3,3.7h0l17.6,22.8h0c0.7,0.9,1.9,1.5,3.1,1.5
-s2.4-0.6,3.1-1.5h0l17.4-22.6c0.9-1,1.4-2.4,1.4-3.8V22C70,18.7,67.3,16,64,16z
-M61.2,39.2L61.2,39.2l-9.6,2.4l-2.4,9.6h0
-C49,51.7,48.5,52,48,52s-1-0.3-1.2-0.8h0l-2.4-9.5l-9.7-2.5v0C34.3,39,34,38.5,34,38c0-0.5,0.3-1,0.8-1.2v0l9.6-2.4l2.4-9.5h0
-c0.1-0.5,0.6-0.9,1.2-0.9s1.1,0.4,1.2,0.9h0l2.4,9.5l9.6,2.4v0C61.7,37,62,37.5,62,38C62,38.5,61.7,39,61.2,39.2z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M19,2H5A2,2 0 0,0 3,4V18A2,2 0 0,0 5,20H9L12,23L15,20H19A2,2 0 0,0 21,18V4A2,2 0 0,0 19,2M13.88,12.88L12,17L10.12,12.88L6,11L10.12,9.12L12,5L13.88,9.12L18,11" />
 </vector>
diff --git a/res/drawable/ic_sysbar_back.xml b/res/drawable/ic_sysbar_back.xml
index 97b8aeb..5847002 100644
--- a/res/drawable/ic_sysbar_back.xml
+++ b/res/drawable/ic_sysbar_back.xml
@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
 
     <path
         android:fillColor="@color/icon_color_back"
-        android:pathData="M69,20c-0.8,0-1.5,0.2-2.2,0.5l0,0L25,42.8l0,0c-0.1,0.1-0.2,0.1-0.3,0.2c-1.6,1.1-2.7,2.9-2.7,5
-s1.1,3.9,2.7,5c0.1,0.1,0.2,0.1,0.3,0.2l0,0l19.5,10.4l21.8,11.7l0,0c0.2,0.1,0.5,0.3,0.8,0.4l0,0l0,0c0.6,0.2,1.2,0.4,1.9,0.4
-c2.8,0,5-2.2,5-5V25C74,22.2,71.8,20,69,20z" />
+        android:pathData="M64.55,12.62C67.66,10.72 72.05,13.33 71.99,16.94C72.12,35 72.01,53.07 72.05,71.13C71.97,73.99 69.63,75.84 67.01,76.34C64.39,75.81 62.34,74.16 60.02,72.95C46.32,65.08 32.64,57.17 18.9,49.36C15.15,47.63 15.09,41.57 18.78,39.72C34.03,30.68 49.26,21.61 64.55,12.62Z"/>
 </vector>
diff --git a/res/drawable/ic_sysbar_back_dark.xml b/res/drawable/ic_sysbar_back_dark.xml
index bf85351..8be7ed6 100644
--- a/res/drawable/ic_sysbar_back_dark.xml
+++ b/res/drawable/ic_sysbar_back_dark.xml
@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
 
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M69,20c-0.8,0-1.5,0.2-2.2,0.5l0,0L25,42.8l0,0c-0.1,0.1-0.2,0.1-0.3,0.2c-1.6,1.1-2.7,2.9-2.7,5
-s1.1,3.9,2.7,5c0.1,0.1,0.2,0.1,0.3,0.2l0,0l19.5,10.4l21.8,11.7l0,0c0.2,0.1,0.5,0.3,0.8,0.4l0,0l0,0c0.6,0.2,1.2,0.4,1.9,0.4
-c2.8,0,5-2.2,5-5V25C74,22.2,71.8,20,69,20z" />
+        android:pathData="M64.55,12.62C67.66,10.72 72.05,13.33 71.99,16.94C72.12,35 72.01,53.07 72.05,71.13C71.97,73.99 69.63,75.84 67.01,76.34C64.39,75.81 62.34,74.16 60.02,72.95C46.32,65.08 32.64,57.17 18.9,49.36C15.15,47.63 15.09,41.57 18.78,39.72C34.03,30.68 49.26,21.61 64.55,12.62Z"/>
 </vector>
diff --git a/res/drawable/ic_sysbar_back_ime.xml b/res/drawable/ic_sysbar_back_ime.xml
index 1bff708..d7d1e54 100644
--- a/res/drawable/ic_sysbar_back_ime.xml
+++ b/res/drawable/ic_sysbar_back_ime.xml
@@ -1,27 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_ime_switcher"
-        android:pathData="M69,20c-0.8,0-1.5,0.2-2.2,0.5l0,0L25,42.8l0,0c-0.1,0.1-0.2,0.1-0.3,0.2c-1.6,1.1-2.7,2.9-2.7,5
-s1.1,3.9,2.7,5c0.1,0.1,0.2,0.1,0.3,0.2l0,0l19.5,10.4l21.8,11.7l0,0c0.2,0.1,0.5,0.3,0.8,0.4l0,0l0,0c0.6,0.2,1.2,0.4,1.9,0.4
-c2.8,0,5-2.2,5-5V25C74,22.2,71.8,20,69,20z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
+
+    <path
+        android:fillColor="@color/icon_color_back"
+        android:pathData="M16.11,16.11C34.41,15.87 52.74,16.05 71.05,16.02C74.76,15.94 77.25,20.45 75.4,23.61C66.61,39.03 57.76,54.44 48.87,69.8C46.91,72.92 42.05,72.85 39.97,69.88C30.84,54.46 21.66,39.05 12.58,23.61C10.99,20.69 12.76,16.63 16.11,16.11Z"/>
+</vector>
diff --git a/res/drawable/ic_sysbar_back_ime_dark.xml b/res/drawable/ic_sysbar_back_ime_dark.xml
index 23ba553..9a7b28f 100644
--- a/res/drawable/ic_sysbar_back_ime_dark.xml
+++ b/res/drawable/ic_sysbar_back_ime_dark.xml
@@ -1,27 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M69,20c-0.8,0-1.5,0.2-2.2,0.5l0,0L25,42.8l0,0c-0.1,0.1-0.2,0.1-0.3,0.2c-1.6,1.1-2.7,2.9-2.7,5
-s1.1,3.9,2.7,5c0.1,0.1,0.2,0.1,0.3,0.2l0,0l19.5,10.4l21.8,11.7l0,0c0.2,0.1,0.5,0.3,0.8,0.4l0,0l0,0c0.6,0.2,1.2,0.4,1.9,0.4
-c2.8,0,5-2.2,5-5V25C74,22.2,71.8,20,69,20z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
+
+    <path
+        android:fillColor="@color/icon_color_dark"
+        android:pathData="M16.11,16.11C34.41,15.87 52.74,16.05 71.05,16.02C74.76,15.94 77.25,20.45 75.4,23.61C66.61,39.03 57.76,54.44 48.87,69.8C46.91,72.92 42.05,72.85 39.97,69.88C30.84,54.46 21.66,39.05 12.58,23.61C10.99,20.69 12.76,16.63 16.11,16.11Z"/>
+</vector>
diff --git a/res/drawable/ic_sysbar_back_land.xml b/res/drawable/ic_sysbar_back_land.xml
index 0a9ba26..d7d1e54 100644
--- a/res/drawable/ic_sysbar_back_land.xml
+++ b/res/drawable/ic_sysbar_back_land.xml
@@ -1,27 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_back"
-        android:pathData="M69,20c-0.8,0-1.5,0.2-2.2,0.5l0,0L25,42.8l0,0c-0.1,0.1-0.2,0.1-0.3,0.2c-1.6,1.1-2.7,2.9-2.7,5
-s1.1,3.9,2.7,5c0.1,0.1,0.2,0.1,0.3,0.2l0,0l19.5,10.4l21.8,11.7l0,0c0.2,0.1,0.5,0.3,0.8,0.4l0,0l0,0c0.6,0.2,1.2,0.4,1.9,0.4
-c2.8,0,5-2.2,5-5V25C74,22.2,71.8,20,69,20z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
+
+    <path
+        android:fillColor="@color/icon_color_back"
+        android:pathData="M16.11,16.11C34.41,15.87 52.74,16.05 71.05,16.02C74.76,15.94 77.25,20.45 75.4,23.61C66.61,39.03 57.76,54.44 48.87,69.8C46.91,72.92 42.05,72.85 39.97,69.88C30.84,54.46 21.66,39.05 12.58,23.61C10.99,20.69 12.76,16.63 16.11,16.11Z"/>
+</vector>
diff --git a/res/drawable/ic_sysbar_back_land_dark.xml b/res/drawable/ic_sysbar_back_land_dark.xml
index 23ba553..9a7b28f 100644
--- a/res/drawable/ic_sysbar_back_land_dark.xml
+++ b/res/drawable/ic_sysbar_back_land_dark.xml
@@ -1,27 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M69,20c-0.8,0-1.5,0.2-2.2,0.5l0,0L25,42.8l0,0c-0.1,0.1-0.2,0.1-0.3,0.2c-1.6,1.1-2.7,2.9-2.7,5
-s1.1,3.9,2.7,5c0.1,0.1,0.2,0.1,0.3,0.2l0,0l19.5,10.4l21.8,11.7l0,0c0.2,0.1,0.5,0.3,0.8,0.4l0,0l0,0c0.6,0.2,1.2,0.4,1.9,0.4
-c2.8,0,5-2.2,5-5V25C74,22.2,71.8,20,69,20z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
+
+    <path
+        android:fillColor="@color/icon_color_dark"
+        android:pathData="M16.11,16.11C34.41,15.87 52.74,16.05 71.05,16.02C74.76,15.94 77.25,20.45 75.4,23.61C66.61,39.03 57.76,54.44 48.87,69.8C46.91,72.92 42.05,72.85 39.97,69.88C30.84,54.46 21.66,39.05 12.58,23.61C10.99,20.69 12.76,16.63 16.11,16.11Z"/>
+</vector>
diff --git a/res/drawable/ic_sysbar_bt.xml b/res/drawable/ic_sysbar_bt.xml
index cf5e739..10790a6 100644
--- a/res/drawable/ic_sysbar_bt.xml
+++ b/res/drawable/ic_sysbar_bt.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/bluetooth.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <group>
-        <path
-            android:fillColor="@color/icon_color_bluetooth"
-            android:pathData="M70.7,58.5L70.7,58.5L70.7,58.5c-0.1,0-0.1-0.1-0.2-0.1l-12.5-7l-1.1-0.6C55.8,50.3,55,49.3,55,48
-c0-1.1,0.7-2.1,1.6-2.6l1-0.5l0.4-0.2l12.5-7c0.1,0,0.1-0.1,0.2-0.1l0,0v0C71.5,36.9,72,36,72,35s-0.5-1.9-1.3-2.5v0l0,0
-c-0.2-0.2-0.5-0.3-0.7-0.4L46.1,20.6l0,0C45.5,20.2,44.8,20,44,20c-2.2,0-4,1.8-4,4v13.7L32,33c-1.9-1.1-4.4-0.5-5.5,1.5l-2,3.5
-c-1.1,1.9-0.5,4.4,1.5,5.5l7.9,4.6L26,52.6c-1.9,1.1-2.6,3.6-1.5,5.5l2,3.5c1.1,1.9,3.6,2.6,5.5,1.5l8-4.6V72c0,2.2,1.8,4,4,4
-c0.8,0,1.5-0.2,2.1-0.6l0,0L70,63.8c0.3-0.1,0.5-0.2,0.7-0.4h0C71.5,62.9,72,62,72,61S71.5,59.1,70.7,58.5z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_bluetooth" android:pathData="M14.88,16.29L13,18.17V14.41M13,5.83L14.88,7.71L13,9.58M17.71,7.71L12,2H11V9.58L6.41,5L5,6.41L10.59,12L5,17.58L6.41,19L11,14.41V22H12L17.71,16.29L13.41,12L17.71,7.71Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_bt_dark.xml b/res/drawable/ic_sysbar_bt_dark.xml
index d65d511..d77cfa7 100644
--- a/res/drawable/ic_sysbar_bt_dark.xml
+++ b/res/drawable/ic_sysbar_bt_dark.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/bluetooth.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M70.7,58.5L70.7,58.5L70.7,58.5c-0.1,0-0.1-0.1-0.2-0.1l-12.5-7l-1.1-0.6C55.8,50.3,55,49.3,55,48
-c0-1.1,0.7-2.1,1.6-2.6l1-0.5l0.4-0.2l12.5-7c0.1,0,0.1-0.1,0.2-0.1l0,0v0C71.5,36.9,72,36,72,35s-0.5-1.9-1.3-2.5v0l0,0
-c-0.2-0.2-0.5-0.3-0.7-0.4L46.1,20.6l0,0C45.5,20.2,44.8,20,44,20c-2.2,0-4,1.8-4,4v13.7L32,33c-1.9-1.1-4.4-0.5-5.5,1.5l-2,3.5
-c-1.1,1.9-0.5,4.4,1.5,5.5l7.9,4.6L26,52.6c-1.9,1.1-2.6,3.6-1.5,5.5l2,3.5c1.1,1.9,3.6,2.6,5.5,1.5l8-4.6V72c0,2.2,1.8,4,4,4
-c0.8,0,1.5-0.2,2.1-0.6l0,0L70,63.8c0.3-0.1,0.5-0.2,0.7-0.4h0C71.5,62.9,72,62,72,61S71.5,59.1,70.7,58.5z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M14.88,16.29L13,18.17V14.41M13,5.83L14.88,7.71L13,9.58M17.71,7.71L12,2H11V9.58L6.41,5L5,6.41L10.59,12L5,17.58L6.41,19L11,14.41V22H12L17.71,16.29L13.41,12L17.71,7.71Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_clear_notifications.xml b/res/drawable/ic_sysbar_clear_notifications.xml
index 58f4ab5..2a1fbc6 100644
--- a/res/drawable/ic_sysbar_clear_notifications.xml
+++ b/res/drawable/ic_sysbar_clear_notifications.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/clear_notifications.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_clear_notifications"
-        android:pathData="M78,32H38c-2.2,0-4-1.8-4-4v-4c0-2.2,1.8-4,4-4h40c2.2,0,4,1.8,4,4v4C82,30.2,80.2,32,78,32z" />
-    <path
-        android:fillColor="@color/icon_color_clear_notifications"
-        android:pathData="M68,54H28c-2.2,0-4-1.8-4-4v-4c0-2.2,1.8-4,4-4h40c2.2,0,4,1.8,4,4v4C72,52.2,70.2,54,68,54z" />
-    <path
-        android:fillColor="@color/icon_color_clear_notifications"
-        android:pathData="M58,76H18c-2.2,0-4-1.8-4-4v-4c0-2.2,1.8-4,4-4h40c2.2,0,4,1.8,4,4v4C62,74.2,60.2,76,58,76z" />
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_clear_notifications" android:pathData="M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7" />
 </vector>
diff --git a/res/drawable/ic_sysbar_clear_notifications_dark.xml b/res/drawable/ic_sysbar_clear_notifications_dark.xml
index 01bfc89..d8480e8 100644
--- a/res/drawable/ic_sysbar_clear_notifications_dark.xml
+++ b/res/drawable/ic_sysbar_clear_notifications_dark.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/clear_notifications.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M78,32H38c-2.2,0-4-1.8-4-4v-4c0-2.2,1.8-4,4-4h40c2.2,0,4,1.8,4,4v4C82,30.2,80.2,32,78,32z" />
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M68,54H28c-2.2,0-4-1.8-4-4v-4c0-2.2,1.8-4,4-4h40c2.2,0,4,1.8,4,4v4C72,52.2,70.2,54,68,54z" />
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M58,76H18c-2.2,0-4-1.8-4-4v-4c0-2.2,1.8-4,4-4h40c2.2,0,4,1.8,4,4v4C62,74.2,60.2,76,58,76z" />
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7" />
 </vector>
diff --git a/res/drawable/ic_sysbar_docked.xml b/res/drawable/ic_sysbar_docked.xml
index 585c3ec..4542ce6 100644
--- a/res/drawable/ic_sysbar_docked.xml
+++ b/res/drawable/ic_sysbar_docked.xml
@@ -1,29 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M74,20h-2H24h-2c-3.3,0-6,2.7-6,6v12c0,3.3,2.7,6,6,6h52c3.3,0,6-2.7,6-6V26C80,22.7,77.3,20,74,20z" />
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M74,52H22c-3.3,0-6,2.7-6,6v12c0,3.3,2.7,6,6,6h2h48h2c3.3,0,6-2.7,6-6V58C80,54.7,77.3,52,74,52z" />
-    </group>
+    android:height="21dp"
+    android:width="21dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_split_screen" android:pathData="M20,3H3A1,1 0 0,0 2,4V10A1,1 0 0,0 3,11H20A1,1 0 0,0 21,10V4A1,1 0 0,0 20,3M20,13H3A1,1 0 0,0 2,14V20A1,1 0 0,0 3,21H20A1,1 0 0,0 21,20V14A1,1 0 0,0 20,13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_docked_dark.xml b/res/drawable/ic_sysbar_docked_dark.xml
index 7429f4a..0ea728a 100644
--- a/res/drawable/ic_sysbar_docked_dark.xml
+++ b/res/drawable/ic_sysbar_docked_dark.xml
@@ -1,29 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M74,20h-2H24h-2c-3.3,0-6,2.7-6,6v12c0,3.3,2.7,6,6,6h52c3.3,0,6-2.7,6-6V26C80,22.7,77.3,20,74,20z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M74,52H22c-3.3,0-6,2.7-6,6v12c0,3.3,2.7,6,6,6h2h48h2c3.3,0,6-2.7,6-6V58C80,54.7,77.3,52,74,52z" />
-    </group>
+    android:height="19dp"
+    android:width="19dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M20,3H3A1,1 0 0,0 2,4V10A1,1 0 0,0 3,11H20A1,1 0 0,0 21,10V4A1,1 0 0,0 20,3M20,13H3A1,1 0 0,0 2,14V20A1,1 0 0,0 3,21H20A1,1 0 0,0 21,20V14A1,1 0 0,0 20,13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_editing_smartbar.xml b/res/drawable/ic_sysbar_editing_smartbar.xml
index 7d3609d..5d66834 100644
--- a/res/drawable/ic_sysbar_editing_smartbar.xml
+++ b/res/drawable/ic_sysbar_editing_smartbar.xml
@@ -1,35 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/editing_smartbar.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_editing_smartbar"
-            android:pathData="M64.3,42.5L64.3,42.5C64.3,42.5,64.3,42.5,64.3,42.5L53.5,31.7c-0.6-0.6-1.4-1-2.3-1s-1.7,0.4-2.3,1h0
-L25.3,55.3c-0.4,0.3-0.6,0.8-0.8,1.2l0,0l-0.1,0.4c0,0,0,0.1,0,0.1l-4.2,14.6l0,0C20.1,72,20,72.4,20,72.8c0,1.8,1.4,3.2,3.2,3.2
-c0.4,0,0.7-0.1,1.1-0.2l0,0l14.5-4.1l0-0.1c0.8-0.1,1.4-0.5,1.9-1.1l23.5-23.5c0,0,0,0,0,0l0,0v0c0.6-0.6,0.9-1.4,0.9-2.2
-C65.2,43.9,64.9,43.1,64.3,42.5L64.3,42.5z" />
-        <path
-            android:fillColor="@color/icon_color_editing_smartbar"
-            android:pathData="M75.2,31.9L75.2,31.9L75.2,31.9c-0.1-0.1-0.1-0.2-0.2-0.2L64.3,21c0,0-0.1-0.1-0.1-0.1l0,0h0
-C63.6,20.3,62.8,20,62,20s-1.6,0.3-2.2,0.9h0l0,0c0,0-0.1,0.1-0.1,0.1l-2.1,2.1c0,0,0,0,0,0l0,0v0c-0.6,0.6-0.9,1.4-0.9,2.2
-c0,0.9,0.3,1.7,0.9,2.2v0l0,0c0,0,0,0,0,0l10.7,10.7c0.1,0.1,0.1,0.1,0.2,0.2l0,0h0c0.6,0.5,1.3,0.8,2.1,0.8c0.8,0,1.6-0.3,2.1-0.8
-h0l0.1-0.1c0,0,0,0,0,0l2.1-2.1c0,0,0.1-0.1,0.1-0.1l0.1-0.1v0c0.5-0.6,0.8-1.3,0.8-2.1S75.7,32.4,75.2,31.9z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_editing_smartbar" android:pathData="M4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H16L12,22L8,18H4A2,2 0 0,1 2,16V4A2,2 0 0,1 4,2M18,14V12H12.5L10.5,14H18M6,14H8.5L15.35,7.12C15.55,6.93 15.55,6.61 15.35,6.41L13.59,4.65C13.39,4.45 13.07,4.45 12.88,4.65L6,11.53V14Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_editing_smartbar_dark.xml b/res/drawable/ic_sysbar_editing_smartbar_dark.xml
index a047512..60b5ee8 100644
--- a/res/drawable/ic_sysbar_editing_smartbar_dark.xml
+++ b/res/drawable/ic_sysbar_editing_smartbar_dark.xml
@@ -1,35 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/editing_smartbar.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M64.3,42.5L64.3,42.5C64.3,42.5,64.3,42.5,64.3,42.5L53.5,31.7c-0.6-0.6-1.4-1-2.3-1s-1.7,0.4-2.3,1h0
-L25.3,55.3c-0.4,0.3-0.6,0.8-0.8,1.2l0,0l-0.1,0.4c0,0,0,0.1,0,0.1l-4.2,14.6l0,0C20.1,72,20,72.4,20,72.8c0,1.8,1.4,3.2,3.2,3.2
-c0.4,0,0.7-0.1,1.1-0.2l0,0l14.5-4.1l0-0.1c0.8-0.1,1.4-0.5,1.9-1.1l23.5-23.5c0,0,0,0,0,0l0,0v0c0.6-0.6,0.9-1.4,0.9-2.2
-C65.2,43.9,64.9,43.1,64.3,42.5L64.3,42.5z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M75.2,31.9L75.2,31.9L75.2,31.9c-0.1-0.1-0.1-0.2-0.2-0.2L64.3,21c0,0-0.1-0.1-0.1-0.1l0,0h0
-C63.6,20.3,62.8,20,62,20s-1.6,0.3-2.2,0.9h0l0,0c0,0-0.1,0.1-0.1,0.1l-2.1,2.1c0,0,0,0,0,0l0,0v0c-0.6,0.6-0.9,1.4-0.9,2.2
-c0,0.9,0.3,1.7,0.9,2.2v0l0,0c0,0,0,0,0,0l10.7,10.7c0.1,0.1,0.1,0.1,0.2,0.2l0,0h0c0.6,0.5,1.3,0.8,2.1,0.8c0.8,0,1.6-0.3,2.1-0.8
-h0l0.1-0.1c0,0,0,0,0,0l2.1-2.1c0,0,0.1-0.1,0.1-0.1l0.1-0.1v0c0.5-0.6,0.8-1.3,0.8-2.1S75.7,32.4,75.2,31.9z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H16L12,22L8,18H4A2,2 0 0,1 2,16V4A2,2 0 0,1 4,2M18,14V12H12.5L10.5,14H18M6,14H8.5L15.35,7.12C15.55,6.93 15.55,6.61 15.35,6.41L13.59,4.65C13.39,4.45 13.07,4.45 12.88,4.65L6,11.53V14Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_expanded_desktop.xml b/res/drawable/ic_sysbar_expanded_desktop.xml
index 7bb1b77..269b2ab 100644
--- a/res/drawable/ic_sysbar_expanded_desktop.xml
+++ b/res/drawable/ic_sysbar_expanded_desktop.xml
@@ -1,35 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/arrow_expand.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-
-    <group>
-        <path
-            android:fillColor="@color/icon_color_expanded_desktop"
-            android:pathData="M22,40h52c2.2,0,4-1.8,4-4c0-0.7-0.2-1.4-0.5-1.9l0,0l-0.1-0.1c-0.1-0.1-0.2-0.3-0.3-0.4l-7.9-11.3
-c0-0.1-0.1-0.1-0.1-0.1L69,22l0,0C68,20.8,66.6,20,65,20H31c-1.6,0-3.1,0.8-4,2l0,0l-0.1,0.1c0,0,0,0.1-0.1,0.1l-8,11.4
-c-0.1,0.1-0.1,0.2-0.2,0.3l-0.1,0.1l0,0c-0.4,0.6-0.6,1.3-0.6,2C18,38.2,19.8,40,22,40z" />
-        <path
-            android:fillColor="@color/icon_color_expanded_desktop"
-            android:pathData="M74,56H22c-2.2,0-4,1.8-4,4c0,0.8,0.2,1.4,0.6,2l0,0l0.1,0.1c0.1,0.1,0.1,0.2,0.2,0.3l8,11.4
-c0,0,0,0.1,0.1,0.1L27,74l0,0c0.9,1.2,2.4,2,4,2h34c1.6,0,3-0.8,3.9-1.9l0,0l0.1-0.2c0,0,0.1-0.1,0.1-0.1l7.9-11.3
-c0.1-0.1,0.2-0.3,0.3-0.4l0.1-0.1l0,0c0.3-0.6,0.5-1.2,0.5-1.9C78,57.8,76.2,56,74,56z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_expanded_desktop" android:pathData="M9.5,13.09L10.91,14.5L6.41,19H10V21H3V14H5V17.59L9.5,13.09M10.91,9.5L9.5,10.91L5,6.41V10H3V3H10V5H6.41L10.91,9.5M14.5,13.09L19,17.59V14H21V21H14V19H17.59L13.09,14.5L14.5,13.09M13.09,9.5L17.59,5H14V3H21V10H19V6.41L14.5,10.91L13.09,9.5Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_expanded_desktop_dark.xml b/res/drawable/ic_sysbar_expanded_desktop_dark.xml
index f29cf11..158b0a7 100644
--- a/res/drawable/ic_sysbar_expanded_desktop_dark.xml
+++ b/res/drawable/ic_sysbar_expanded_desktop_dark.xml
@@ -1,35 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/arrow_expand.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M22,40h52c2.2,0,4-1.8,4-4c0-0.7-0.2-1.4-0.5-1.9l0,0l-0.1-0.1c-0.1-0.1-0.2-0.3-0.3-0.4l-7.9-11.3
-c0-0.1-0.1-0.1-0.1-0.1L69,22l0,0C68,20.8,66.6,20,65,20H31c-1.6,0-3.1,0.8-4,2l0,0l-0.1,0.1c0,0,0,0.1-0.1,0.1l-8,11.4
-c-0.1,0.1-0.1,0.2-0.2,0.3l-0.1,0.1l0,0c-0.4,0.6-0.6,1.3-0.6,2C18,38.2,19.8,40,22,40z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M74,56H22c-2.2,0-4,1.8-4,4c0,0.8,0.2,1.4,0.6,2l0,0l0.1,0.1c0.1,0.1,0.1,0.2,0.2,0.3l8,11.4
-c0,0,0,0.1,0.1,0.1L27,74l0,0c0.9,1.2,2.4,2,4,2h34c1.6,0,3-0.8,3.9-1.9l0,0l0.1-0.2c0,0,0.1-0.1,0.1-0.1l7.9-11.3
-c0.1-0.1,0.2-0.3,0.3-0.4l0.1-0.1l0,0c0.3-0.6,0.5-1.2,0.5-1.9C78,57.8,76.2,56,74,56z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M9.5,13.09L10.91,14.5L6.41,19H10V21H3V14H5V17.59L9.5,13.09M10.91,9.5L9.5,10.91L5,6.41V10H3V3H10V5H6.41L10.91,9.5M14.5,13.09L19,17.59V14H21V21H14V19H17.59L13.09,14.5L14.5,13.09M13.09,9.5L17.59,5H14V3H21V10H19V6.41L14.5,10.91L13.09,9.5Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_google_now_on_tap.xml b/res/drawable/ic_sysbar_google_now_on_tap.xml
index b895fee..ea8225f 100644
--- a/res/drawable/ic_sysbar_google_now_on_tap.xml
+++ b/res/drawable/ic_sysbar_google_now_on_tap.xml
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/google-glass.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_google_now_on_tap"
-        android:pathData="M72,42h-4h-4H48c-2.2,0-4,1.8-4,4v4c0,2.2,1.8,4,4,4h14.8c-2.4,5.9-8.1,10-14.8,10c-8.8,0-16-7.2-16-16
-s7.2-16,16-16c2.9,0,5.6,0.8,7.9,2.1l0,0c0.4,0.3,0.8,0.5,1.3,0.5c0.6,0,1.1-0.2,1.4-0.6l0,0l5.9-5.6c0,0,0,0,0.1-0.1l0,0l0,0
-c0.3-0.4,0.5-0.8,0.5-1.4c0-0.6-0.3-1.1-0.7-1.5l0,0c0,0-0.1,0-0.1-0.1c-0.1-0.1-0.2-0.1-0.2-0.2C59.7,21.9,54.1,20,48,20
-c-15.5,0-28,12.5-28,28c0,15.5,12.5,28,28,28s28-12.5,28-28v-2C76,43.8,74.2,42,72,42z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_google_now_on_tap" android:pathData="M13,11V13.5H18.87C18.26,17 15.5,19.5 12,19.5A7.5,7.5 0 0,1 4.5,12A7.5,7.5 0 0,1 12,4.5C14.09,4.5 15.9,5.39 17.16,6.84L18.93,5.06C17.24,3.18 14.83,2 12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22C17.5,22 21.5,17.5 21.5,12V11H13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_google_now_on_tap_dark.xml b/res/drawable/ic_sysbar_google_now_on_tap_dark.xml
index 5d906fb..ed50f29 100644
--- a/res/drawable/ic_sysbar_google_now_on_tap_dark.xml
+++ b/res/drawable/ic_sysbar_google_now_on_tap_dark.xml
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/google-glass.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M72,42h-4h-4H48c-2.2,0-4,1.8-4,4v4c0,2.2,1.8,4,4,4h14.8c-2.4,5.9-8.1,10-14.8,10c-8.8,0-16-7.2-16-16
-s7.2-16,16-16c2.9,0,5.6,0.8,7.9,2.1l0,0c0.4,0.3,0.8,0.5,1.3,0.5c0.6,0,1.1-0.2,1.4-0.6l0,0l5.9-5.6c0,0,0,0,0.1-0.1l0,0l0,0
-c0.3-0.4,0.5-0.8,0.5-1.4c0-0.6-0.3-1.1-0.7-1.5l0,0c0,0-0.1,0-0.1-0.1c-0.1-0.1-0.2-0.1-0.2-0.2C59.7,21.9,54.1,20,48,20
-c-15.5,0-28,12.5-28,28c0,15.5,12.5,28,28,28s28-12.5,28-28v-2C76,43.8,74.2,42,72,42z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M13,11V13.5H18.87C18.26,17 15.5,19.5 12,19.5A7.5,7.5 0 0,1 4.5,12A7.5,7.5 0 0,1 12,4.5C14.09,4.5 15.9,5.39 17.16,6.84L18.93,5.06C17.24,3.18 14.83,2 12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22C17.5,22 21.5,17.5 21.5,12V11H13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_home.xml b/res/drawable/ic_sysbar_home.xml
index 890b7d2..b8a5e15 100644
--- a/res/drawable/ic_sysbar_home.xml
+++ b/res/drawable/ic_sysbar_home.xml
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_home"
-        android:pathData="M 48 20 C 63.4639729953 20 76 32.5360270047 76 48 C 76 63.4639729953 63.4639729953 76 48 76 C 32.5360270047 76 20 63.4639729953 20 48 C 20 32.5360270047 32.5360270047 20 48 20 Z" />
+    android:width="23dp"
+    android:height="23dp"
+    android:viewportWidth="132"
+    android:viewportHeight="132">
+
     <path
         android:fillColor="@color/icon_color_home"
-        android:pathData="M48,10c-21,0-38,17-38,38s17,38,38,38s38-17,38-38S69,10,48,10z
-M48,82c-18.8,0-34-15.2-34-34
-c0-18.8,15.2-34,34-34s34,15.2,34,34C82,66.8,66.8,82,48,82z" />
+        android:strokeWidth="1"
+        android:pathData="M55.5,22.4 C47.1,24.5,40.8,28.1,34.5,34.5 C16.7,52.2,16.7,79.8,34.5,97.5
+C48.1,111.2,67.9,114.6,85.7,106.3 C93.3,102.8,102.8,93.3,106.3,85.7
+C114.6,67.9,111.2,48.1,97.5,34.5 C86.2,23.1,70.6,18.6,55.5,22.4 Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_home_dark.xml b/res/drawable/ic_sysbar_home_dark.xml
index a234b6d..10091ac 100644
--- a/res/drawable/ic_sysbar_home_dark.xml
+++ b/res/drawable/ic_sysbar_home_dark.xml
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M 48 20 C 63.4639729953 20 76 32.5360270047 76 48 C 76 63.4639729953 63.4639729953 76 48 76 C 32.5360270047 76 20 63.4639729953 20 48 C 20 32.5360270047 32.5360270047 20 48 20 Z" />
+    android:width="23dp"
+    android:height="23dp"
+    android:viewportWidth="132"
+    android:viewportHeight="132">
+
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M48,10c-21,0-38,17-38,38s17,38,38,38s38-17,38-38S69,10,48,10z
-M48,82c-18.8,0-34-15.2-34-34
-c0-18.8,15.2-34,34-34s34,15.2,34,34C82,66.8,66.8,82,48,82z" />
+        android:strokeWidth="1"
+        android:pathData="M55.5,22.4 C47.1,24.5,40.8,28.1,34.5,34.5 C16.7,52.2,16.7,79.8,34.5,97.5
+C48.1,111.2,67.9,114.6,85.7,106.3 C93.3,102.8,102.8,93.3,106.3,85.7
+C114.6,67.9,111.2,48.1,97.5,34.5 C86.2,23.1,70.6,18.6,55.5,22.4 Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_home_land.xml b/res/drawable/ic_sysbar_home_land.xml
index 890b7d2..b8a5e15 100644
--- a/res/drawable/ic_sysbar_home_land.xml
+++ b/res/drawable/ic_sysbar_home_land.xml
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_home"
-        android:pathData="M 48 20 C 63.4639729953 20 76 32.5360270047 76 48 C 76 63.4639729953 63.4639729953 76 48 76 C 32.5360270047 76 20 63.4639729953 20 48 C 20 32.5360270047 32.5360270047 20 48 20 Z" />
+    android:width="23dp"
+    android:height="23dp"
+    android:viewportWidth="132"
+    android:viewportHeight="132">
+
     <path
         android:fillColor="@color/icon_color_home"
-        android:pathData="M48,10c-21,0-38,17-38,38s17,38,38,38s38-17,38-38S69,10,48,10z
-M48,82c-18.8,0-34-15.2-34-34
-c0-18.8,15.2-34,34-34s34,15.2,34,34C82,66.8,66.8,82,48,82z" />
+        android:strokeWidth="1"
+        android:pathData="M55.5,22.4 C47.1,24.5,40.8,28.1,34.5,34.5 C16.7,52.2,16.7,79.8,34.5,97.5
+C48.1,111.2,67.9,114.6,85.7,106.3 C93.3,102.8,102.8,93.3,106.3,85.7
+C114.6,67.9,111.2,48.1,97.5,34.5 C86.2,23.1,70.6,18.6,55.5,22.4 Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_home_land_dark.xml b/res/drawable/ic_sysbar_home_land_dark.xml
index a234b6d..10091ac 100644
--- a/res/drawable/ic_sysbar_home_land_dark.xml
+++ b/res/drawable/ic_sysbar_home_land_dark.xml
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M 48 20 C 63.4639729953 20 76 32.5360270047 76 48 C 76 63.4639729953 63.4639729953 76 48 76 C 32.5360270047 76 20 63.4639729953 20 48 C 20 32.5360270047 32.5360270047 20 48 20 Z" />
+    android:width="23dp"
+    android:height="23dp"
+    android:viewportWidth="132"
+    android:viewportHeight="132">
+
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M48,10c-21,0-38,17-38,38s17,38,38,38s38-17,38-38S69,10,48,10z
-M48,82c-18.8,0-34-15.2-34-34
-c0-18.8,15.2-34,34-34s34,15.2,34,34C82,66.8,66.8,82,48,82z" />
+        android:strokeWidth="1"
+        android:pathData="M55.5,22.4 C47.1,24.5,40.8,28.1,34.5,34.5 C16.7,52.2,16.7,79.8,34.5,97.5
+C48.1,111.2,67.9,114.6,85.7,106.3 C93.3,102.8,102.8,93.3,106.3,85.7
+C114.6,67.9,111.2,48.1,97.5,34.5 C86.2,23.1,70.6,18.6,55.5,22.4 Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_hotspot.xml b/res/drawable/ic_sysbar_hotspot.xml
index b9cf4cd..9ff9b5c 100644
--- a/res/drawable/ic_sysbar_hotspot.xml
+++ b/res/drawable/ic_sysbar_hotspot.xml
@@ -1,28 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/access_point_network.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_hotspot"
-        android:pathData="M74,22.3c0-2.4-1.9-4.3-4.3-4.3H26.3c-2.4,0-4.3,1.9-4.3,4.3c0,0.9,0.3,1.8,0.8,2.5l0,0L42,59.5V66v4v4
-c0,2.2,1.8,4,4,4h4c2.2,0,4-1.8,4-4v-4v-4v-6.5l19.3-34.9l0,0C73.8,23.9,74,23.2,74,22.3z
-M62.8,27.8l-3,5.9c0,0.1-0.1,0.2-0.1,0.3
-l0,0.1l0,0c-0.4,0.5-1,0.9-1.7,0.9H38c-0.7,0-1.3-0.4-1.7-0.9l0,0l0,0c-0.1-0.1-0.1-0.2-0.2-0.3l-3-5.9C33.1,27.5,33,27.3,33,27
-c0-1.1,0.9-2,2-2h26c1.1,0,2,0.9,2,2C63,27.3,62.9,27.6,62.8,27.8L62.8,27.8z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_hotspot" android:pathData="M4.93,2.93C3.12,4.74 2,7.24 2,10C2,12.76 3.12,15.26 4.93,17.07L6.34,15.66C4.89,14.22 4,12.22 4,10C4,7.79 4.89,5.78 6.34,4.34L4.93,2.93M19.07,2.93L17.66,4.34C19.11,5.78 20,7.79 20,10C20,12.22 19.11,14.22 17.66,15.66L19.07,17.07C20.88,15.26 22,12.76 22,10C22,7.24 20.88,4.74 19.07,2.93M7.76,5.76C6.67,6.85 6,8.35 6,10C6,11.65 6.67,13.15 7.76,14.24L9.17,12.83C8.45,12.11 8,11.11 8,10C8,8.89 8.45,7.89 9.17,7.17L7.76,5.76M16.24,5.76L14.83,7.17C15.55,7.89 16,8.89 16,10C16,11.11 15.55,12.11 14.83,12.83L16.24,14.24C17.33,13.15 18,11.65 18,10C18,8.35 17.33,6.85 16.24,5.76M12,8A2,2 0 0,0 10,10A2,2 0 0,0 12,12A2,2 0 0,0 14,10A2,2 0 0,0 12,8M11,14V18H10A1,1 0 0,0 9,19H2V21H9A1,1 0 0,0 10,22H14A1,1 0 0,0 15,21H22V19H15A1,1 0 0,0 14,18H13V14H11Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_hotspot_dark.xml b/res/drawable/ic_sysbar_hotspot_dark.xml
index f768ff5..328a2e1 100644
--- a/res/drawable/ic_sysbar_hotspot_dark.xml
+++ b/res/drawable/ic_sysbar_hotspot_dark.xml
@@ -1,28 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/access_point_network.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M74,22.3c0-2.4-1.9-4.3-4.3-4.3H26.3c-2.4,0-4.3,1.9-4.3,4.3c0,0.9,0.3,1.8,0.8,2.5l0,0L42,59.5V66v4v4
-c0,2.2,1.8,4,4,4h4c2.2,0,4-1.8,4-4v-4v-4v-6.5l19.3-34.9l0,0C73.8,23.9,74,23.2,74,22.3z
-M62.8,27.8l-3,5.9c0,0.1-0.1,0.2-0.1,0.3
-l0,0.1l0,0c-0.4,0.5-1,0.9-1.7,0.9H38c-0.7,0-1.3-0.4-1.7-0.9l0,0l0,0c-0.1-0.1-0.1-0.2-0.2-0.3l-3-5.9C33.1,27.5,33,27.3,33,27
-c0-1.1,0.9-2,2-2h26c1.1,0,2,0.9,2,2C63,27.3,62.9,27.6,62.8,27.8L62.8,27.8z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M4.93,2.93C3.12,4.74 2,7.24 2,10C2,12.76 3.12,15.26 4.93,17.07L6.34,15.66C4.89,14.22 4,12.22 4,10C4,7.79 4.89,5.78 6.34,4.34L4.93,2.93M19.07,2.93L17.66,4.34C19.11,5.78 20,7.79 20,10C20,12.22 19.11,14.22 17.66,15.66L19.07,17.07C20.88,15.26 22,12.76 22,10C22,7.24 20.88,4.74 19.07,2.93M7.76,5.76C6.67,6.85 6,8.35 6,10C6,11.65 6.67,13.15 7.76,14.24L9.17,12.83C8.45,12.11 8,11.11 8,10C8,8.89 8.45,7.89 9.17,7.17L7.76,5.76M16.24,5.76L14.83,7.17C15.55,7.89 16,8.89 16,10C16,11.11 15.55,12.11 14.83,12.83L16.24,14.24C17.33,13.15 18,11.65 18,10C18,8.35 17.33,6.85 16.24,5.76M12,8A2,2 0 0,0 10,10A2,2 0 0,0 12,12A2,2 0 0,0 14,10A2,2 0 0,0 12,8M11,14V18H10A1,1 0 0,0 9,19H2V21H9A1,1 0 0,0 10,22H14A1,1 0 0,0 15,21H22V19H15A1,1 0 0,0 14,18H13V14H11Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_down.xml b/res/drawable/ic_sysbar_ime_down.xml
index 393e956..b821d2e 100644
--- a/res/drawable/ic_sysbar_ime_down.xml
+++ b/res/drawable/ic_sysbar_ime_down.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_down.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_ime_down"
-        android:pathData="M51.9,42.1L51.9,42.1c-3.6,3.7-7,0.8-7.6,0.1L33.1,30.9c-1.2-1.2-3.1-1.2-4.2,0l-6,6c-1.2,1.2-1.2,3.1,0,4.2
-l22.3,23.7c1.6,1.6,4.1,1.6,5.7,0l22.3-23.7c1.2-1.2,1.2-3.1,0-4.2l-6-6c-1.2-1.2-3.1-1.2-4.2,0L51.9,42.1z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_ime_down" android:pathData="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_down_dark.xml b/res/drawable/ic_sysbar_ime_down_dark.xml
index f384b42..e3118d2 100644
--- a/res/drawable/ic_sysbar_ime_down_dark.xml
+++ b/res/drawable/ic_sysbar_ime_down_dark.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_down.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M51.9,42.1L51.9,42.1c-3.6,3.7-7,0.8-7.6,0.1L33.1,30.9c-1.2-1.2-3.1-1.2-4.2,0l-6,6c-1.2,1.2-1.2,3.1,0,4.2
-l22.3,23.7c1.6,1.6,4.1,1.6,5.7,0l22.3-23.7c1.2-1.2,1.2-3.1,0-4.2l-6-6c-1.2-1.2-3.1-1.2-4.2,0L51.9,42.1z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_left.xml b/res/drawable/ic_sysbar_ime_left.xml
index f539f53..5ccd028 100644
--- a/res/drawable/ic_sysbar_ime_left.xml
+++ b/res/drawable/ic_sysbar_ime_left.xml
@@ -1,24 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_left.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/icon_color_ime_left"
-        android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14.0,5.5l-6.0,6.0 6.0,6.0z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_ime_left" android:pathData="M15.41,16.58L10.83,12L15.41,7.41L14,6L8,12L14,18L15.41,16.58Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_left_dark.xml b/res/drawable/ic_sysbar_ime_left_dark.xml
index bf17d02..f274a8a 100644
--- a/res/drawable/ic_sysbar_ime_left_dark.xml
+++ b/res/drawable/ic_sysbar_ime_left_dark.xml
@@ -1,24 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_left.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14.0,5.5l-6.0,6.0 6.0,6.0z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M15.41,16.58L10.83,12L15.41,7.41L14,6L8,12L14,18L15.41,16.58Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_right.xml b/res/drawable/ic_sysbar_ime_right.xml
index 3752a9c..0bc4247 100644
--- a/res/drawable/ic_sysbar_ime_right.xml
+++ b/res/drawable/ic_sysbar_ime_right.xml
@@ -1,24 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_right.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/icon_color_ime_right"
-        android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10.0,5.75l6.0,6.0 -6.0,6.0z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_ime_right" android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_right_dark.xml b/res/drawable/ic_sysbar_ime_right_dark.xml
index 3538f10..a837753 100644
--- a/res/drawable/ic_sysbar_ime_right_dark.xml
+++ b/res/drawable/ic_sysbar_ime_right_dark.xml
@@ -1,24 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_right.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10.0,5.75l6.0,6.0 -6.0,6.0z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_up.xml b/res/drawable/ic_sysbar_ime_up.xml
index 59c557b..5af88c1 100644
--- a/res/drawable/ic_sysbar_ime_up.xml
+++ b/res/drawable/ic_sysbar_ime_up.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_up.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_ime_up"
-        android:pathData="M51.9,53.9L51.9,53.9c-3.6-3.7-7-0.8-7.6-0.1L33.1,65.1c-1.2,1.2-3.1,1.2-4.2,0l-6-6c-1.2-1.2-1.2-3.1,0-4.2
-l22.3-23.7c1.6-1.6,4.1-1.6,5.7,0l22.3,23.7c1.2,1.2,1.2,3.1,0,4.2l-6,6c-1.2,1.2-3.1,1.2-4.2,0L51.9,53.9z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_ime_up" android:pathData="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_ime_up_dark.xml b/res/drawable/ic_sysbar_ime_up_dark.xml
index 56d9041..e66629c 100644
--- a/res/drawable/ic_sysbar_ime_up_dark.xml
+++ b/res/drawable/ic_sysbar_ime_up_dark.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/chevron_up.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M51.9,53.9L51.9,53.9c-3.6-3.7-7-0.8-7.6-0.1L33.1,65.1c-1.2,1.2-3.1,1.2-4.2,0l-6-6c-1.2-1.2-1.2-3.1,0-4.2
-l22.3-23.7c1.6-1.6,4.1-1.6,5.7,0l22.3,23.7c1.2,1.2,1.2,3.1,0,4.2l-6,6c-1.2,1.2-3.1,1.2-4.2,0L51.9,53.9z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_in_app_search.xml b/res/drawable/ic_sysbar_in_app_search.xml
index cf8b584..a7e5195 100644
--- a/res/drawable/ic_sysbar_in_app_search.xml
+++ b/res/drawable/ic_sysbar_in_app_search.xml
@@ -1,26 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/binoculars.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_in_app_search"
-        android:pathData="M78.8,65.2L65.9,52.2C67.3,49.1,68,45.6,68,42c0-14.4-11.6-26-26-26S16,27.6,16,42c0,14.4,11.6,26,26,26
-c3.6,0,7.1-0.7,10.2-2.1l12.9,12.9c1.6,1.6,4.1,1.6,5.7,0l8-8C80.4,69.3,80.4,66.7,78.8,65.2z
-M42,56c-7.7,0-14-6.3-14-14 s6.3-14,14-14s14,6.3,14,14S49.7,56,42,56z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_in_app_search" android:pathData="M11,6H13V13H11V6M9,20A1,1 0 0,1 8,21H5A1,1 0 0,1 4,20V15L6,6H10V13A1,1 0 0,1 9,14V20M10,5H7V3H10V5M15,20V14A1,1 0 0,1 14,13V6H18L20,15V20A1,1 0 0,1 19,21H16A1,1 0 0,1 15,20M14,5V3H17V5H14Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_in_app_search_dark.xml b/res/drawable/ic_sysbar_in_app_search_dark.xml
index 416186a..6b9b0d2 100644
--- a/res/drawable/ic_sysbar_in_app_search_dark.xml
+++ b/res/drawable/ic_sysbar_in_app_search_dark.xml
@@ -1,26 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/binoculars.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M78.8,65.2L65.9,52.2C67.3,49.1,68,45.6,68,42c0-14.4-11.6-26-26-26S16,27.6,16,42c0,14.4,11.6,26,26,26
-c3.6,0,7.1-0.7,10.2-2.1l12.9,12.9c1.6,1.6,4.1,1.6,5.7,0l8-8C80.4,69.3,80.4,66.7,78.8,65.2z
-M42,56c-7.7,0-14-6.3-14-14 s6.3-14,14-14s14,6.3,14,14S49.7,56,42,56z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M11,6H13V13H11V6M9,20A1,1 0 0,1 8,21H5A1,1 0 0,1 4,20V15L6,6H10V13A1,1 0 0,1 9,14V20M10,5H7V3H10V5M15,20V14A1,1 0 0,1 14,13V6H18L20,15V20A1,1 0 0,1 19,21H16A1,1 0 0,1 15,20M14,5V3H17V5H14Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_killtask.xml b/res/drawable/ic_sysbar_killtask.xml
index 1648b5b..0ae7011 100644
--- a/res/drawable/ic_sysbar_killtask.xml
+++ b/res/drawable/ic_sysbar_killtask.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/close_circle_outline.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_force_close_app"
-        android:pathData="M75.3,62.1L75.3,62.1c-0.2-0.2-0.2-0.3-0.3-0.3L61.2,48l13.9-13.9c0.6-0.6,0.9-1.4,0.9-2.3
-c0-0.9-0.4-1.8-1.1-2.4l-8.4-8.4c-0.1-0.1-0.1-0.1-0.2-0.2l-0.1-0.1h0c-0.6-0.5-1.3-0.8-2.1-0.8s-1.5,0.3-2.1,0.8h0L62,20.8
-c-0.1,0.1-0.2,0.2-0.2,0.2L48,34.8L34.2,21.1c-0.1-0.1-0.2-0.2-0.2-0.2l-0.1-0.1h0c-0.6-0.5-1.3-0.8-2.1-0.8s-1.5,0.3-2.1,0.8h0
-l-0.1,0.1c-0.1,0.1-0.1,0.1-0.2,0.2l-8.4,8.4c-0.6,0.6-1.1,1.4-1.1,2.4c0,0.9,0.4,1.7,0.9,2.3L34.8,48L21.1,61.8
-c-0.1,0.1-0.2,0.2-0.2,0.2l-0.1,0.1v0c-0.5,0.6-0.7,1.3-0.7,2s0.3,1.5,0.7,2v0l0.1,0.1c0,0.1,0.1,0.1,0.1,0.1l8.5,8.5
-c0,0.1,0.1,0.1,0.1,0.1l0.1,0.1h0c0.6,0.5,1.3,0.8,2.1,0.8c0.8,0,1.5-0.3,2.1-0.8h0l0.1-0.1c0,0,0,0,0,0L48,61.2l13.9,13.9
-c0,0,0,0,0,0l0.1,0.1h0c0.6,0.5,1.3,0.8,2.1,0.8c0.8,0,1.5-0.3,2.1-0.8h0l0.1-0.1c0.1,0,0.1-0.1,0.1-0.1l8.5-8.5
-c0.1,0,0.1-0.1,0.1-0.1l0.1-0.1v0c0.5-0.6,0.7-1.3,0.7-2S75.7,62.7,75.3,62.1L75.3,62.1z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_force_close_app" android:pathData="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_killtask_dark.xml b/res/drawable/ic_sysbar_killtask_dark.xml
index 2a7eace..4451c42 100644
--- a/res/drawable/ic_sysbar_killtask_dark.xml
+++ b/res/drawable/ic_sysbar_killtask_dark.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/close_circle_outline.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M75.3,62.1L75.3,62.1c-0.2-0.2-0.2-0.3-0.3-0.3L61.2,48l13.9-13.9c0.6-0.6,0.9-1.4,0.9-2.3
-c0-0.9-0.4-1.8-1.1-2.4l-8.4-8.4c-0.1-0.1-0.1-0.1-0.2-0.2l-0.1-0.1h0c-0.6-0.5-1.3-0.8-2.1-0.8s-1.5,0.3-2.1,0.8h0L62,20.8
-c-0.1,0.1-0.2,0.2-0.2,0.2L48,34.8L34.2,21.1c-0.1-0.1-0.2-0.2-0.2-0.2l-0.1-0.1h0c-0.6-0.5-1.3-0.8-2.1-0.8s-1.5,0.3-2.1,0.8h0
-l-0.1,0.1c-0.1,0.1-0.1,0.1-0.2,0.2l-8.4,8.4c-0.6,0.6-1.1,1.4-1.1,2.4c0,0.9,0.4,1.7,0.9,2.3L34.8,48L21.1,61.8
-c-0.1,0.1-0.2,0.2-0.2,0.2l-0.1,0.1v0c-0.5,0.6-0.7,1.3-0.7,2s0.3,1.5,0.7,2v0l0.1,0.1c0,0.1,0.1,0.1,0.1,0.1l8.5,8.5
-c0,0.1,0.1,0.1,0.1,0.1l0.1,0.1h0c0.6,0.5,1.3,0.8,2.1,0.8c0.8,0,1.5-0.3,2.1-0.8h0l0.1-0.1c0,0,0,0,0,0L48,61.2l13.9,13.9
-c0,0,0,0,0,0l0.1,0.1h0c0.6,0.5,1.3,0.8,2.1,0.8c0.8,0,1.5-0.3,2.1-0.8h0l0.1-0.1c0.1,0,0.1-0.1,0.1-0.1l8.5-8.5
-c0.1,0,0.1-0.1,0.1-0.1l0.1-0.1v0c0.5-0.6,0.7-1.3,0.7-2S75.7,62.7,75.3,62.1L75.3,62.1z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_lastapp.xml b/res/drawable/ic_sysbar_lastapp.xml
index 76ef362..3606eca 100644
--- a/res/drawable/ic_sysbar_lastapp.xml
+++ b/res/drawable/ic_sysbar_lastapp.xml
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/arrange_bring_forward.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_last_app"
-        android:pathData="M78,45c0-1.7-1.3-3-3-3c-1.7,0-3,1.3-3,3c0,0-3.5,17-14,17s-10-8.3-10-10h8c2.2,0,4-1.8,4-4
-c0-0.7-0.2-1.4-0.5-2l0,0l-0.1-0.1c-0.1-0.2-0.2-0.3-0.4-0.5L41.6,21.5c-0.1-0.2-0.3-0.4-0.4-0.6l0,0h0C40.6,20.4,39.9,20,39,20
-s-1.6,0.4-2.2,0.9h0l0,0c-0.2,0.2-0.3,0.4-0.4,0.6L19.2,45.2c-0.3,0.3-0.5,0.6-0.7,0.9l-0.1,0.1l0,0C18.2,46.7,18,47.3,18,48
-c0,2.2,1.8,4,4,4h6c0,0.1,0,0.1,0,0.2c0,0,0,0.1,0,0.2C28.1,55.2,29.5,76,52,76c0,0,0,0,0,0C78.5,76,78,45,78,45z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_last_app" android:pathData="M21,19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3H19C20.11,3 21,3.9 21,5V19M13,18V9.5L16.5,13L17.92,11.58L12,5.66L6.08,11.58L7.5,13L11,9.5V18H13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_lastapp_dark.xml b/res/drawable/ic_sysbar_lastapp_dark.xml
index b4fbd99..17957f6 100644
--- a/res/drawable/ic_sysbar_lastapp_dark.xml
+++ b/res/drawable/ic_sysbar_lastapp_dark.xml
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/arrange_bring_forward.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M78,45c0-1.7-1.3-3-3-3c-1.7,0-3,1.3-3,3c0,0-3.5,17-14,17s-10-8.3-10-10h8c2.2,0,4-1.8,4-4
-c0-0.7-0.2-1.4-0.5-2l0,0l-0.1-0.1c-0.1-0.2-0.2-0.3-0.4-0.5L41.6,21.5c-0.1-0.2-0.3-0.4-0.4-0.6l0,0h0C40.6,20.4,39.9,20,39,20
-s-1.6,0.4-2.2,0.9h0l0,0c-0.2,0.2-0.3,0.4-0.4,0.6L19.2,45.2c-0.3,0.3-0.5,0.6-0.7,0.9l-0.1,0.1l0,0C18.2,46.7,18,47.3,18,48
-c0,2.2,1.8,4,4,4h6c0,0.1,0,0.1,0,0.2c0,0,0,0.1,0,0.2C28.1,55.2,29.5,76,52,76c0,0,0,0,0,0C78.5,76,78,45,78,45z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M21,19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3H19C20.11,3 21,3.9 21,5V19M13,18V9.5L16.5,13L17.92,11.58L12,5.66L6.08,11.58L7.5,13L11,9.5V18H13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_menu.xml b/res/drawable/ic_sysbar_menu.xml
index 47a2e1b..342bf08 100644
--- a/res/drawable/ic_sysbar_menu.xml
+++ b/res/drawable/ic_sysbar_menu.xml
@@ -1,46 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="512.000000"
-    android:viewportHeight="512.000000">
-
-    <group
-            android:translateY="512.000000"
-            android:scaleX="0.100000"
-            android:scaleY="-0.100000">
-        <path
-            android:fillColor="@color/icon_color_menu"
-            android:strokeWidth="1"
-            android:pathData="M1360 3901 c-147 -45 -231 -209 -186 -363 18 -65 79 -138 140 -171 l41 -22 1195 -3
-c845 -2 1207 0 1235 8 62 17 126 70 160 131 27 49 30 63 30 144 0 74 -4 98 -22 131
--28 53 -74 99 -127 127 l-41 22 -1200 2 c-660 1 -1211 -2 -1225 -6z" />
-        <path
-            android:fillColor="@color/icon_color_menu"
-            android:strokeWidth="1"
-            android:pathData="M1324 2821 c-54 -25 -111 -83 -138 -140 -29 -65 -29 -189 2 -247 33 -64 70 -102
-126 -132 l51 -27 1184 -3 c1353 -3 1256 -9 1346 81 143 144 102 385 -80 468 -38 18
--100 19 -1245 19 -1154 0 -1207 -1 -1246 -19z" />
-        <path
-            android:fillColor="@color/icon_color_menu"
-            android:strokeWidth="1"
-            android:pathData="M1353 1757 c-60 -22 -117 -72 -148 -128 -27 -49 -30 -63 -30 -144 0 -74 4 -98 22
--131 28 -53 74 -99 127 -127 l41 -22 1215 0 1215 0 40 22 c202 109 203 408 1 516
-l-41 22 -1205 2 c-906 1 -1213 -1 -1237 -10z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_menu" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
 </vector>
-
diff --git a/res/drawable/ic_sysbar_menu_dark.xml b/res/drawable/ic_sysbar_menu_dark.xml
index 5a9d242..2c8f87f 100644
--- a/res/drawable/ic_sysbar_menu_dark.xml
+++ b/res/drawable/ic_sysbar_menu_dark.xml
@@ -1,46 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="512.000000"
-    android:viewportHeight="512.000000">
-
-    <group
-            android:translateY="512.000000"
-            android:scaleX="0.100000"
-            android:scaleY="-0.100000">
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:strokeWidth="1"
-            android:pathData="M1360 3901 c-147 -45 -231 -209 -186 -363 18 -65 79 -138 140 -171 l41 -22 1195 -3
-c845 -2 1207 0 1235 8 62 17 126 70 160 131 27 49 30 63 30 144 0 74 -4 98 -22 131
--28 53 -74 99 -127 127 l-41 22 -1200 2 c-660 1 -1211 -2 -1225 -6z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:strokeWidth="1"
-            android:pathData="M1324 2821 c-54 -25 -111 -83 -138 -140 -29 -65 -29 -189 2 -247 33 -64 70 -102
-126 -132 l51 -27 1184 -3 c1353 -3 1256 -9 1346 81 143 144 102 385 -80 468 -38 18
--100 19 -1245 19 -1154 0 -1207 -1 -1246 -19z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:strokeWidth="1"
-            android:pathData="M1353 1757 c-60 -22 -117 -72 -148 -128 -27 -49 -30 -63 -30 -144 0 -74 4 -98 22
--131 28 -53 74 -99 127 -127 l41 -22 1215 0 1215 0 40 22 c202 109 203 408 1 516
-l-41 22 -1205 2 c-906 1 -1213 -1 -1237 -10z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
 </vector>
-
diff --git a/res/drawable/ic_sysbar_menu_land.xml b/res/drawable/ic_sysbar_menu_land.xml
index 54f3eca..342bf08 100644
--- a/res/drawable/ic_sysbar_menu_land.xml
+++ b/res/drawable/ic_sysbar_menu_land.xml
@@ -1,45 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="512.000000"
-    android:viewportHeight="512.000000">
-
-    <group
-            android:translateY="512.000000"
-            android:scaleX="0.100000"
-            android:scaleY="-0.100000">
-        <path
-            android:fillColor="@color/icon_color_menu"
-            android:strokeWidth="1"
-            android:pathData="M1360 3901 c-147 -45 -231 -209 -186 -363 18 -65 79 -138 140 -171 l41 -22 1195 -3
-c845 -2 1207 0 1235 8 62 17 126 70 160 131 27 49 30 63 30 144 0 74 -4 98 -22 131
--28 53 -74 99 -127 127 l-41 22 -1200 2 c-660 1 -1211 -2 -1225 -6z" />
-        <path
-            android:fillColor="@color/icon_color_menu"
-            android:strokeWidth="1"
-            android:pathData="M1324 2821 c-54 -25 -111 -83 -138 -140 -29 -65 -29 -189 2 -247 33 -64 70 -102
-126 -132 l51 -27 1184 -3 c1353 -3 1256 -9 1346 81 143 144 102 385 -80 468 -38 18
--100 19 -1245 19 -1154 0 -1207 -1 -1246 -19z" />
-        <path
-            android:fillColor="@color/icon_color_menu"
-            android:strokeWidth="1"
-            android:pathData="M1353 1757 c-60 -22 -117 -72 -148 -128 -27 -49 -30 -63 -30 -144 0 -74 4 -98 22
--131 28 -53 74 -99 127 -127 l41 -22 1215 0 1215 0 40 22 c202 109 203 408 1 516
-l-41 22 -1205 2 c-906 1 -1213 -1 -1237 -10z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_menu" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_menu_land_dark.xml b/res/drawable/ic_sysbar_menu_land_dark.xml
index c2a035a..2c8f87f 100644
--- a/res/drawable/ic_sysbar_menu_land_dark.xml
+++ b/res/drawable/ic_sysbar_menu_land_dark.xml
@@ -1,45 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="512.000000"
-    android:viewportHeight="512.000000">
-
-    <group
-            android:translateY="512.000000"
-            android:scaleX="0.100000"
-            android:scaleY="-0.100000">
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:strokeWidth="1"
-            android:pathData="M1360 3901 c-147 -45 -231 -209 -186 -363 18 -65 79 -138 140 -171 l41 -22 1195 -3
-c845 -2 1207 0 1235 8 62 17 126 70 160 131 27 49 30 63 30 144 0 74 -4 98 -22 131
--28 53 -74 99 -127 127 l-41 22 -1200 2 c-660 1 -1211 -2 -1225 -6z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:strokeWidth="1"
-            android:pathData="M1324 2821 c-54 -25 -111 -83 -138 -140 -29 -65 -29 -189 2 -247 33 -64 70 -102
-126 -132 l51 -27 1184 -3 c1353 -3 1256 -9 1346 81 143 144 102 385 -80 468 -38 18
--100 19 -1245 19 -1154 0 -1207 -1 -1246 -19z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:strokeWidth="1"
-            android:pathData="M1353 1757 c-60 -22 -117 -72 -148 -128 -27 -49 -30 -63 -30 -144 0 -74 4 -98 22
--131 28 -53 74 -99 127 -127 l41 -22 1215 0 1215 0 40 22 c202 109 203 408 1 516
-l-41 22 -1205 2 c-906 1 -1213 -1 -1237 -10z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_no_action.xml b/res/drawable/ic_sysbar_no_action.xml
index 2e30033..704987f 100644
--- a/res/drawable/ic_sysbar_no_action.xml
+++ b/res/drawable/ic_sysbar_no_action.xml
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/block_helper.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_no_action"
-        android:pathData="M48,20c-15.5,0-28,12.5-28,28c0,15.5,12.5,28,28,28s28-12.5,28-28C76,32.5,63.5,20,48,20z
-M44,30
-c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v20c0,1.1-0.9,2-2,2h-4c-1.1,0-2-0.9-2-2V30z
-M48,68c-2.8,0-5-2.2-5-5s2.2-5,5-5s5,2.2,5,5 S50.8,68,48,68z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_no_action" android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_no_action_dark.xml b/res/drawable/ic_sysbar_no_action_dark.xml
index ecaa748..f925b28 100644
--- a/res/drawable/ic_sysbar_no_action_dark.xml
+++ b/res/drawable/ic_sysbar_no_action_dark.xml
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/block_helper.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M48,20c-15.5,0-28,12.5-28,28c0,15.5,12.5,28,28,28s28-12.5,28-28C76,32.5,63.5,20,48,20z
-M44,30
-c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v20c0,1.1-0.9,2-2,2h-4c-1.1,0-2-0.9-2-2V30z
-M48,68c-2.8,0-5-2.2-5-5s2.2-5,5-5s5,2.2,5,5 S50.8,68,48,68z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_notification_panel.xml b/res/drawable/ic_sysbar_notification_panel.xml
index b0dff62..d445c5f 100644
--- a/res/drawable/ic_sysbar_notification_panel.xml
+++ b/res/drawable/ic_sysbar_notification_panel.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/format_list_bulleted_type.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_notification_panel"
-            android:pathData="M48,80c3.3,0,6-2.7,6-6H42C42,77.3,44.7,80,48,80z" />
-        <path
-            android:fillColor="@color/icon_color_notification_panel"
-            android:pathData="M73.4,66.6L68,61.6V42h-0.1c0.1-0.7,0.1-1.3,0.1-2c0-9-5.9-16.6-14.1-19.1c-0.5-2.8-3-4.9-5.9-4.9
-s-5.4,2.1-5.9,4.9C33.9,23.4,28,31,28,40c0,0.7,0,1.3,0.1,2H28v19.6l-5.4,4.9c-0.8,0.8-0.8,2,0,2.8C23,69.8,23.5,70,24,70h4h40h4
-c0.5,0,1-0.2,1.4-0.6C74.2,68.6,74.2,67.4,73.4,66.6z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_notification_panel" android:pathData="M5,9.5L7.5,14H2.5L5,9.5M3,4H7V8H3V4M5,20A2,2 0 0,0 7,18A2,2 0 0,0 5,16A2,2 0 0,0 3,18A2,2 0 0,0 5,20M9,5V7H21V5H9M9,19H21V17H9V19M9,13H21V11H9V13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_notification_panel_dark.xml b/res/drawable/ic_sysbar_notification_panel_dark.xml
index e0ef837..b64e73e 100644
--- a/res/drawable/ic_sysbar_notification_panel_dark.xml
+++ b/res/drawable/ic_sysbar_notification_panel_dark.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/format_list_bulleted_type.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_notification_panel"
-            android:pathData="M48,80c3.3,0,6-2.7,6-6H42C42,77.3,44.7,80,48,80z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M73.4,66.6L68,61.6V42h-0.1c0.1-0.7,0.1-1.3,0.1-2c0-9-5.9-16.6-14.1-19.1c-0.5-2.8-3-4.9-5.9-4.9
-s-5.4,2.1-5.9,4.9C33.9,23.4,28,31,28,40c0,0.7,0,1.3,0.1,2H28v19.6l-5.4,4.9c-0.8,0.8-0.8,2,0,2.8C23,69.8,23.5,70,24,70h4h40h4
-c0.5,0,1-0.2,1.4-0.6C74.2,68.6,74.2,67.4,73.4,66.6z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M5,9.5L7.5,14H2.5L5,9.5M3,4H7V8H3V4M5,20A2,2 0 0,0 7,18A2,2 0 0,0 5,16A2,2 0 0,0 3,18A2,2 0 0,0 5,20M9,5V7H21V5H9M9,19H21V17H9V19M9,13H21V11H9V13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_one_handed_mode_left.xml b/res/drawable/ic_sysbar_one_handed_mode_left.xml
index 3faf6ce..322cbfa 100644
--- a/res/drawable/ic_sysbar_one_handed_mode_left.xml
+++ b/res/drawable/ic_sysbar_one_handed_mode_left.xml
@@ -1,33 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns Project
+<!--
+     Copyright (C) 2017 Flash ROM
 
      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
-
+            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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="96.000000"
-    android:viewportHeight="96.000000">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
 
     <group
-        android:translateY="96.000000"
-        android:scaleX="0.100000"
-        android:scaleY="-0.100000">
+        android:translateY="512"
+        android:scaleX="0.1"
+        android:scaleY="-0.1">
+        <path
+            android:fillColor="@color/icon_color_one_handed_mode"
+            android:strokeWidth="1"
+            android:pathData="M3910 4305 c-311 -311 -569 -564 -575 -562 -6 2 -11 159 -13 438 -2 239 -5 440 -7
+447 -4 10 -59 12 -252 10 l-248 -3 -3 -897 -2 -898 895 0 895 0 0 255 0 255 -445 0
+c-322 0 -445 3 -445 11 0 6 227 239 504 518 493 496 607 613 615 633 3 9 -337 358
+-349 358 -3 0 -259 -254 -570 -565z" />
         <path
             android:fillColor="@color/icon_color_one_handed_mode"
             android:strokeWidth="1"
-            android:pathData="M493 618 l-143 -142 -54 53 c-86 85 -90 80 -94 -125 -2 -156 -1 -172 16 -187 17
--15 41 -17 188 -15 204 4 208 8 120 97 l-56 56 145 145 c80 80 145 151 145 159 0
-22 -81 101 -104 101 -12 0 -76 -56 -163 -142z" />
+            android:pathData="M500 2065 l0 -255 445 0 c245 0 445 -4 445 -9 0 -11 6 -5 -602 -618 -285 -287 -518
+-527 -518 -535 0 -7 79 -92 175 -188 l175 -175 569 569 c313 313 573 566 578 563 4
+-3 10 -203 11 -444 2 -241 7 -441 11 -446 4 -4 117 -6 252 -5 l244 3 3 898 2 897
+-895 0 -895 0 0 -255z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_sysbar_one_handed_mode_left_dark.xml b/res/drawable/ic_sysbar_one_handed_mode_left_dark.xml
index 60e5395..de2d964 100644
--- a/res/drawable/ic_sysbar_one_handed_mode_left_dark.xml
+++ b/res/drawable/ic_sysbar_one_handed_mode_left_dark.xml
@@ -1,33 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns Project
-
+<!--
+     Copyright (C) 2017 Flash ROM
      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
-
+            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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="96.000000"
-    android:viewportHeight="96.000000">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
 
     <group
-        android:translateY="96.000000"
-        android:scaleX="0.100000"
-        android:scaleY="-0.100000">
+        android:translateY="512"
+        android:scaleX="0.1"
+        android:scaleY="-0.1">
+        <path
+            android:fillColor="@color/icon_color_dark"
+            android:strokeWidth="1"
+            android:pathData="M3910 4305 c-311 -311 -569 -564 -575 -562 -6 2 -11 159 -13 438 -2 239 -5 440 -7
+447 -4 10 -59 12 -252 10 l-248 -3 -3 -897 -2 -898 895 0 895 0 0 255 0 255 -445 0
+c-322 0 -445 3 -445 11 0 6 227 239 504 518 493 496 607 613 615 633 3 9 -337 358
+-349 358 -3 0 -259 -254 -570 -565z" />
         <path
             android:fillColor="@color/icon_color_dark"
             android:strokeWidth="1"
-            android:pathData="M493 618 l-143 -142 -54 53 c-86 85 -90 80 -94 -125 -2 -156 -1 -172 16 -187 17
--15 41 -17 188 -15 204 4 208 8 120 97 l-56 56 145 145 c80 80 145 151 145 159 0
-22 -81 101 -104 101 -12 0 -76 -56 -163 -142z" />
+            android:pathData="M500 2065 l0 -255 445 0 c245 0 445 -4 445 -9 0 -11 6 -5 -602 -618 -285 -287 -518
+-527 -518 -535 0 -7 79 -92 175 -188 l175 -175 569 569 c313 313 573 566 578 563 4
+-3 10 -203 11 -444 2 -241 7 -441 11 -446 4 -4 117 -6 252 -5 l244 3 3 898 2 897
+-895 0 -895 0 0 -255z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_sysbar_one_handed_mode_right.xml b/res/drawable/ic_sysbar_one_handed_mode_right.xml
index 7f34fee..1c479a5 100644
--- a/res/drawable/ic_sysbar_one_handed_mode_right.xml
+++ b/res/drawable/ic_sysbar_one_handed_mode_right.xml
@@ -1,33 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns Project
+<!--
+     Copyright (C) 2017 Flash ROM
 
      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
-
+            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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="96.000000"
-    android:viewportHeight="96.000000">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
 
     <group
-        android:translateY="96.000000"
-        android:scaleX="0.100000"
-        android:scaleY="-0.100000">
+        android:translateY="512"
+        android:scaleX="0.1"
+        android:scaleY="-0.1">
+        <path
+            android:fillColor="@color/icon_color_one_handed_mode"
+            android:strokeWidth="1"
+            android:pathData="M441 4696 c-95 -95 -172 -178 -170 -184 8 -20 122 -137 615 -633 277 -279 504 -512
+504 -518 0 -8 -123 -11 -445 -11 l-445 0 0 -255 0 -255 895 0 895 0 -2 898 -3 897
+-244 3 c-135 1 -248 -1 -252 -5 -4 -5 -9 -205 -11 -446 -1 -241 -7 -441 -11 -444
+-5 -3 -264 249 -576 561 -311 311 -568 566 -571 566 -3 0 -83 -78 -179 -174z" />
         <path
             android:fillColor="@color/icon_color_one_handed_mode"
             android:strokeWidth="1"
-            android:pathData="M242 717 c-23 -23 -42 -49 -42 -58 0 -8 65 -79 145 -159 l145 -145 -56 -56 c-88
--89 -84 -93 120 -97 147 -2 171 0 188 15 17 15 18 31 16 187 -4 205 -8 210 -94 125
-l-54 -53 -143 142 c-87 86 -151 142 -163 142 -11 0 -39 -19 -62 -43z" />
+            android:pathData="M2812 1423 l3 -898 244 -3 c135 -1 248 1 252 5 4 5 9 205 11 446 1 241 7 441 11
+444 5 3 265 -250 578 -563 l569 -569 175 175 c96 96 175 181 175 188 0 8 -233 248
+-517 535 -609 613 -603 607 -603 618 0 5 200 9 445 9 l445 0 0 255 0 255 -895 0
+-895 0 2 -897z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_sysbar_one_handed_mode_right_dark.xml b/res/drawable/ic_sysbar_one_handed_mode_right_dark.xml
index 4168eb2..c7c8a37 100644
--- a/res/drawable/ic_sysbar_one_handed_mode_right_dark.xml
+++ b/res/drawable/ic_sysbar_one_handed_mode_right_dark.xml
@@ -1,33 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns Project
-
+<!--
+     Copyright (C) 2017 Flash ROM
      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
-
+            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="30.0dp"
-    android:height="30.0dp"
-    android:viewportWidth="96.000000"
-    android:viewportHeight="96.000000">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
 
     <group
-        android:translateY="96.000000"
-        android:scaleX="0.100000"
-        android:scaleY="-0.100000">
+        android:translateY="512"
+        android:scaleX="0.1"
+        android:scaleY="-0.1">
+        <path
+            android:fillColor="@color/icon_color_dark"
+            android:strokeWidth="1"
+            android:pathData="M441 4696 c-95 -95 -172 -178 -170 -184 8 -20 122 -137 615 -633 277 -279 504 -512
+504 -518 0 -8 -123 -11 -445 -11 l-445 0 0 -255 0 -255 895 0 895 0 -2 898 -3 897
+-244 3 c-135 1 -248 -1 -252 -5 -4 -5 -9 -205 -11 -446 -1 -241 -7 -441 -11 -444
+-5 -3 -264 249 -576 561 -311 311 -568 566 -571 566 -3 0 -83 -78 -179 -174z" />
         <path
             android:fillColor="@color/icon_color_dark"
             android:strokeWidth="1"
-            android:pathData="M242 717 c-23 -23 -42 -49 -42 -58 0 -8 65 -79 145 -159 l145 -145 -56 -56 c-88
--89 -84 -93 120 -97 147 -2 171 0 188 15 17 15 18 31 16 187 -4 205 -8 210 -94 125
-l-54 -53 -143 142 c-87 86 -151 142 -163 142 -11 0 -39 -19 -62 -43z" />
+            android:pathData="M2812 1423 l3 -898 244 -3 c135 -1 248 1 252 5 4 5 9 205 11 446 1 241 7 441 11
+444 5 3 265 -250 578 -563 l569 -569 175 175 c96 96 175 181 175 188 0 8 -233 248
+-517 535 -609 613 -603 607 -603 618 0 5 200 9 445 9 l445 0 0 255 0 255 -895 0
+-895 0 2 -897z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_sysbar_power_menu.xml b/res/drawable/ic_sysbar_power_menu.xml
index 669cf6e..ceb0ca5 100644
--- a/res/drawable/ic_sysbar_power_menu.xml
+++ b/res/drawable/ic_sysbar_power_menu.xml
@@ -1,32 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/power.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_power_menu"
-        android:pathData="M76.8,47.2c0-12-7.3-22.2-17.7-26.6c0,0-1.5-0.6-3.3-0.6c-1.8,0-3.3,1.5-3.3,3.3V25v22.2c0,2.4-2,4.4-4.4,4.4
-s-4.4-2-4.4-4.4V25v-1.7c0-1.8-1.5-3.3-3.3-3.3c-1.8,0-3.3,0.6-3.3,0.6c-10.4,4.3-17.7,14.6-17.7,26.6c0,3.1,0.5,6.1,1.4,8.9h0
-c0,0.2,0.1,0.3,0.2,0.5c0.2,0.5,0.4,1,0.6,1.5c0.1,0.3,0.2,0.5,0.3,0.8c0.2,0.4,0.4,0.8,0.6,1.2c0.1,0.3,0.3,0.6,0.5,0.9
-c0.2,0.3,0.4,0.7,0.6,1c0.2,0.3,0.4,0.7,0.6,1c0.2,0.3,0.3,0.5,0.5,0.8c0.2,0.4,0.5,0.7,0.8,1c0.2,0.2,0.3,0.4,0.5,0.6
-c0.3,0.4,0.6,0.7,0.9,1.1c0.1,0.2,0.3,0.3,0.4,0.4c0.4,0.4,0.7,0.8,1.1,1.1c0.1,0.1,0.2,0.2,0.3,0.3c0.4,0.4,0.9,0.8,1.3,1.2
-c0.1,0,0.1,0.1,0.2,0.1c5,4,11.3,6.5,18.2,6.5s13.2-2.4,18.2-6.5c0.1,0,0.1-0.1,0.2-0.1c0.5-0.4,0.9-0.8,1.3-1.2
-c0.1-0.1,0.2-0.2,0.3-0.3c0.4-0.4,0.8-0.7,1.1-1.1c0.1-0.1,0.3-0.3,0.4-0.4c0.3-0.4,0.6-0.7,0.9-1.1c0.2-0.2,0.3-0.4,0.5-0.6
-c0.3-0.3,0.5-0.7,0.8-1c0.2-0.3,0.4-0.5,0.5-0.8c0.2-0.3,0.4-0.6,0.6-1c0.2-0.3,0.4-0.7,0.6-1c0.2-0.3,0.3-0.6,0.5-0.9
-c0.2-0.4,0.4-0.8,0.6-1.2c0.1-0.3,0.2-0.5,0.3-0.8c0.2-0.5,0.4-1,0.6-1.5c0.1-0.2,0.1-0.3,0.2-0.5h0C76.3,53.2,76.8,50.3,76.8,47.2z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_power_menu" android:pathData="M16.56,5.44L15.11,6.89C16.84,7.94 18,9.83 18,12A6,6 0 0,1 12,18A6,6 0 0,1 6,12C6,9.83 7.16,7.94 8.88,6.88L7.44,5.44C5.36,6.88 4,9.28 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12C20,9.28 18.64,6.88 16.56,5.44M13,3H11V13H13" />
 </vector>
diff --git a/res/drawable/ic_sysbar_power_menu_dark.xml b/res/drawable/ic_sysbar_power_menu_dark.xml
index bc47b8b..50c5be9 100644
--- a/res/drawable/ic_sysbar_power_menu_dark.xml
+++ b/res/drawable/ic_sysbar_power_menu_dark.xml
@@ -1,32 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/power.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M76.8,47.2c0-12-7.3-22.2-17.7-26.6c0,0-1.5-0.6-3.3-0.6c-1.8,0-3.3,1.5-3.3,3.3V25v22.2c0,2.4-2,4.4-4.4,4.4
-s-4.4-2-4.4-4.4V25v-1.7c0-1.8-1.5-3.3-3.3-3.3c-1.8,0-3.3,0.6-3.3,0.6c-10.4,4.3-17.7,14.6-17.7,26.6c0,3.1,0.5,6.1,1.4,8.9h0
-c0,0.2,0.1,0.3,0.2,0.5c0.2,0.5,0.4,1,0.6,1.5c0.1,0.3,0.2,0.5,0.3,0.8c0.2,0.4,0.4,0.8,0.6,1.2c0.1,0.3,0.3,0.6,0.5,0.9
-c0.2,0.3,0.4,0.7,0.6,1c0.2,0.3,0.4,0.7,0.6,1c0.2,0.3,0.3,0.5,0.5,0.8c0.2,0.4,0.5,0.7,0.8,1c0.2,0.2,0.3,0.4,0.5,0.6
-c0.3,0.4,0.6,0.7,0.9,1.1c0.1,0.2,0.3,0.3,0.4,0.4c0.4,0.4,0.7,0.8,1.1,1.1c0.1,0.1,0.2,0.2,0.3,0.3c0.4,0.4,0.9,0.8,1.3,1.2
-c0.1,0,0.1,0.1,0.2,0.1c5,4,11.3,6.5,18.2,6.5s13.2-2.4,18.2-6.5c0.1,0,0.1-0.1,0.2-0.1c0.5-0.4,0.9-0.8,1.3-1.2
-c0.1-0.1,0.2-0.2,0.3-0.3c0.4-0.4,0.8-0.7,1.1-1.1c0.1-0.1,0.3-0.3,0.4-0.4c0.3-0.4,0.6-0.7,0.9-1.1c0.2-0.2,0.3-0.4,0.5-0.6
-c0.3-0.3,0.5-0.7,0.8-1c0.2-0.3,0.4-0.5,0.5-0.8c0.2-0.3,0.4-0.6,0.6-1c0.2-0.3,0.4-0.7,0.6-1c0.2-0.3,0.3-0.6,0.5-0.9
-c0.2-0.4,0.4-0.8,0.6-1.2c0.1-0.3,0.2-0.5,0.3-0.8c0.2-0.5,0.4-1,0.6-1.5c0.1-0.2,0.1-0.3,0.2-0.5h0C76.3,53.2,76.8,50.3,76.8,47.2z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M16.56,5.44L15.11,6.89C16.84,7.94 18,9.83 18,12A6,6 0 0,1 12,18A6,6 0 0,1 6,12C6,9.83 7.16,7.94 8.88,6.88L7.44,5.44C5.36,6.88 4,9.28 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12C20,9.28 18.64,6.88 16.56,5.44M13,3H11V13H13" />
 </vector>
diff --git a/res/drawable/ic_sysbar_recent.xml b/res/drawable/ic_sysbar_recent.xml
index 78338e3..626b2d7 100644
--- a/res/drawable/ic_sysbar_recent.xml
+++ b/res/drawable/ic_sysbar_recent.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
 
     <path
         android:fillColor="@color/icon_color_overview"
-        android:pathData="M70,76H26c-3.3,0-6-2.7-6-6V26c0-3.3,2.7-6,6-6h44c3.3,0,6,2.7,6,6v44C76,73.3,73.3,76,70,76z" />
+        android:pathData="M14.01,19.99C13.73,16.72 16.63,13.75 19.92,14.03C35.29,13.94 50.66,14.06 66.03,13.97C68.2,14.01 70.73,13.86 72.33,15.61C74.13,17.21 74.01,19.77 74.06,21.97C74.03,36.98 74.05,52 74.06,67.02C73.99,68.58 73.87,70.18 73.32,71.65C71.62,73.28 69.39,74.21 67.01,74.02C51.66,73.99 36.3,73.99 20.95,74.02C18.54,74.22 16.33,73.23 14.61,71.59C13.88,69.13 13.9,66.54 13.93,64.01C14.03,49.34 13.86,34.66 14.01,19.99Z"/>
 </vector>
diff --git a/res/drawable/ic_sysbar_recent_dark.xml b/res/drawable/ic_sysbar_recent_dark.xml
index 46f83c4..abcc52d 100644
--- a/res/drawable/ic_sysbar_recent_dark.xml
+++ b/res/drawable/ic_sysbar_recent_dark.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns Project
+<!--
+    Copyright (c) 2016 AICP
 
-     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
+    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
+        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.
+    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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
 
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M70,76H26c-3.3,0-6-2.7-6-6V26c0-3.3,2.7-6,6-6h44c3.3,0,6,2.7,6,6v44C76,73.3,73.3,76,70,76z" />
+        android:pathData="M14.01,19.99C13.73,16.72 16.63,13.75 19.92,14.03C35.29,13.94 50.66,14.06 66.03,13.97C68.2,14.01 70.73,13.86 72.33,15.61C74.13,17.21 74.01,19.77 74.06,21.97C74.03,36.98 74.05,52 74.06,67.02C73.99,68.58 73.87,70.18 73.32,71.65C71.62,73.28 69.39,74.21 67.01,74.02C51.66,73.99 36.3,73.99 20.95,74.02C18.54,74.22 16.33,73.23 14.61,71.59C13.88,69.13 13.9,66.54 13.93,64.01C14.03,49.34 13.86,34.66 14.01,19.99Z"/>
 </vector>
diff --git a/res/drawable/ic_sysbar_recent_land.xml b/res/drawable/ic_sysbar_recent_land.xml
index 78338e3..626b2d7 100644
--- a/res/drawable/ic_sysbar_recent_land.xml
+++ b/res/drawable/ic_sysbar_recent_land.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
 
     <path
         android:fillColor="@color/icon_color_overview"
-        android:pathData="M70,76H26c-3.3,0-6-2.7-6-6V26c0-3.3,2.7-6,6-6h44c3.3,0,6,2.7,6,6v44C76,73.3,73.3,76,70,76z" />
+        android:pathData="M14.01,19.99C13.73,16.72 16.63,13.75 19.92,14.03C35.29,13.94 50.66,14.06 66.03,13.97C68.2,14.01 70.73,13.86 72.33,15.61C74.13,17.21 74.01,19.77 74.06,21.97C74.03,36.98 74.05,52 74.06,67.02C73.99,68.58 73.87,70.18 73.32,71.65C71.62,73.28 69.39,74.21 67.01,74.02C51.66,73.99 36.3,73.99 20.95,74.02C18.54,74.22 16.33,73.23 14.61,71.59C13.88,69.13 13.9,66.54 13.93,64.01C14.03,49.34 13.86,34.66 14.01,19.99Z"/>
 </vector>
diff --git a/res/drawable/ic_sysbar_recent_land_dark.xml b/res/drawable/ic_sysbar_recent_land_dark.xml
index 46f83c4..abcc52d 100644
--- a/res/drawable/ic_sysbar_recent_land_dark.xml
+++ b/res/drawable/ic_sysbar_recent_land_dark.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns Project
+<!--
+    Copyright (c) 2016 AICP
 
-     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
+    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
+        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.
+    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="28.0dp"
-        android:height="28.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="88"
+    android:viewportHeight="88">
 
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M70,76H26c-3.3,0-6-2.7-6-6V26c0-3.3,2.7-6,6-6h44c3.3,0,6,2.7,6,6v44C76,73.3,73.3,76,70,76z" />
+        android:pathData="M14.01,19.99C13.73,16.72 16.63,13.75 19.92,14.03C35.29,13.94 50.66,14.06 66.03,13.97C68.2,14.01 70.73,13.86 72.33,15.61C74.13,17.21 74.01,19.77 74.06,21.97C74.03,36.98 74.05,52 74.06,67.02C73.99,68.58 73.87,70.18 73.32,71.65C71.62,73.28 69.39,74.21 67.01,74.02C51.66,73.99 36.3,73.99 20.95,74.02C18.54,74.22 16.33,73.23 14.61,71.59C13.88,69.13 13.9,66.54 13.93,64.01C14.03,49.34 13.86,34.66 14.01,19.99Z"/>
 </vector>
diff --git a/res/drawable/ic_sysbar_record_screen.xml b/res/drawable/ic_sysbar_record_screen.xml
index a1e8131..d26ddd3 100644
--- a/res/drawable/ic_sysbar_record_screen.xml
+++ b/res/drawable/ic_sysbar_record_screen.xml
@@ -1,31 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/file_video.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_screenrecord"
-            android:pathData="M79,30c-0.5,0-1,0.2-1.5,0.4l0,0l-11.6,5.8c-0.1,0-0.2,0.1-0.3,0.2l-0.1,0.1l0,0C64.6,37,64,37.9,64,39v18
-c0,1,0.5,1.9,1.3,2.5l0,0l0,0c0.2,0.2,0.5,0.3,0.7,0.4l11.5,5.8l0,0C78,65.8,78.5,66,79,66c1.7,0,3-1.3,3-3V33
-C82,31.3,80.7,30,79,30z" />
-        <path
-            android:fillColor="@color/icon_color_screenrecord"
-            android:pathData="M52,26H22h-2c-3.3,0-6,2.7-6,6v32c0,3.3,2.7,6,6,6h32c3.3,0,6-2.7,6-6v-2V32C58,28.7,55.3,26,52,26z" />
-    </group>
-</vector>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_screenrecord" android:pathData="M17,10.5V7A1,1 0 0,0 16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5Z" /></vector>
diff --git a/res/drawable/ic_sysbar_record_screen_dark.xml b/res/drawable/ic_sysbar_record_screen_dark.xml
index 62bfcd5..3fc9b1f 100644
--- a/res/drawable/ic_sysbar_record_screen_dark.xml
+++ b/res/drawable/ic_sysbar_record_screen_dark.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/file_video.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M79,30c-0.5,0-1,0.2-1.5,0.4l0,0l-11.6,5.8c-0.1,0-0.2,0.1-0.3,0.2l-0.1,0.1l0,0C64.6,37,64,37.9,64,39v18
-c0,1,0.5,1.9,1.3,2.5l0,0l0,0c0.2,0.2,0.5,0.3,0.7,0.4l11.5,5.8l0,0C78,65.8,78.5,66,79,66c1.7,0,3-1.3,3-3V33
-C82,31.3,80.7,30,79,30z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M52,26H22h-2c-3.3,0-6,2.7-6,6v32c0,3.3,2.7,6,6,6h32c3.3,0,6-2.7,6-6v-2V32C58,28.7,55.3,26,52,26z" />
-    </group>
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M17,10.5V7A1,1 0 0,0 16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_region_screenshot.xml b/res/drawable/ic_sysbar_region_screenshot.xml
index 2be6fd8..57594d0 100644
--- a/res/drawable/ic_sysbar_region_screenshot.xml
+++ b/res/drawable/ic_sysbar_region_screenshot.xml
@@ -1,31 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/image_filter.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_region_screenshot"
-        android:pathData="M82,36H64c-2.2,0-4-1.8-4-4V14c0-2.2,1.8-4,4-4h18c2.2,0,4,1.8,4,4v18C86,34.2,84.2,36,82,36z" />
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
         android:fillColor="@color/icon_color_region_screenshot"
-        android:pathData="M72,42h-2h-2h-8c-3.3,0-6-2.7-6-6v-8v-2v-2c0-2.2-1.8-4-4-4h-2H27c-3.8,0-7,3.2-7,7v42c0,3.8,3.2,7,7,7h42
-c3.8,0,7-3.2,7-7V48v-2C76,43.8,74.2,42,72,42z
-M65,66h-9h-6h-2H31c-1.7,0-3-1.3-3-3c0-0.6,0.2-1.1,0.5-1.6l0,0l0,0
-c0-0.1,0.1-0.1,0.1-0.2l9.9-13.8C39,46.6,39.9,46,41,46c1.1,0,2.1,0.6,2.6,1.5L52,60l4.4-6.6h0c0.5-0.9,1.5-1.5,2.6-1.5
-s2.1,0.6,2.6,1.5h0l5.7,7.6c0.1,0.1,0.1,0.2,0.2,0.3l0,0l0,0c0.3,0.5,0.5,1,0.5,1.6C68,64.7,66.7,66,65,66z" />
+        android:pathData="M1,5H3V19H1V5M5,5H7V19H5V5M22,5H10A1,1 0 0,0 9,6V18A1,1 0 0,0 10,19H22A1,1 0 0,0 23,18V6A1,1 0 0,0 22,5M11,17L13.5,13.85L15.29,16L17.79,12.78L21,17H11Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_region_screenshot_dark.xml b/res/drawable/ic_sysbar_region_screenshot_dark.xml
index 711af9e..bc0d337 100644
--- a/res/drawable/ic_sysbar_region_screenshot_dark.xml
+++ b/res/drawable/ic_sysbar_region_screenshot_dark.xml
@@ -1,31 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/image_filter.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M82,36H64c-2.2,0-4-1.8-4-4V14c0-2.2,1.8-4,4-4h18c2.2,0,4,1.8,4,4v18C86,34.2,84.2,36,82,36z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
         android:fillColor="@color/icon_color_dark"
-        android:pathData="M72,42h-2h-2h-8c-3.3,0-6-2.7-6-6v-8v-2v-2c0-2.2-1.8-4-4-4h-2H27c-3.8,0-7,3.2-7,7v42c0,3.8,3.2,7,7,7h42
-c3.8,0,7-3.2,7-7V48v-2C76,43.8,74.2,42,72,42z
-M65,66h-9h-6h-2H31c-1.7,0-3-1.3-3-3c0-0.6,0.2-1.1,0.5-1.6l0,0l0,0
-c0-0.1,0.1-0.1,0.1-0.2l9.9-13.8C39,46.6,39.9,46,41,46c1.1,0,2.1,0.6,2.6,1.5L52,60l4.4-6.6h0c0.5-0.9,1.5-1.5,2.6-1.5
-s2.1,0.6,2.6,1.5h0l5.7,7.6c0.1,0.1,0.1,0.2,0.2,0.3l0,0l0,0c0.3,0.5,0.5,1,0.5,1.6C68,64.7,66.7,66,65,66z" />
+        android:pathData="M1,5H3V19H1V5M5,5H7V19H5V5M22,5H10A1,1 0 0,0 9,6V18A1,1 0 0,0 10,19H22A1,1 0 0,0 23,18V6A1,1 0 0,0 22,5M11,17L13.5,13.85L15.29,16L17.79,12.78L21,17H11Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_screen_off.xml b/res/drawable/ic_sysbar_screen_off.xml
index b113019..18e4461 100644
--- a/res/drawable/ic_sysbar_screen_off.xml
+++ b/res/drawable/ic_sysbar_screen_off.xml
@@ -1,39 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/sleep.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <group>
-        <path
-            android:fillColor="@color/icon_color_screen_off"
-            android:pathData="M44,14H16c-1.1,0-2,0.9-2,2v6c0,1.1,0.9,2,2,2h17.2L14.7,42.5h0C14.3,42.9,14,43.4,14,44v6c0,1.1,0.9,2,2,2
-h28c1.1,0,2-0.9,2-2v-6c0-1.1-0.9-2-2-2H26.8l18.5-18.5c0.1-0.1,0.2-0.2,0.3-0.3l0,0c0.3-0.3,0.5-0.8,0.5-1.3v-6
-C46,14.9,45.1,14,44,14z" />
-        <path
-            android:fillColor="@color/icon_color_screen_off"
-            android:pathData="M44,60H28c-1.1,0-2,0.9-2,2v2c0,1.1,0.9,2,2,2h9.2L26.6,76.6l0,0C26.2,76.9,26,77.4,26,78v2
-c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2v-2c0-1.1-0.9-2-2-2h-9.2l10.5-10.5c0.1-0.1,0.2-0.2,0.3-0.3l0,0h0c0.3-0.3,0.5-0.8,0.5-1.3v-2
-C46,60.9,45.1,60,44,60z" />
-        <path
-            android:fillColor="@color/icon_color_screen_off"
-            android:pathData="M81.6,41.2L81.6,41.2c0.3-0.3,0.4-0.8,0.4-1.2v-4c0-1.1-0.9-2-2-2H56c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2
-h13.2L54.7,56.5C54.3,56.8,54,57.4,54,58v4c0,1.1,0.9,2,2,2h24c1.1,0,2-0.9,2-2v-4c0-1.1-0.9-2-2-2H66.8l14.4-14.4
-C81.3,41.5,81.5,41.3,81.6,41.2z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_screen_off" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_screen_off_dark.xml b/res/drawable/ic_sysbar_screen_off_dark.xml
index 4649bcd..af98fd0 100644
--- a/res/drawable/ic_sysbar_screen_off_dark.xml
+++ b/res/drawable/ic_sysbar_screen_off_dark.xml
@@ -1,39 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/sleep.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M44,14H16c-1.1,0-2,0.9-2,2v6c0,1.1,0.9,2,2,2h17.2L14.7,42.5h0C14.3,42.9,14,43.4,14,44v6c0,1.1,0.9,2,2,2
-h28c1.1,0,2-0.9,2-2v-6c0-1.1-0.9-2-2-2H26.8l18.5-18.5c0.1-0.1,0.2-0.2,0.3-0.3l0,0c0.3-0.3,0.5-0.8,0.5-1.3v-6
-C46,14.9,45.1,14,44,14z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M44,60H28c-1.1,0-2,0.9-2,2v2c0,1.1,0.9,2,2,2h9.2L26.6,76.6l0,0C26.2,76.9,26,77.4,26,78v2
-c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2v-2c0-1.1-0.9-2-2-2h-9.2l10.5-10.5c0.1-0.1,0.2-0.2,0.3-0.3l0,0h0c0.3-0.3,0.5-0.8,0.5-1.3v-2
-C46,60.9,45.1,60,44,60z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M81.6,41.2L81.6,41.2c0.3-0.3,0.4-0.8,0.4-1.2v-4c0-1.1-0.9-2-2-2H56c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2
-h13.2L54.7,56.5C54.3,56.8,54,57.4,54,58v4c0,1.1,0.9,2,2,2h24c1.1,0,2-0.9,2-2v-4c0-1.1-0.9-2-2-2H66.8l14.4-14.4
-C81.3,41.5,81.5,41.3,81.6,41.2z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_screenshot.xml b/res/drawable/ic_sysbar_screenshot.xml
index 109c007..3426b44 100644
--- a/res/drawable/ic_sysbar_screenshot.xml
+++ b/res/drawable/ic_sysbar_screenshot.xml
@@ -1,28 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_screenshot"
-        android:pathData="M69,20H27c-3.8,0-7,3.2-7,7v42c0,3.8,3.2,7,7,7h42c3.8,0,7-3.2,7-7V27C76,23.2,72.8,20,69,20z
-M65,66h-9h-6
-h-2H31c-1.7,0-3-1.3-3-3c0-0.6,0.2-1.1,0.5-1.6l0,0l0,0c0-0.1,0.1-0.1,0.1-0.2l9.9-13.8C39,46.6,39.9,46,41,46
-c1.1,0,2.1,0.6,2.6,1.5L52,60l4.4-6.6h0c0.5-0.9,1.5-1.5,2.6-1.5s2.1,0.6,2.6,1.5h0l5.7,7.6c0.1,0.1,0.1,0.2,0.2,0.3l0,0l0,0
-c0.3,0.5,0.5,1,0.5,1.6C68,64.7,66.7,66,65,66z" />
-</vector>
+<!-- drawable/image_filter.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_screenshot"
+          android:pathData="M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z" />
+</vector>
diff --git a/res/drawable/ic_sysbar_screenshot_dark.xml b/res/drawable/ic_sysbar_screenshot_dark.xml
index aff4291..dcb00d4 100644
--- a/res/drawable/ic_sysbar_screenshot_dark.xml
+++ b/res/drawable/ic_sysbar_screenshot_dark.xml
@@ -1,28 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/image_filter.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M69,20H27c-3.8,0-7,3.2-7,7v42c0,3.8,3.2,7,7,7h42c3.8,0,7-3.2,7-7V27C76,23.2,72.8,20,69,20z
-M65,66h-9h-6
-h-2H31c-1.7,0-3-1.3-3-3c0-0.6,0.2-1.1,0.5-1.6l0,0l0,0c0-0.1,0.1-0.1,0.1-0.2l9.9-13.8C39,46.6,39.9,46,41,46
-c1.1,0,2.1,0.6,2.6,1.5L52,60l4.4-6.6h0c0.5-0.9,1.5-1.5,2.6-1.5s2.1,0.6,2.6,1.5h0l5.7,7.6c0.1,0.1,0.1,0.2,0.2,0.3l0,0l0,0
-c0.3,0.5,0.5,1,0.5,1.6C68,64.7,66.7,66,65,66z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark"
+          android:pathData="M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_search.xml b/res/drawable/ic_sysbar_search.xml
index 510e2ff..16cc16b 100644
--- a/res/drawable/ic_sysbar_search.xml
+++ b/res/drawable/ic_sysbar_search.xml
@@ -1,30 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/file_find.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_voice_search"
-            android:pathData="M72,32h-4c-1.1,0-2,0.9-2,2v10c0,9.9-8.1,18-18,18s-18-8.1-18-18V34c0-1.1-0.9-2-2-2h-4c-1.1,0-2,0.9-2,2
-v10c0,12.3,8.5,22.6,20,25.3V76c0,1.1,0.9,2,2,2h1h6h1c1.1,0,2-0.9,2-2v-6.7c11.5-2.7,20-13,20-25.3V34C74,32.9,73.1,32,72,32z" />
-        <path
-            android:fillColor="@color/icon_color_voice_search"
-            android:pathData="M48,56c6.6,0,12-5.4,12-12V30c0-6.6-5.4-12-12-12s-12,5.4-12,12v14C36,50.6,41.4,56,48,56z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_voice_search" android:pathData="M9,13A3,3 0 0,0 12,16A3,3 0 0,0 15,13A3,3 0 0,0 12,10A3,3 0 0,0 9,13M20,19.59V8L14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18C18.45,22 18.85,21.85 19.19,21.6L14.76,17.17C13.96,17.69 13,18 12,18A5,5 0 0,1 7,13A5,5 0 0,1 12,8A5,5 0 0,1 17,13C17,14 16.69,14.96 16.17,15.75L20,19.59Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_search_dark.xml b/res/drawable/ic_sysbar_search_dark.xml
index 83005c3..cc7e8c6 100644
--- a/res/drawable/ic_sysbar_search_dark.xml
+++ b/res/drawable/ic_sysbar_search_dark.xml
@@ -1,30 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/file_find.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M72,32h-4c-1.1,0-2,0.9-2,2v10c0,9.9-8.1,18-18,18s-18-8.1-18-18V34c0-1.1-0.9-2-2-2h-4c-1.1,0-2,0.9-2,2
-v10c0,12.3,8.5,22.6,20,25.3V76c0,1.1,0.9,2,2,2h1h6h1c1.1,0,2-0.9,2-2v-6.7c11.5-2.7,20-13,20-25.3V34C74,32.9,73.1,32,72,32z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M48,56c6.6,0,12-5.4,12-12V30c0-6.6-5.4-12-12-12s-12,5.4-12,12v14C36,50.6,41.4,56,48,56z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M9,13A3,3 0 0,0 12,16A3,3 0 0,0 15,13A3,3 0 0,0 12,10A3,3 0 0,0 9,13M20,19.59V8L14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18C18.45,22 18.85,21.85 19.19,21.6L14.76,17.17C13.96,17.69 13,18 12,18A5,5 0 0,1 7,13A5,5 0 0,1 12,8A5,5 0 0,1 17,13C17,14 16.69,14.96 16.17,15.75L20,19.59Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_settings_panel.xml b/res/drawable/ic_sysbar_settings_panel.xml
index 8b5c76f..ea363da 100644
--- a/res/drawable/ic_sysbar_settings_panel.xml
+++ b/res/drawable/ic_sysbar_settings_panel.xml
@@ -1,30 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/settings_box.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_settings_panel"
-        android:pathData="M75.6,55.3L68,50.9h0c-4.9-2.8,0-5.7,0-5.7l7.6-4.4c1.2-0.7,1.6-2.2,0.9-3.4l-5-8.7c-0.7-1.2-2.2-1.6-3.4-0.9
-l-7.9,4.6c-0.4,0.2-4.6,1.9-4.6-2.6h0v-9.3c0-1.4-1.1-2.5-2.5-2.5H43c-1.4,0-2.5,1.1-2.5,2.5v9.3c0,4.6-4.7,2.6-4.7,2.6l-7.9-4.6
-c-1.2-0.7-2.7-0.3-3.4,0.9l-5,8.7c-0.7,1.2-0.3,2.7,0.9,3.4l7.6,4.4h0c0,0,4.9,2.9,0,5.7h0l-7.6,4.4c-1.2,0.7-1.6,2.2-0.9,3.4l5,8.7
-c0.7,1.2,2.2,1.6,3.4,0.9l8.1-4.7c0.9-0.3,4.4-1.4,4.4,2.6h0v9.3c0,1.4,1.1,2.5,2.5,2.5h10c1.4,0,2.5-1.1,2.5-2.5v-9.3h0
-c0-4,3.5-3,4.4-2.6l8.1,4.7c1.2,0.7,2.7,0.3,3.4-0.9l5-8.7C77.2,57.5,76.8,55.9,75.6,55.3z
-M48,54.4c-3.6,0-6.4-2.9-6.4-6.4
-s2.9-6.4,6.4-6.4s6.4,2.9,6.4,6.4S51.6,54.4,48,54.4z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_settings_panel" android:pathData="M17.25,12C17.25,12.23 17.23,12.46 17.2,12.68L18.68,13.84C18.81,13.95 18.85,14.13 18.76,14.29L17.36,16.71C17.27,16.86 17.09,16.92 16.93,16.86L15.19,16.16C14.83,16.44 14.43,16.67 14,16.85L13.75,18.7C13.72,18.87 13.57,19 13.4,19H10.6C10.43,19 10.28,18.87 10.25,18.7L10,16.85C9.56,16.67 9.17,16.44 8.81,16.16L7.07,16.86C6.91,16.92 6.73,16.86 6.64,16.71L5.24,14.29C5.15,14.13 5.19,13.95 5.32,13.84L6.8,12.68C6.77,12.46 6.75,12.23 6.75,12C6.75,11.77 6.77,11.54 6.8,11.32L5.32,10.16C5.19,10.05 5.15,9.86 5.24,9.71L6.64,7.29C6.73,7.13 6.91,7.07 7.07,7.13L8.81,7.84C9.17,7.56 9.56,7.32 10,7.15L10.25,5.29C10.28,5.13 10.43,5 10.6,5H13.4C13.57,5 13.72,5.13 13.75,5.29L14,7.15C14.43,7.32 14.83,7.56 15.19,7.84L16.93,7.13C17.09,7.07 17.27,7.13 17.36,7.29L18.76,9.71C18.85,9.86 18.81,10.05 18.68,10.16L17.2,11.32C17.23,11.54 17.25,11.77 17.25,12M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M12,10C10.89,10 10,10.89 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12C14,10.89 13.1,10 12,10Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_settings_panel_dark.xml b/res/drawable/ic_sysbar_settings_panel_dark.xml
index c43af62..dce4aae 100644
--- a/res/drawable/ic_sysbar_settings_panel_dark.xml
+++ b/res/drawable/ic_sysbar_settings_panel_dark.xml
@@ -1,30 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/settings_box.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M75.6,55.3L68,50.9h0c-4.9-2.8,0-5.7,0-5.7l7.6-4.4c1.2-0.7,1.6-2.2,0.9-3.4l-5-8.7c-0.7-1.2-2.2-1.6-3.4-0.9
-l-7.9,4.6c-0.4,0.2-4.6,1.9-4.6-2.6h0v-9.3c0-1.4-1.1-2.5-2.5-2.5H43c-1.4,0-2.5,1.1-2.5,2.5v9.3c0,4.6-4.7,2.6-4.7,2.6l-7.9-4.6
-c-1.2-0.7-2.7-0.3-3.4,0.9l-5,8.7c-0.7,1.2-0.3,2.7,0.9,3.4l7.6,4.4h0c0,0,4.9,2.9,0,5.7h0l-7.6,4.4c-1.2,0.7-1.6,2.2-0.9,3.4l5,8.7
-c0.7,1.2,2.2,1.6,3.4,0.9l8.1-4.7c0.9-0.3,4.4-1.4,4.4,2.6h0v9.3c0,1.4,1.1,2.5,2.5,2.5h10c1.4,0,2.5-1.1,2.5-2.5v-9.3h0
-c0-4,3.5-3,4.4-2.6l8.1,4.7c1.2,0.7,2.7,0.3,3.4-0.9l5-8.7C77.2,57.5,76.8,55.9,75.6,55.3z
-M48,54.4c-3.6,0-6.4-2.9-6.4-6.4
-s2.9-6.4,6.4-6.4s6.4,2.9,6.4,6.4S51.6,54.4,48,54.4z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M17.25,12C17.25,12.23 17.23,12.46 17.2,12.68L18.68,13.84C18.81,13.95 18.85,14.13 18.76,14.29L17.36,16.71C17.27,16.86 17.09,16.92 16.93,16.86L15.19,16.16C14.83,16.44 14.43,16.67 14,16.85L13.75,18.7C13.72,18.87 13.57,19 13.4,19H10.6C10.43,19 10.28,18.87 10.25,18.7L10,16.85C9.56,16.67 9.17,16.44 8.81,16.16L7.07,16.86C6.91,16.92 6.73,16.86 6.64,16.71L5.24,14.29C5.15,14.13 5.19,13.95 5.32,13.84L6.8,12.68C6.77,12.46 6.75,12.23 6.75,12C6.75,11.77 6.77,11.54 6.8,11.32L5.32,10.16C5.19,10.05 5.15,9.86 5.24,9.71L6.64,7.29C6.73,7.13 6.91,7.07 7.07,7.13L8.81,7.84C9.17,7.56 9.56,7.32 10,7.15L10.25,5.29C10.28,5.13 10.43,5 10.6,5H13.4C13.57,5 13.72,5.13 13.75,5.29L14,7.15C14.43,7.32 14.83,7.56 15.19,7.84L16.93,7.13C17.09,7.07 17.27,7.13 17.36,7.29L18.76,9.71C18.85,9.86 18.81,10.05 18.68,10.16L17.2,11.32C17.23,11.54 17.25,11.77 17.25,12M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M12,10C10.89,10 10,10.89 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12C14,10.89 13.1,10 12,10Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_torch.xml b/res/drawable/ic_sysbar_torch.xml
index 2724e5e..9e26749 100644
--- a/res/drawable/ic_sysbar_torch.xml
+++ b/res/drawable/ic_sysbar_torch.xml
@@ -1,28 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/flashlight.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_flashlight"
-        android:pathData="M65,47.9c0.1-0.1,0.1-0.2,0.2-0.3l0.1-0.1l0,0c0.5-0.8,0.7-1.6,0.7-2.6c0-2.8-2.2-5-5-5h-9l10-14l0,0
-c0.6-0.8,1-1.9,1-3c0-2.8-2.2-5-5-5H39c-2.4,0-4.5,1.7-4.9,4.1l0,0l-4,23.8c0,0.1,0,0.2-0.1,0.4L30,46.6l0,0c0,0.1,0,0.3,0,0.4
-c0,2.8,2.2,5,5,5h13l-9.5,20.1c-0.1,0.2-0.2,0.3-0.2,0.5l0,0.1l0,0C38.1,73.1,38,73.5,38,74c0,2.2,1.8,4,4,4c1.3,0,2.5-0.7,3.2-1.7
-l0,0l0-0.1c0,0,0-0.1,0.1-0.1L65,47.9z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_flashlight" android:pathData="M9,10L6,5H18L15,10H9M18,4H6V2H18V4M9,22V11H15V22H9M12,13A1,1 0 0,0 11,14A1,1 0 0,0 12,15A1,1 0 0,0 13,14A1,1 0 0,0 12,13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_torch_dark.xml b/res/drawable/ic_sysbar_torch_dark.xml
index d8d4e6e..1360a36 100644
--- a/res/drawable/ic_sysbar_torch_dark.xml
+++ b/res/drawable/ic_sysbar_torch_dark.xml
@@ -1,28 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/flashlight.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M65,47.9c0.1-0.1,0.1-0.2,0.2-0.3l0.1-0.1l0,0c0.5-0.8,0.7-1.6,0.7-2.6c0-2.8-2.2-5-5-5h-9l10-14l0,0
-c0.6-0.8,1-1.9,1-3c0-2.8-2.2-5-5-5H39c-2.4,0-4.5,1.7-4.9,4.1l0,0l-4,23.8c0,0.1,0,0.2-0.1,0.4L30,46.6l0,0c0,0.1,0,0.3,0,0.4
-c0,2.8,2.2,5,5,5h13l-9.5,20.1c-0.1,0.2-0.2,0.3-0.2,0.5l0,0.1l0,0C38.1,73.1,38,73.5,38,74c0,2.2,1.8,4,4,4c1.3,0,2.5-0.7,3.2-1.7
-l0,0l0-0.1c0,0,0-0.1,0.1-0.1L65,47.9z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M9,10L6,5H18L15,10H9M18,4H6V2H18V4M9,22V11H15V22H9M12,13A1,1 0 0,0 11,14A1,1 0 0,0 12,15A1,1 0 0,0 13,14A1,1 0 0,0 12,13Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_volume_panel.xml b/res/drawable/ic_sysbar_volume_panel.xml
index 5433b0d..c02ebba 100644
--- a/res/drawable/ic_sysbar_volume_panel.xml
+++ b/res/drawable/ic_sysbar_volume_panel.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/volume_panel.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_volume_panel"
-            android:pathData="M54,22c-0.5,0-1,0.1-1.5,0.3l0,0l0,0c-0.3,0.1-0.5,0.3-0.8,0.4L34.8,32H16c-3.3,0-6,2.7-6,6v2v16v2
-c0,3.3,2.7,6,6,6h18.8l16.9,9.3c0.6,0.4,1.4,0.7,2.3,0.7c2.2,0,4-1.8,4-4V26C58,23.8,56.2,22,54,22z" />
-        <path
-            android:fillColor="@color/icon_color_volume_panel"
-            android:pathData="M86,32c0-2.2-1.8-4-4-4h-8c-2.2,0-4,1.8-4,4v32c0,2.2,1.8,4,4,4c1.8,0,3.3-1.2,3.8-2.9l0,0l0.1-0.3l0,0l0,0
-c0,0,0,0,0,0l8-31.9l0,0C86,32.6,86,32.3,86,32z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_volume_panel" android:pathData="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.84 14,18.7V20.77C18,19.86 21,16.28 21,12C21,7.72 18,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.76 16.5,12M3,9V15H7L12,20V4L7,9H3Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_volume_panel_dark.xml b/res/drawable/ic_sysbar_volume_panel_dark.xml
index f4ae7b2..266ddc1 100644
--- a/res/drawable/ic_sysbar_volume_panel_dark.xml
+++ b/res/drawable/ic_sysbar_volume_panel_dark.xml
@@ -1,31 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/volume_panel.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-    <group>
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M54,22c-0.5,0-1,0.1-1.5,0.3l0,0l0,0c-0.3,0.1-0.5,0.3-0.8,0.4L34.8,32H16c-3.3,0-6,2.7-6,6v2v16v2
-c0,3.3,2.7,6,6,6h18.8l16.9,9.3c0.6,0.4,1.4,0.7,2.3,0.7c2.2,0,4-1.8,4-4V26C58,23.8,56.2,22,54,22z" />
-        <path
-            android:fillColor="@color/icon_color_dark"
-            android:pathData="M86,32c0-2.2-1.8-4-4-4h-8c-2.2,0-4,1.8-4,4v32c0,2.2,1.8,4,4,4c1.8,0,3.3-1.2,3.8-2.9l0,0l0.1-0.3l0,0l0,0
-c0,0,0,0,0,0l8-31.9l0,0C86,32.6,86,32.3,86,32z" />
-    </group>
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.84 14,18.7V20.77C18,19.86 21,16.28 21,12C21,7.72 18,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.76 16.5,12M3,9V15H7L12,20V4L7,9H3Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_wifi.xml b/res/drawable/ic_sysbar_wifi.xml
index 85f0f3a..0d86915 100644
--- a/res/drawable/ic_sysbar_wifi.xml
+++ b/res/drawable/ic_sysbar_wifi.xml
@@ -1,30 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/wifi.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_wifi"
-        android:pathData="M78.2,25.4c0-3-2.4-5.4-5.4-5.4H23.2c-3,0-5.4,2.4-5.4,5.4c0,0.9,0.2,1.6,0.6,2.4l0,0l24,45l0,0
-c0.1,0.1,0.1,0.2,0.2,0.3c1.2,1.8,3.1,2.9,5.4,2.9s4.3-1.2,5.4-2.9c0.1-0.1,0.1-0.2,0.2-0.4l0,0l11.2-21l12.6-23.5l0,0
-c0.2-0.3,0.3-0.5,0.4-0.8l0,0l0,0C78,26.8,78.2,26.1,78.2,25.4z
-M65.9,30.6L65.9,30.6c-0.1,0.2-0.2,0.4-0.3,0.5l-2.8,5.6
-c0,0.1,0,0.1-0.1,0.1l0,0l0,0c-0.3,0.6-1,1.1-1.8,1.1H35c-0.7,0-1.3-0.4-1.7-1l0,0l0-0.1c0-0.1-0.1-0.2-0.1-0.3l-2.8-5.6
-c-0.1-0.2-0.2-0.3-0.3-0.5l0,0l0,0C30,30.4,30,30.2,30,30c0-1.1,0.9-2,2-2h32c1.1,0,2,0.9,2,2C66,30.2,66,30.4,65.9,30.6L65.9,30.6z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_wifi" android:pathData="M12,21L15.6,16.2C14.6,15.45 13.35,15 12,15C10.65,15 9.4,15.45 8.4,16.2L12,21M12,3C7.95,3 4.21,4.34 1.2,6.6L3,9C5.5,7.12 8.62,6 12,6C15.38,6 18.5,7.12 21,9L22.8,6.6C19.79,4.34 16.05,3 12,3M12,9C9.3,9 6.81,9.89 4.8,11.4L6.6,13.8C8.1,12.67 9.97,12 12,12C14.03,12 15.9,12.67 17.4,13.8L19.2,11.4C17.19,9.89 14.7,9 12,9Z" />
 </vector>
diff --git a/res/drawable/ic_sysbar_wifi_dark.xml b/res/drawable/ic_sysbar_wifi_dark.xml
index a4470a9..41e92a0 100644
--- a/res/drawable/ic_sysbar_wifi_dark.xml
+++ b/res/drawable/ic_sysbar_wifi_dark.xml
@@ -1,30 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2017 The Dirty Unicorns 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.
--->
+<!-- drawable/wifi.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30.0dp"
-        android:height="30.0dp"
-        android:viewportWidth="96.0"
-        android:viewportHeight="96.0">
-
-    <path
-        android:fillColor="@color/icon_color_dark"
-        android:pathData="M78.2,25.4c0-3-2.4-5.4-5.4-5.4H23.2c-3,0-5.4,2.4-5.4,5.4c0,0.9,0.2,1.6,0.6,2.4l0,0l24,45l0,0
-c0.1,0.1,0.1,0.2,0.2,0.3c1.2,1.8,3.1,2.9,5.4,2.9s4.3-1.2,5.4-2.9c0.1-0.1,0.1-0.2,0.2-0.4l0,0l11.2-21l12.6-23.5l0,0
-c0.2-0.3,0.3-0.5,0.4-0.8l0,0l0,0C78,26.8,78.2,26.1,78.2,25.4z
-M65.9,30.6L65.9,30.6c-0.1,0.2-0.2,0.4-0.3,0.5l-2.8,5.6
-c0,0.1,0,0.1-0.1,0.1l0,0l0,0c-0.3,0.6-1,1.1-1.8,1.1H35c-0.7,0-1.3-0.4-1.7-1l0,0l0-0.1c0-0.1-0.1-0.2-0.1-0.3l-2.8-5.6
-c-0.1-0.2-0.2-0.3-0.3-0.5l0,0l0,0C30,30.4,30,30.2,30,30c0-1.1,0.9-2,2-2h32c1.1,0,2,0.9,2,2C66,30.2,66,30.4,65.9,30.6L65.9,30.6z" />
+    android:height="22dp"
+    android:width="22dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color_dark" android:pathData="M12,21L15.6,16.2C14.6,15.45 13.35,15 12,15C10.65,15 9.4,15.45 8.4,16.2L12,21M12,3C7.95,3 4.21,4.34 1.2,6.6L3,9C5.5,7.12 8.62,6 12,6C15.38,6 18.5,7.12 21,9L22.8,6.6C19.79,4.34 16.05,3 12,3M12,9C9.3,9 6.81,9.89 4.8,11.4L6.6,13.8C8.1,12.67 9.97,12 12,12C14.03,12 15.9,12.67 17.4,13.8L19.2,11.4C17.19,9.89 14.7,9 12,9Z" />
 </vector>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e483912..70503e6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -30,7 +30,7 @@
 
     <!-- SmartBar icon colors -->
     <color name="icon_color_default">#fff</color>
-    <color name="icon_color_dark">@android:color/black</color>
+    <color name="icon_color_dark">#585858</color>
     <color name="icon_color_no_action">@color/icon_color_default</color>
     <color name="icon_color_settings_panel">@color/icon_color_default</color>
     <color name="icon_color_notification_panel">@color/icon_color_default</color>
author	westcripp <korukaltan@gmail.com>	2018-06-19 19:12:50 +0000
committer	doc HD <doc.divxm@gmail.com>	2018-06-22 10:23:46 +0300
commit	ca0bc0ae505db0576d208ab5652129e3e236e888 (patch)
tree	538864ed18fad58fdf99bbb90c0d64021b821e96
parent	aa5a264ed0594ba7b2f4537c58f3b45cbe57e29b (diff)