From b8dfd9452d4b909309e70d202449764327ad9351 Mon Sep 17 00:00:00 2001
From: "Niklas Schnettler (Sh4dowSoul)" <niklas.schnettler@gmail.com>
Date: Sat, 20 Apr 2019 23:12:59 +0200
Subject: [PATCH] Nova Launcher: Update 6.1.6 & Merge Themes

---
 .../res/values/colors_dark.xml                |  7 -------
 .../drawable-anydpi/ic_droptarget_edit.xml    | 11 ++++++----
 .../ic_droptarget_trashcan.xml                |  5 +++--
 .../drawable-night/list_divider_material.xml  |  2 +-
 .../res/drawable/ic_gesture_clockwise.xml     |  5 +++--
 .../drawable/ic_gesture_counterclockwise.xml  |  5 +++--
 .../res/drawable/ic_gesture_doubletap.xml     |  5 +++--
 .../ic_gesture_doubletap_swipe_down.xml       |  5 +++--
 .../ic_gesture_doubletap_swipe_up.xml         |  5 +++--
 .../res/drawable/ic_gesture_down.xml          |  5 +++--
 .../res/drawable/ic_gesture_home.xml          |  9 ++++----
 .../res/drawable/ic_gesture_pinchin.xml       |  5 +++--
 .../res/drawable/ic_gesture_pinchout.xml      |  5 +++--
 .../res/drawable/ic_gesture_twodown.xml       |  5 +++--
 .../res/drawable/ic_gesture_twoup.xml         |  5 +++--
 .../res/drawable/ic_gesture_up.xml            |  5 +++--
 .../res/drawable/ic_gesture_voice.xml         |  5 +++--
 .../ic_materialicon_settings_24dp.xml         | 14 ++++++++++---
 .../res/drawable/ic_night_on.xml              |  5 +++--
 .../res/drawable/ic_pref_add.xml              |  5 +++--
 .../res/drawable/ic_pref_badges.xml           |  5 +++--
 .../res/drawable/ic_pref_bug_report.xml       |  5 +++--
 .../res/drawable/ic_pref_discord.xml          | 21 +++++++++++++++++++
 .../res/drawable/ic_pref_drawer.xml           |  5 +++--
 .../res/drawable/ic_pref_faq.xml              |  5 +++--
 .../res/drawable/ic_pref_folder.xml           |  5 +++--
 .../res/drawable/ic_pref_googleplus.xml       | 12 -----------
 .../res/drawable/ic_pref_importsave.xml       |  5 +++--
 .../res/drawable/ic_pref_indicator.xml        |  5 +++--
 .../res/drawable/ic_pref_info.xml             |  5 +++--
 .../res/drawable/ic_pref_integrations.xml     |  5 +++--
 .../res/drawable/ic_pref_labs.xml             |  5 +++--
 .../res/drawable/ic_pref_nova.xml             |  5 +++--
 .../res/drawable/ic_pref_palette.xml          |  5 +++--
 .../res/drawable/ic_pref_screens.xml          |  5 +++--
 .../res/drawable/ic_pref_star.xml             |  5 +++--
 .../res/drawable/ic_pref_tab.xml              |  5 +++--
 .../res/drawable/ic_pref_twitter.xml          |  5 +++--
 .../res/drawable/ic_qm_edit.xml               | 11 ++++++----
 .../res/drawable/ic_qm_uninstall.xml          |  5 +++--
 .../res/drawable/ic_setting.xml               | 14 ++++++++++---
 .../res/values-night/colors.xml}              | 10 +++++++--
 .../res/values-night/colors_main.xml          |  5 -----
 .../res/values-v25/styles.xml}                |  0
 .../values/{colors_main.xml => colors.xml}    |  4 ++--
 45 files changed, 169 insertions(+), 111 deletions(-)
 delete mode 100644 app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values/colors_dark.xml
 rename app/src/{dark => main}/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml (73%)
 create mode 100644 app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_discord.xml
 delete mode 100644 app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_googleplus.xml
 rename app/src/{dark/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_dark.xml => main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors.xml} (57%)
 delete mode 100644 app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_main.xml
 rename app/src/{dark/assets/overlays/com.teslacoilsw.launcher/res/values-v25/styles_dark.xml => main/assets/overlays/com.teslacoilsw.launcher/res/values-v25/styles.xml} (100%)
 rename app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/{colors_main.xml => colors.xml} (79%)

diff --git a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values/colors_dark.xml b/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values/colors_dark.xml
deleted file mode 100644
index d05b504ea..000000000
--- a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values/colors_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Background -->
-    <color name="background_material_dark">@*android:color/background_material_dark</color>
-    <color name="bg_dialog_dark">@*android:color/background_floating_material_dark</color>
-    <color name="material_grey_800">@*android:color/background_floating_material_dark</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_edit.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_edit.xml
index ef0836bea..61a0df669 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_edit.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_edit.xml
@@ -8,8 +8,11 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M18.207 4.207c-.187-.187-.442-.293-.707-.293-.265 0-.52.106-.707.293C13.95
-  7.051 3.504 17.5 3.504 17.5l-.004 3 3.026-.003s10.43-10.447
-  13.268-13.29c.39-.391.39-1.023-.001-1.414l-1.586-1.586zM14.963
-  6.038l3.001 3.002" />
+        android:pathData="M3.75 20.25v-3.194S13.817 7.014 16.959
+3.881c.245-.245.577-.381.922-.38.346.001.677.14.92.386.419.423.913.923
+1.33 1.345.502.509.5 1.327-.006 1.833C17.002
+10.189 6.942 20.25 6.942 20.25H3.75zM14.66
+6.173l3.21 3.148M15.66 5.173l3.21 3.148M16.66
+4.173l3.21 3.148M17.66 4.173l2.21
+2.148" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_trashcan.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_trashcan.xml
index 75d510133..227b838cb 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_trashcan.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-anydpi/ic_droptarget_trashcan.xml
@@ -8,6 +8,7 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M17.5 6h-11v13c0 .828.672 1.5 1.5 1.5h8c.828 0 1.5-.672 1.5-1.5V6z
-  M16 6l-2-2.5-4 .029L8 6m11.6 0H16M8 6H4.4" />
+        android:pathData="M6 5v13.922c0 .352.14.69.389.939s.587.389.939.389H16.7c.718
+0 1.3-.582 1.3-1.3V5M19.25 5H4.75M14.25 3.75h-4.5M10
+ 8.75v7.5M14 8.75v7.5" />
 </vector>
\ No newline at end of file
diff --git a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml
similarity index 73%
rename from app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml
rename to app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml
index 50cc5b03b..b835d8dce 100644
--- a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable-night/list_divider_material.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@*android:color/background_dark" />
+    <solid android:color="#0dFFFFFF" />
     <size android:height="1.0dip" android:width="1.0dip" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_clockwise.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_clockwise.xml
index 9d39a891b..733cadcdd 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_clockwise.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_clockwise.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_counterclockwise.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_counterclockwise.xml
index e27f99963..51510e279 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_counterclockwise.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_counterclockwise.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap.xml
index 4a1c9ea11..df2437a9b 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_down.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_down.xml
index 4a1c9ea11..df2437a9b 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_down.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_down.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_up.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_up.xml
index 4a1c9ea11..df2437a9b 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_up.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_doubletap_swipe_up.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_down.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_down.xml
index d6ed011d6..1904c4489 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_down.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_down.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_home.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_home.xml
index 0ca07e877..ca592d64b 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_home.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_home.xml
@@ -8,8 +8,9 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M4.524 11.786s-.008 6.648-.01 8.651c-.001.149.059.292.164.398.106.105.249.165.398.165h13.81c.159
-  0 .311-.064.424-.176.112-.112.174-.265.174-.423v-8.615l2.538.001s-6.837-6.285-9.217-8.473c-.456-.419-1.156-.419-1.611
-  0-2.378 2.189-9.199 8.472-9.199 8.472h2.529zM9.696
-  21v-6.335h4.606V21" />
+        android:pathData="M19.25 9.947c0-.409-.192-.794-.519-1.039C17.071 7.66 12 3.848 12 3.848S6.929
+7.66 5.269 8.908c-.327.245-.519.63-.519 1.039v8.905c0
+ .345.137.676.381.919.244.244.574.381.919.381h11.9c.345 0
+ .675-.137.919-.381.244-.243.381-.574.381-.919V9.947z
+M14.25 19.898v-6.245h-4.5v6.245" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchin.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchin.xml
index adcda6f8f..f91eb8d79 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchin.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchin.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchout.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchout.xml
index 7335124b6..e5ffe44f5 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchout.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_pinchout.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twodown.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twodown.xml
index 2ba6f7df5..841771418 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twodown.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twodown.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twoup.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twoup.xml
index ef7b13c0c..b362cc1e3 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twoup.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_twoup.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_up.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_up.xml
index a325adedf..beea8d8b5 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_up.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_up.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_voice.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_voice.xml
index fe57d7900..eed5e7c32 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_voice.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_gesture_voice.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_materialicon_settings_24dp.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_materialicon_settings_24dp.xml
index 8582844e9..f22dc7f11 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_materialicon_settings_24dp.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_materialicon_settings_24dp.xml
@@ -8,7 +8,15 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M2 6.977h10.5m6 0H22m-20 10h3.5m6 0H22M15.5 4c1.657 0 3 1.343 3
-  3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3zm-7 10c1.657 0 3 1.343 3 3s-1.343
-  3-3 3-3-1.343-3-3 1.343-3 3-3z" />
+        android:pathData="M9.953 5.64l.547-2.89 3.068.02.484 2.871c.911.294 1.737.779
+ 2.431 1.407l-.005-.007.012-.007 2.72-1.007 1.551 2.646-2.23
+1.894-.008-.012c.103.466.158.949.158 1.445 0 .48-.051.949-.147
+1.4v-.001l.012.007 2.232 1.851-1.517
+2.666-2.755-.983.011-.02c-.7.643-1.536 1.139-2.461 1.438v.014l-.488
+2.858-3.068.02-.525-2.878h.015c-.93-.294-1.773-.785-2.478-1.425l.004.007-2.777.969-1.517-2.666
+2.244-1.855.001.001c-.096-.452-.148-.922-.148-1.403
+0-.483.052-.954.149-1.407h-.001l-2.228-1.92L4.79 6.027l2.729
+1.016-.004.007c.696-.63 1.523-1.116 2.438-1.41zm.594 4.907c.801-.803
+2.105-.803 2.906 0 .803.801.803 2.105 0 2.906-.801.803-2.105.803-2.906
+0-.803-.801-.803-2.105 0-2.906z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_night_on.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_night_on.xml
index 448b0561a..0085c3d0f 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_night_on.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_night_on.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_add.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_add.xml
index 1156b2446..2cb439b45 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_add.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_add.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_badges.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_badges.xml
index cc9cadec1..5a2a11c61 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_badges.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_badges.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_bug_report.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_bug_report.xml
index 9ead0a213..f882665d6 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_bug_report.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_bug_report.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_discord.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_discord.xml
new file mode 100644
index 000000000..3ed101058
--- /dev/null
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_discord.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="20.0dip"
+    android:width="20.0dip"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
+    <path
+        android:strokeColor="#FFF"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M21.25,3.75c0,-1.105 -0.895,-2 -2,-2c-3.557,0 -10.943,0
+-14.5,0c-1.105,0 -2,0.895 -2,2c0,3.557 0,10.943 0,14.5c0,1.105
+0.895,2 2,2c4.343,0 14.25,0 14.25,0l2.25,2c0,0 0,-13.344 0,-18.5Z
+M 12 7.528 C 15.0375661241 7.528 17.5 9.01531006106 17.5 10.85 C
+17.5 12.6846899389 15.0375661241 14.172 12 14.172 C 8.96243387593
+ 14.172 6.5 12.6846899389 6.5 10.85 C 6.5 9.01531006106
+ 8.96243387593 7.528 12 7.528 Z M9.558,6.402l-2.549,1.426c-1.14,5.221
+ -1.636,6.805 1.517,7.585 M14.488,6.402l2.549,1.426c1.14,5.221
+ 1.635,6.805 -1.517,7.585 M9.742,11.712l0.516,0 M13.742,11.712l0.516,0" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_drawer.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_drawer.xml
index c6673767f..8fcb0bad6 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_drawer.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_drawer.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_faq.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_faq.xml
index 1b7bd2287..d9ae8dbf5 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_faq.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_faq.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_folder.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_folder.xml
index c5473a25d..a5edbae2e 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_folder.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_folder.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_googleplus.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_googleplus.xml
deleted file mode 100644
index 64632cbc7..000000000
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_googleplus.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="20.0dip"
-    android:width="20.0dip"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:strokeColor="?android:colorControlNormal"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:pathData="M12.1,2.4c-5.4,0-9.6,4.4-9.6,9.6s4.1,9.6,9.5,9.6s9.6-4.2,9.6-9.6h-9.5 M16.8,16.7V7.3" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_importsave.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_importsave.xml
index ccbe1a778..22919389d 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_importsave.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_importsave.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_indicator.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_indicator.xml
index 3d024d004..3758eaf35 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_indicator.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_indicator.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_info.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_info.xml
index f101ba5f6..09d1191dc 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_info.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_info.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_integrations.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_integrations.xml
index 6d2a5f0d0..b17238a46 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_integrations.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_integrations.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_labs.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_labs.xml
index c2fd03043..28e4eccc9 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_labs.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_labs.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_nova.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_nova.xml
index 5f871f3eb..5cbd35db3 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_nova.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_nova.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_palette.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_palette.xml
index 12f722c57..cd2e603e5 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_palette.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_palette.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_screens.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_screens.xml
index 0592e8ed7..03fb9045e 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_screens.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_screens.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_star.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_star.xml
index fc05da6c4..7f829b9ba 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_star.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_star.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_tab.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_tab.xml
index b09cf8e68..11b6b0755 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_tab.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_tab.xml
@@ -2,9 +2,10 @@
     android:height="24.0dip"
     android:width="24.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_twitter.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_twitter.xml
index 2c48f8882..78b5d62c0 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_twitter.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_pref_twitter.xml
@@ -2,9 +2,10 @@
     android:height="20.0dip"
     android:width="20.0dip"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:colorControlNormal">
     <path
-        android:strokeColor="?android:colorControlNormal"
+        android:strokeColor="#FFF"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_edit.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_edit.xml
index ef0836bea..61a0df669 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_edit.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_edit.xml
@@ -8,8 +8,11 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M18.207 4.207c-.187-.187-.442-.293-.707-.293-.265 0-.52.106-.707.293C13.95
-  7.051 3.504 17.5 3.504 17.5l-.004 3 3.026-.003s10.43-10.447
-  13.268-13.29c.39-.391.39-1.023-.001-1.414l-1.586-1.586zM14.963
-  6.038l3.001 3.002" />
+        android:pathData="M3.75 20.25v-3.194S13.817 7.014 16.959
+3.881c.245-.245.577-.381.922-.38.346.001.677.14.92.386.419.423.913.923
+1.33 1.345.502.509.5 1.327-.006 1.833C17.002
+10.189 6.942 20.25 6.942 20.25H3.75zM14.66
+6.173l3.21 3.148M15.66 5.173l3.21 3.148M16.66
+4.173l3.21 3.148M17.66 4.173l2.21
+2.148" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_uninstall.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_uninstall.xml
index 75d510133..227b838cb 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_uninstall.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_qm_uninstall.xml
@@ -8,6 +8,7 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M17.5 6h-11v13c0 .828.672 1.5 1.5 1.5h8c.828 0 1.5-.672 1.5-1.5V6z
-  M16 6l-2-2.5-4 .029L8 6m11.6 0H16M8 6H4.4" />
+        android:pathData="M6 5v13.922c0 .352.14.69.389.939s.587.389.939.389H16.7c.718
+0 1.3-.582 1.3-1.3V5M19.25 5H4.75M14.25 3.75h-4.5M10
+ 8.75v7.5M14 8.75v7.5" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_setting.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_setting.xml
index 596d232ee..bdb2fd923 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_setting.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/drawable/ic_setting.xml
@@ -8,7 +8,15 @@
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:pathData="M2 6.977h10.5m6 0H22m-20 10h3.5m6 0H22M15.5 4c1.657 0 3 1.343 3
-  3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3zm-7 10c1.657 0 3 1.343 3 3s-1.343
-  3-3 3-3-1.343-3-3 1.343-3 3-3z" />
+        android:pathData="M9.953 5.64l.547-2.89 3.068.02.484 2.871c.911.294 1.737.779
+ 2.431 1.407l-.005-.007.012-.007 2.72-1.007 1.551 2.646-2.23
+1.894-.008-.012c.103.466.158.949.158 1.445 0 .48-.051.949-.147
+1.4v-.001l.012.007 2.232 1.851-1.517
+2.666-2.755-.983.011-.02c-.7.643-1.536 1.139-2.461 1.438v.014l-.488
+2.858-3.068.02-.525-2.878h.015c-.93-.294-1.773-.785-2.478-1.425l.004.007-2.777.969-1.517-2.666
+2.244-1.855.001.001c-.096-.452-.148-.922-.148-1.403
+0-.483.052-.954.149-1.407h-.001l-2.228-1.92L4.79 6.027l2.729
+1.016-.004.007c.696-.63 1.523-1.116 2.438-1.41zm.594 4.907c.801-.803
+2.105-.803 2.906 0 .803.801.803 2.105 0 2.906-.801.803-2.105.803-2.906
+0-.803-.801-.803-2.105 0-2.906z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_dark.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors.xml
similarity index 57%
rename from app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_dark.xml
rename to app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors.xml
index aa942830b..15c19e414 100644
--- a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_dark.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors.xml
@@ -3,10 +3,16 @@
     <!-- Background -->
     <color name="switcher_bar_background_color">@*android:color/background_material_dark</color>
     <color name="cardIdleBackground">@*android:color/background_material_dark</color>
+    <color name="background_material_dark">@*android:color/background_material_dark</color>
+    <color name="bg_dialog_dark">@*android:color/background_floating_material_dark</color>
+    <color name="material_grey_800">@*android:color/background_floating_material_dark</color>
 
     <!-- App Shortcuts -->
     <color name="pill_menu_bg">@*android:color/background_material_dark</color>
-    <color name="pill_menu_bg_pressed">@*android:color/background_dark</color>
+    <color name="pill_menu_bg_pressed">@*android:color/background_floating_material_dark</color>
     <color name="popup_color_primary">@*android:color/background_material_dark</color>
-    <color name="popup_color_secondary">@*android:color/background_dark</color>
+    <color name="popup_color_secondary">@*android:color/background_floating_material_dark</color>
+
+    <!-- Accent -->
+    <color name="prime_text_color">@android:color/holo_blue_light</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_main.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_main.xml
deleted file mode 100644
index 347165897..000000000
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-night/colors_main.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Other -->
-    <color name="prime_text_color">@android:color/holo_blue_light</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values-v25/styles_dark.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-v25/styles.xml
similarity index 100%
rename from app/src/dark/assets/overlays/com.teslacoilsw.launcher/res/values-v25/styles_dark.xml
rename to app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values-v25/styles.xml
diff --git a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/colors_main.xml b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/colors.xml
similarity index 79%
rename from app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/colors_main.xml
rename to app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/colors.xml
index 179c0796d..e4aff4827 100644
--- a/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/colors_main.xml
+++ b/app/src/main/assets/overlays/com.teslacoilsw.launcher/res/values/colors.xml
@@ -6,8 +6,8 @@
     <color name="theme_color_primary_dark">@android:color/holo_orange_light</color>
 
     <color name="theme_dark_color_accent">@android:color/holo_blue_light</color>
-    <color name="theme_dark_color_primary">@android:color/holo_orange_light</color>
-    <color name="theme_dark_color_primary_dark">@android:color/holo_orange_light</color>
+    <color name="theme_dark_color_primary">@*android:color/background_material_dark</color>
+    <color name="theme_dark_color_primary_dark">@*android:color/background_material_dark</color>
 
 
     <!-- Other -->