diff --git a/overlay/common/frameworks/base/core/res/res/values/colors.xml b/overlay/common/frameworks/base/core/res/res/values/colors.xml
new file mode 100644
index 00000000..3a75afbb
--- /dev/null
+++ b/overlay/common/frameworks/base/core/res/res/values/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Primary colors -->
+    <color name="material_blue_grey_800">@*common:color/primary</color>
+    <color name="material_blue_grey_900">@*common:color/primary</color>
+    <color name="material_blue_grey_950">@*common:color/primary_dark</color>
+
+    <!-- Secondary colors -->
+    <color name="material_deep_teal_200">@*common:color/accent_fallback</color>
+    <color name="material_deep_teal_500">@*common:color/accent</color>
+
+    <color name="system_notification_accent_color">@*common:color/accent</color>
+    <color name="battery_saver_mode_color">#fff4511e</color>
+    <!-- deep orange 600 -->
+
+    <!-- ? -->
+    <color name="material_color_900">#ff212121</color>
+    <color name="material_color_850">#ff303030</color>
+    <color name="material_color_800">#ff424242</color>
+    <color name="material_color_600">#ff757575</color>
+    <color name="material_color_300">#ffe0e0e0</color>
+    <color name="material_color_100">#fff5f5f5</color>
+    <color name="material_color_50">#fffafafa</color>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/colors.xml b/overlay/common/frameworks/base/packages/SystemUI/res/colors.xml
new file mode 100644
index 00000000..73cd123b
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/colors.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Main colors -->
+    <color name="system_primary_color">@*common:color/material_color_800</color>
+    <color name="system_secondary_color">@*common:color/primary</color>
+    <color name="system_accent_color">@*common:color/accent_fallback</color>
+
+    <!-- Volume pull down -->
+    <color name="volume_icon_color">@*common:color/icons</color>
+    <color name="volume_settings_icon_color">@*common:color/icons</color>
+    <color name="volume_slider_active">@color/system_accent_color</color>
+    <color name="volume_slider_inactive">@*common:color/material_color_500</color>
+    <color name="volume_panel_background_color">@*common:color/primary_lighter</color>
+
+    <!-- Misc -->
+    <color name="tuner_icon_tint">@*common:color/transparent</color>
+    <color name="no_recent_apps">#bebebe</color>
+    <color name="system_warning_color">#BF360C</color>
+    <color name="navbutton_ripple_color">#FFFFFFFF</color>
+
+    <!-- QS -->
+    <color name="qs_row_text_color">#b2ffffff</color>
+    <color name="qs_text">#FFFFFFFF</color>
+    <color name="qs_tile_divider">#29ffffff</color>
+    <color name="qs_tile_text">#B3FFFFFF</color>
+    <color name="qs_subhead">#99FFFFFF</color>
+    <color name="qs_detail_empty">#24F5F5F5</color>
+    <color name="qs_detail_button">#ffF5F5F5</color>
+    <color name="qs_detail_button_white">#B3FFFFFF</color>
+    <color name="qs_detail_transition">#66FFFFFF</color>
+    <color name="qs_detail_progress_track">#999E9E9E</color>
+
+    <!-- QS Settings Text Colors -->
+    <color name="qs_tile_reset_to_default_text_color">#b2ffffff</color>
+    <color name="qs_title_text_color">@android:color/white</color>
+    <color name="qs_edit_header_instruction_text_color">@android:color/white</color>
+
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">@*common:color/cards</color>
+    <color name="notification_material_background_color">@*common:color/cards</color>
+    <color name="notification_material_background_dimmed_color">#ddffffff</color>
+    <color name="notification_material_background_low_priority_color">#ddffffff</color>
+    <color name="notification_material_background_media_default_color">@color/system_primary_color</color>
+    <color name="notification_icon_color">@*common:color/accent</color>
+    <color name="notification_ripple_untinted_color">#28000000</color>
+    <color name="notification_ripple_color_low_priority">#30000000</color>
+    <color name="notification_ripple_tinted_color">#30ffffff</color>
+
+    <!-- Notifications "back" -->
+    <color name="notification_guts_bg_color">@color/system_secondary_color</color>
+    <color name="notification_guts_title_color">#FFFFFFFF</color>
+    <color name="notification_guts_text_color">#b2FFFFFF</color>
+    <color name="notification_guts_btn_color">#FFFFFFFF</color>
+
+
+</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/dimens.xml b/overlay/common/frameworks/base/packages/SystemUI/res/dimens.xml
new file mode 100644
index 00000000..16f960ee
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/dimens.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Macros -->
+    <dimen name="qs_top_inset">8dp</dimen>
+
+    <!-- Notifications-->
+    <dimen name="notification_side_padding">8dp</dimen>
+    <dimen name="notifications_top_padding">8dp</dimen>
+    <!-- radius of the corners of the material rounded rect background -->
+    <dimen name="notification_material_rounded_rect_radius">2dp</dimen>
+    <!-- radius of the corners of the material rounded rect background but negative-->
+    <dimen name="notification_material_rounded_rect_radius_negative">-2dp</dimen>
+    <!-- Volume panel -->
+    <dimen name="volume_panel_z">8dp</dimen>
+    <dimen name="volume_offset_top">4dp</dimen>
+    <dimen name="volume_slider_interspacing">8dp</dimen>
+
+    <!-- Recents overview -->
+    <dimen name="recents_task_view_rounded_corners_radius">2.0dip</dimen>
+
+    <!-- Status bar header -->
+    <dimen name="notification_header_side_padding">0dp</dimen>
+    <dimen name="status_bar_expanded_header_elevation">4dp</dimen>
+
+    <!-- QS Panel -->
+    <dimen name="qs_brightness_padding_top">@dimen/qs_top_inset</dimen>
+    <dimen name="qs_peek_height">0dp</dimen>
+    <dimen name="qs_tile_height">96dp</dimen>
+    <dimen name="qs_dual_tile_height">96dp</dimen>
+    <dimen name="qs_dual_tile_padding_vertical">0dp</dimen>
+    <dimen name="qs_tile_padding_below_icon">12dp</dimen>
+
+    <!-- UNUSUED
+    <dimen name="qs_tile_height">88dp</dimen>
+    <dimen name="qs_tile_icon_size">24dp</dimen>
+    <dimen name="qs_tile_text_size">12sp</dimen>
+    <dimen name="qs_tile_divider_height">1dp</dimen>
+    <dimen name="qs_panel_padding">16dp</dimen>
+    <dimen name="qs_dual_tile_height">112dp</dimen>
+    <dimen name="qs_dual_tile_padding_vertical">8dp</dimen>
+    <dimen name="qs_dual_tile_padding_horizontal">6dp</dimen>
+    <dimen name="qs_tile_padding_top">14dp</dimen>
+    <dimen name="qs_tile_padding_top_large_text">4dp</dimen>
+    <dimen name="qs_tile_padding_below_icon">12dp</dimen>
+    <dimen name="qs_tile_padding_bottom">16dp</dimen>
+    <dimen name="qs_tile_spacing">4dp</dimen>
+    -->
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png
new file mode 100644
index 00000000..7fd3b3df
Binary files /dev/null and b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png differ
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png
new file mode 100644
index 00000000..02787f60
Binary files /dev/null and b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png differ
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png
new file mode 100644
index 00000000..41d0530e
Binary files /dev/null and b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png differ
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back.png b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back.png
new file mode 100644
index 00000000..a3397685
Binary files /dev/null and b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back.png differ
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_home.png b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_home.png
new file mode 100644
index 00000000..da9e8ab3
Binary files /dev/null and b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_home.png differ
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_recent.png b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_recent.png
new file mode 100644
index 00000000..d285d116
Binary files /dev/null and b/overlay/common/frameworks/base/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_recent.png differ
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable/ic_brightness_thumb.xml b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/ic_brightness_thumb.xml
new file mode 100644
index 00000000..8f4ef8fe
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/ic_brightness_thumb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/system_primary_color"
+        android:strokeColor="@*common:color/icons"
+        android:strokeWidth="2"
+        android:pathData="M5.53249,9.31787 C6.61604,6.69788,9.16861,4.9978,12,4.9978
+C14.8314,4.9978,17.384,6.70776,18.4675,9.31787
+C19.551,11.9379,18.9521,14.9479,16.9498,16.9479 L11.9999,21.8978
+L7.05007,16.9479 C5.04779,14.9479,4.4488,11.9379,5.53236,9.31787 Z" />
+    <path
+        android:fillColor="@*common:color/icons"
+        android:pathData="M11.9352,8.005 C14.1058,8.005,15.8654,9.79358,15.8654,12
+C15.8654,14.2064,14.1058,15.995,11.9352,15.995
+C9.76462,15.995,8.005,14.2064,8.005,12
+C8.005,9.79358,9.76462,8.005,11.9352,8.005 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml
new file mode 100644
index 00000000..3ffc9dde
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+
+    <path
+        android:pathData="M4.22494,13.375 L11.9999,5.66602 L19.7751,13.3752"
+        android:strokeColor="@*common:color/icons"
+        android:strokeWidth="1.99999988" />
+    <path
+        android:pathData="M4.22494,19.0319 L11.9999,11.3229 L19.7751,19.0321"
+        android:strokeColor="@*common:color/icons"
+        android:strokeWidth="1.99999988" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable/qs_background_primary.xml b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/qs_background_primary.xml
new file mode 100644
index 00000000..6f0213b8
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/qs_background_primary.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- QS Background rectangle - we wrap it in a layer-list to give it some top margin -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:top="@dimen/qs_top_inset">
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/system_primary_color"/>
+            <corners android:radius="@dimen/notification_material_rounded_rect_radius"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable/qs_tile_background_drag.xml b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/qs_tile_background_drag.xml
new file mode 100644
index 00000000..abd105e7
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/qs_tile_background_drag.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2015, The CyanogenMod 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.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid
+        android:color="@*common:color/material_color_500" />
+</shape>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/drawable/volume_dialog_background.xml b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/volume_dialog_background.xml
new file mode 100644
index 00000000..0f20a7e6
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/drawable/volume_dialog_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@color/volume_panel_background_color" />
+
+    <corners android:radius="@dimen/notification_material_rounded_rect_radius" />
+
+</shape>
diff --git a/overlay/common/packages/apps/AudioFX/res/values/colors.xml b/overlay/common/packages/apps/AudioFX/res/values/colors.xml
new file mode 100644
index 00000000..56ad711f
--- /dev/null
+++ b/overlay/common/packages/apps/AudioFX/res/values/colors.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="action_bar_background">@*common:color/primary_dark</color>
+    <color name="audiofx_background_color">#303030</color>
+    <color name="eq_preset_label_text_color">#ff808080</color>
+    <color name="reverb_label_text_color">#ff808080</color>
+
+    <color name="highlight">#cc8f8f8f</color>
+    <color name="lowlight">#ccf4fcff</color>
+    <color name="grey">#9e9e9e</color>
+    <color name="disabled">#80525252</color>
+    <color name="disabled_gallery">#888888</color>
+    <color name="disabled_knob">#575757</color>
+
+    <color name="primary">@*common:color/primary</color>
+    <color name="primary_dark">@*common:color/primary_dark</color>
+    <color name="accent">@*common:color/accent_fallback</color>
+
+    <color name="white">#fafafa</color>
+    <color name="black">#212121</color>
+    <color name="grid_lines">#22ffffff</color>
+    <color name="cb">#89ffffff</color>
+    <color name="freq_hl">#2000ddff</color>
+    <color name="freq_hl2">#4033b5e5</color>
+
+    <color name="eq_red">#f44336</color>
+    <color name="eq_green">#8bc34a</color>
+    <color name="eq_yellow">#ff9800</color>
+    <color name="eq_holo_bright">#8000ddff</color>
+    <color name="eq_holo_blue">#8033b5e5</color>
+    <color name="eq_holo_dark">#800099cc</color>
+
+    <color name="cb_shader">#ffffffff</color>
+    <color name="cb_shader_alpha">#22ffffff</color>
+
+    <color name="window_background">@color/black</color>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/AudioFX/res/values/styles.xml b/overlay/common/packages/apps/AudioFX/res/values/styles.xml
new file mode 100644
index 00000000..cd891293
--- /dev/null
+++ b/overlay/common/packages/apps/AudioFX/res/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Material">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:windowBackground">@color/window_background</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/ExactCalculator/res/values/colors.xml b/overlay/common/packages/apps/ExactCalculator/res/values/colors.xml
new file mode 100644
index 00000000..76dce865
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/values/colors.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Default background color for the status bar. -->
+    <color name="calculator_accent_color">#fff</color>
+
+    <!-- Color to indicate an error has occured. -->
+    <color name="calculator_error_color">#F40056</color>
+
+    <!-- Background color of the calculator display. -->
+    <color name="display_background_color">#fff</color>
+
+    <!-- Text color for the formula in the calculator display. -->
+    <color name="display_formula_text_color">#8A000000</color>
+
+    <!-- Text color for the result in the calculator display. -->
+    <color name="display_result_text_color">#6C000000</color>
+
+    <!-- Lighter color for exponent while scrolling. -->
+    <color name="display_result_exponent_text_color">#40000000</color>
+
+    <!-- Background color for the numeric pad. -->
+    <color name="pad_numeric_background_color">@*common:color/primary_dark</color>
+
+    <!-- Background color for the operator pad. -->
+    <color name="pad_operator_background_color">@*common:color/primary</color>
+
+    <!-- Background color for the advanced pad. -->
+    <color name="pad_advanced_background_color">@*common:color/material_color_800</color>
+
+    <!-- Text color for a button in a pad. -->
+    <color name="pad_button_text_color">#FFF</color>
+
+    <!-- Text color for a button in the advanced pad. -->
+    <color name="pad_button_advanced_text_color">#fff</color>
+
+    <!-- Ripple color when a button is pressed in a pad. -->
+    <color name="pad_button_ripple_color">#33FFFFFF</color>
+
+    <!-- Ripple color when a button is pressed in a pad. -->
+    <color name="pad_button_advanced_ripple_color">#1A000000</color>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/ExactCalculator/res/values/styles.xml b/overlay/common/packages/apps/ExactCalculator/res/values/styles.xml
new file mode 100644
index 00000000..608bcc7f
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@*common:color/primary</item>
+        <item name="android:statusBarColor">#fff</item>
+        <item name="android:windowSoftInputMode">stateAlwaysHidden</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@*common:color/primary_dark</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/clock_preferences.xml b/overlay/common/packages/apps/Settings/res/drawable/clock_preferences.xml
new file mode 100644
index 00000000..b1e03cb0
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/clock_preferences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M12,20 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12
+S16.42,20,12,20 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12.5,7 L11,7 L11,13 L16.25,16.15 L17,14.92 L12.5,12.25 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/dashboard_category_background.xml b/overlay/common/packages/apps/Settings/res/drawable/dashboard_category_background.xml
new file mode 100644
index 00000000..0958a92b
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/dashboard_category_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@*common:color/cards" />
+    <corners
+        android:radius="@dimen/dashboard_radius" />
+</shape>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_action_action_perm_identity.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_action_action_perm_identity.xml
new file mode 100644
index 00000000..285dc12f
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_action_action_perm_identity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M3,5 L3,19 C3,20.1,3.89,21,5,21 L19,21 C20.1,21,21,20.1,21,19 L21,5
+C21,3.9,20.1,3,19,3 L5,3 C3.89,3,3,3.9,3,5 Z M15,9 C15,10.66,13.66,12,12,12
+S9,10.66,9,9 S10.34,6,12,6 S15,7.34,15,9 Z M6,17 C6,15,10,13.9,12,13.9
+S18,15,18,17 L18,18 L6,18 L6,17 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_app_remover.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_app_remover.xml
new file mode 100644
index 00000000..0ebed618
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_app_remover.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12,2 C6.47,2,2,6.47,2,12 S6.47,22,12,22 S22,17.53,22,12 S17.53,2,12,2 Z
+M17,15.59 L15.59,17 L12,13.41 L8.41,17 L7,15.59 L10.59,12 L7,8.41 L8.41,7
+L12,10.59 L15.59,7 L17,8.41 L13.41,12 L17,15.59 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_bliss_equalizer.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_bliss_equalizer.xml
new file mode 100644
index 00000000..aca0d791
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_bliss_equalizer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M10,20 L14,20 L14,4 L10,4 L10,20 Z M4,20 L8,20 L8,12 L4,12 L4,20 Z M16,9 L16,20
+L20,20 L20,9 L16,9 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_menu_add_dark.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_menu_add_dark.xml
new file mode 100644
index 00000000..a3b11949
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_menu_add_dark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M19,13 L13,13 L13,19 L11,19 L11,13 L5,13 L5,11 L11,11 L11,5 L13,5 L13,11 L19,11
+L19,13 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_power_system.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_power_system.xml
new file mode 100644
index 00000000..7cf6072c
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_power_system.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M6,18 C6,18.55,6.45,19,7,19 L8,19 L8,22.5 C8,23.33,8.67,24,9.5,24
+S11,23.33,11,22.5 L11,19 L13,19 L13,22.5 C13,23.33,13.67,24,14.5,24
+S16,23.33,16,22.5 L16,19 L17,19 C17.55,19,18,18.55,18,18 L18,8 L6,8 L6,18 Z
+M3.5,8 C2.67,8,2,8.67,2,9.5 L2,16.5 C2,17.33,2.67,18,3.5,18 S5,17.33,5,16.5
+L5,9.5 C5,8.67,4.33,8,3.5,8 Z M20.5,8 C19.67,8,19,8.67,19,9.5 L19,16.5
+C19,17.33,19.67,18,20.5,18 S22,17.33,22,16.5 L22,9.5 C22,8.67,21.33,8,20.5,8 Z
+M15.53,2.16 L16.83,0.86 C17.03,0.66,17.03,0.35,16.83,0.15
+C16.63,-0.05,16.32,-0.05,16.12,0.15 L14.64,1.63 C13.85,1.23,12.95,1,12,1
+C11.04,1,10.14,1.23,9.34,1.63 L7.85,0.15 C7.65,-0.05,7.34,-0.05,7.14,0.15
+C6.94,0.35,6.94,0.66,7.14,0.86 L8.45,2.17 C6.97,3.26,6,5.01,6,7 L18,7
+C18,5.01,17.03,3.25,15.53,2.16 Z M10,5 L9,5 L9,4 L10,4 L10,5 Z M15,5 L14,5 L14,4
+L15,4 L15,5 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_about.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_about.xml
new file mode 100644
index 00000000..8c6b6ea4
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_about.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M13,7 L11,7 L11,9 L13,9 L13,7 Z M13,11 L11,11 L11,17 L13,17 L13,11 Z M17,1.01
+L7,1 C5.9,1,5,1.9,5,3 L5,21 C5,22.1,5.9,23,7,23 L17,23 C18.1,23,19,22.1,19,21
+L19,3 C19,1.9,18.1,1.01,17,1.01 Z M17,19 L7,19 L7,5 L17,5 L17,19 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_accessibility.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_accessibility.xml
new file mode 100644
index 00000000..5e6908f8
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_accessibility.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12,2 C13.1,2,14,2.9,14,4 S13.1,6,12,6 S10,5.1,10,4 S10.9,2,12,2 Z M21,9 L15,9
+L15,22 L13,22 L13,16 L11,16 L11,22 L9,22 L9,9 L3,9 L3,7 L21,7 L21,9 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_accounts.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_accounts.xml
new file mode 100644
index 00000000..98450b7b
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_accounts.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:fillColor="?android:attr/colorAccent" android:pathData="M12,12 C14.21,12,16,10.21,16,8 S14.21,4,12,4 S8,5.79,8,8 S9.79,12,12,12 Z M12,14
+C9.33,14,4,15.34,4,18 L4,20 L20,20 L20,18 C20,15.34,14.67,14,12,14 Z" />
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_aicp.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_aicp.xml
new file mode 100644
index 00000000..83443e4b
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_aicp.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M13.5,0.67 S14.24,3.32,14.24,5.47 C14.24,7.53,12.89,9.2,10.83,9.2
+C8.76,9.2,7.2,7.53,7.2,5.47 L7.23,5.11 C5.21,7.51,4,10.62,4,14
+C4,18.42,7.58,22,12,22 S20,18.42,20,14 C20,8.61,17.41,3.8,13.5,0.67 Z M11.71,19
+C9.93,19,8.49,17.6,8.49,15.86 C8.49,14.24,9.54,13.1,11.3,12.74
+C13.07,12.38,14.9,11.53,15.92,10.16 C16.31,11.45,16.51,12.81,16.51,14.2
+C16.51,16.85,14.36,19,11.71,19 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_applications.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_applications.xml
new file mode 100644
index 00000000..48752ef9
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_applications.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:fillColor="?android:attr/colorAccent" android:pathData="M4,8 L8,8 L8,4 L4,4 L4,8 Z M10,20 L14,20 L14,16 L10,16 L10,20 Z M4,20 L8,20
+L8,16 L4,16 L4,20 Z M4,14 L8,14 L8,10 L4,10 L4,14 Z M10,14 L14,14 L14,10 L10,10
+L10,14 Z M16,4 L16,8 L20,8 L20,4 L16,4 Z M10,8 L14,8 L14,4 L10,4 L10,8 Z M16,14
+L20,14 L20,10 L16,10 L16,14 Z M16,20 L20,20 L20,16 L16,16 L16,20 Z" />
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_backup.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_backup.xml
new file mode 100644
index 00000000..68dc517c
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_backup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path android:fillColor="?android:attr/colorAccent" android:pathData="M19.35,10.04 C18.67,6.59,15.64,4,12,4 C9.11,4,6.6,5.64,5.35,8.04
+C2.34,8.36,0,10.91,0,14 C0,17.31,2.69,20,6,20 L19,20 C21.76,20,24,17.76,24,15
+C24,12.36,21.95,10.22,19.35,10.04 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_battery.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_battery.xml
new file mode 100644
index 00000000..57e76c0c
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_battery.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path android:fillColor="?android:attr/colorAccent" android:pathData="M15.67,4 L14,4 L14,2 L10,2 L10,4 L8.33,4 C7.6,4,7,4.6,7,5.33 L7,20.66
+C7,21.4,7.6,22,8.33,22 L15.66,22 C16.4,22,17,21.4,17,20.67 L17,5.33
+C17,4.6,16.4,4,15.67,4 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_bliss.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_bliss.xml
new file mode 100644
index 00000000..0220f2b8
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_bliss.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z M-10.03,21.49 C-10.66,21.72,-11.32,21.89,-12,22
+C-11.32,21.88,-10.67,21.71,-10.03,21.49 Z M12,22
+C11.32,21.88,10.67,21.71,10.03,21.49 C10.67,21.71,11.32,21.88,12,22 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M8.55,12 C7.48,11.29,6.3,10.73,5.02,10.39 C6.3,10.73,7.48,11.29,8.55,12 Z
+M18.98,10.39 C17.69,10.73,16.49,11.3,15.41,12.03
+C16.49,11.3,17.69,10.73,18.98,10.39 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M15.49,9.63 C15.31,6.84,14.18,4.12,12.06,2 C9.92,4.14,8.74,6.86,8.51,9.63
+C9.79,10.31,10.97,11.19,12,12.26 C13.03,11.2,14.21,10.32,15.49,9.63 Z
+M8.99,12.28 C8.85,12.18,8.69,12.09,8.54,11.99 C8.69,12.1,8.85,12.18,8.99,12.28 Z
+M15.41,12.03 C15.28,12.12,15.14,12.19,15.01,12.29
+C15.14,12.19,15.28,12.12,15.41,12.03 Z M12,15.45 C9.85,12.17,6.18,10,2,10
+C2,15.32,5.36,19.82,10.03,21.49 C10.66,21.72,11.32,21.89,12,22
+C12.68,21.88,13.33,21.71,13.97,21.49 C18.64,19.82,22,15.32,22,10
+C17.82,10,14.15,12.17,12,15.45 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_bluetooth.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_bluetooth.xml
new file mode 100644
index 00000000..ef547292
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_bluetooth.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M17.71,7.71 L12,2 L11,2 L11,9.59 L6.41,5 L5,6.41 L10.59,12 L5,17.59 L6.41,19
+L11,14.41 L11,22 L12,22 L17.71,16.29 L13.41,12 L17.71,7.71 Z M13,5.83
+L14.88,7.71 L13,9.59 L13,5.83 Z M14.88,16.29 L13,18.17 L13,14.41 L14.88,16.29 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_buttons.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_buttons.xml
new file mode 100644
index 00000000..53215a18
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_buttons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M15,7.5 L15,2 L9,2 L9,7.5 L12,10.5 L15,7.5 Z M7.5,9 L2,9 L2,15 L7.5,15 L10.5,12
+L7.5,9 Z M9,16.5 L9,22 L15,22 L15,16.5 L12,13.5 L9,16.5 Z M16.5,9 L13.5,12
+L16.5,15 L22,15 L22,9 L16.5,9 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_cell_standby.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_cell_standby.xml
new file mode 100644
index 00000000..42c52cf5
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_cell_standby.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M20,6.83 L20,20 L6.83,20 L20,6.83 M22,2 L2,22 L22,22 L22,2 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_cellular.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_cellular.xml
new file mode 100644
index 00000000..fa5f7e39
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_cellular.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M2,22 L22,22 L22,2 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_data_usage.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_data_usage.xml
new file mode 100644
index 00000000..7cbf7723
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_data_usage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M13,2.05 L13,5.08 C16.39,5.57,19,8.47,19,12 C19,12.9,18.82,13.75,18.52,14.54
+L21.12,16.07 C21.68,14.83,22,13.45,22,12 C22,6.82,18.05,2.55,13,2.05 Z M12,19
+C8.13,19,5,15.87,5,12 C5,8.47,7.61,5.57,11,5.08 L11,2.05 C5.94,2.55,2,6.81,2,12
+C2,17.52,6.47,22,11.99,22 C15.3,22,18.23,20.39,20.05,17.91 L17.45,16.38
+C16.17,17.98,14.21,19,12,19 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_date_time.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_date_time.xml
new file mode 100644
index 00000000..7dbe4876
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_date_time.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M12,20 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12
+S16.42,20,12,20 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12.5,7 L11,7 L11,13 L16.25,16.15 L17,14.92 L12.5,12.25 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_development.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_development.xml
new file mode 100644
index 00000000..2177b833
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_development.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path android:fillColor="?android:attr/colorAccent" android:pathData="M7,5 L17,5 L17,7 L19,7 L19,3 C19,1.9,18.1,1.01,17,1.01 L7,1 C5.9,1,5,1.9,5,3
+L5,7 L7,7 L7,5 Z M15.41,16.59 L20,12 L15.41,7.41 L14,8.83 L17.17,12 L14,15.17
+L15.41,16.59 Z M10,15.17 L6.83,12 L10,8.83 L8.59,7.41 L4,12 L8.59,16.59
+L10,15.17 Z M17,19 L7,19 L7,17 L5,17 L5,21 C5,22.1,5.9,23,7,23 L17,23
+C18.1,23,19,22.1,19,21 L19,17 L17,17 L17,19 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_display.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_display.xml
new file mode 100644
index 00000000..17c40a94
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_display.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M9,21 C9,21.55,9.45,22,10,22 L14,22 C14.55,22,15,21.55,15,21 L15,20 L9,20 L9,21
+Z M12,2 C8.14,2,5,5.14,5,9 C5,11.38,6.19,13.47,8,14.74 L8,17
+C8,17.55,8.45,18,9,18 L15,18 C15.55,18,16,17.55,16,17 L16,14.74
+C17.81,13.47,19,11.38,19,9 C19,5.14,15.86,2,12,2 Z M14.85,13.1 L14,13.7 L14,16
+L10,16 L10,13.7 L9.15,13.1 C7.8,12.16,7,10.63,7,9 C7,6.24,9.24,4,12,4
+S17,6.24,17,9 C17,10.63,16.2,12.16,14.85,13.1 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_dock.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_dock.xml
new file mode 100644
index 00000000..cd28eb57
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_dock.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M8,23 L16,23 L16,21 L8,21 L8,23 Z M16,1.01 L8,1 C6.9,1,6,1.9,6,3 L6,17
+C6,18.1,6.9,19,8,19 L16,19 C17.1,19,18,18.1,18,17 L18,3
+C18,1.9,17.1,1.01,16,1.01 Z M16,15 L8,15 L8,5 L16,5 L16,15 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_gestures.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_gestures.xml
new file mode 100644
index 00000000..c049b08a
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_gestures.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M4.59,6.89 C5.29,6.18,5.99,5.54,6.3,5.67 C6.8,5.87,6.3,6.7,6,7.19
+C5.75,7.61,3.14,11.08,3.14,13.5 C3.14,14.78,3.62,15.84,4.48,16.48
+C5.23,17.04,6.22,17.21,7.12,16.94 C8.19,16.63,9.07,15.54,10.18,14.17
+C11.39,12.68,13.01,10.73,14.26,10.73 C15.89,10.73,15.91,11.74,16.02,12.52
+C12.24,13.16,10.64,16.19,10.64,17.89 C10.64,19.59,12.08,20.98,13.85,20.98
+C15.48,20.98,18.14,19.65,18.54,14.88 L21,14.88 L21,12.38 L18.53,12.38
+C18.38,10.73,17.44,8.18,14.5,8.18 C12.25,8.18,10.32,10.09,9.56,11.02
+C8.98,11.75,7.5,13.5,7.27,13.74 C7.02,14.04,6.59,14.58,6.16,14.58
+C5.71,14.58,5.44,13.75,5.8,12.66 C6.15,11.57,7.2,9.8,7.65,9.14
+C8.43,8,8.95,7.22,8.95,5.86 C8.95,3.69,7.31,3,6.44,3 C5.12,3,3.97,4,3.72,4.25
+C3.36,4.61,3.06,4.91,2.84,5.18 L4.59,6.89 Z M13.88,18.55
+C13.57,18.55,13.14,18.29,13.14,17.83 C13.14,17.23,13.87,15.63,16.01,15.07
+C15.71,17.76,14.58,18.55,13.88,18.55 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_home.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_home.xml
new file mode 100644
index 00000000..5d0c613a
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_home.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M10,20 L10,14 L14,14 L14,20 L19,20 L19,12 L22,12 L12,3 L2,12 L5,12 L5,20 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_language.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_language.xml
new file mode 100644
index 00000000..8c5d1bec
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_language.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M18.92,8 L15.97,8 C15.65,6.75,15.19,5.55,14.59,4.44
+C16.43,5.07,17.96,6.35,18.92,8 Z M12,4.04 C12.83,5.24,13.48,6.57,13.91,8
+L10.09,8 C10.52,6.57,11.17,5.24,12,4.04 Z M4.26,14 C4.1,13.36,4,12.69,4,12
+S4.1,10.64,4.26,10 L7.64,10 C7.56,10.66,7.5,11.32,7.5,12
+C7.5,12.68,7.56,13.34,7.64,14 L4.26,14 Z M5.08,16 L8.03,16
+C8.35,17.25,8.81,18.45,9.41,19.56 C7.57,18.93,6.04,17.66,5.08,16 Z M8.03,8
+L5.08,8 C6.04,6.34,7.57,5.07,9.41,4.44 C8.81,5.55,8.35,6.75,8.03,8 Z M12,19.96
+C11.17,18.76,10.52,17.43,10.09,16 L13.91,16 C13.48,17.43,12.83,18.76,12,19.96 Z
+M14.34,14 L9.66,14 C9.57,13.34,9.5,12.68,9.5,12 C9.5,11.32,9.57,10.65,9.66,10
+L14.34,10 C14.43,10.65,14.5,11.32,14.5,12 C14.5,12.68,14.43,13.34,14.34,14 Z
+M14.59,19.56 C15.19,18.45,15.65,17.25,15.97,16 L18.92,16
+C17.96,17.65,16.43,18.93,14.59,19.56 Z M16.36,14 C16.44,13.34,16.5,12.68,16.5,12
+C16.5,11.32,16.44,10.66,16.36,10 L19.74,10 C19.9,10.64,20,11.31,20,12
+S19.9,13.36,19.74,14 L16.36,14 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_location.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_location.xml
new file mode 100644
index 00000000..d1154bcf
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_location.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12,2 C8.13,2,5,5.13,5,9 C5,14.25,12,22,12,22 S19,14.25,19,9
+C19,5.13,15.87,2,12,2 Z M12,11.5 C10.62,11.5,9.5,10.38,9.5,9 S10.62,6.5,12,6.5
+S14.5,7.62,14.5,9 S13.38,11.5,12,11.5 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_lockscreen.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_lockscreen.xml
new file mode 100644
index 00000000..39efdf87
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_lockscreen.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M10,16 L14,16 C14.55,16,15,15.55,15,15 L15,12 C15,11.45,14.55,11,14,11 L14,10
+C14,8.89,13.1,8,12,8 C10.89,8,10,8.9,10,10 L10,11 C9.45,11,9,11.45,9,12 L9,15
+C9,15.55,9.45,16,10,16 Z M10.8,10 C10.8,9.34,11.34,8.8,12,8.8
+C12.66,8.8,13.2,9.34,13.2,10 L13.2,11 L10.8,11 L10.8,10 Z M17,1 L7,1
+C5.9,1,5,1.9,5,3 L5,21 C5,22.1,5.9,23,7,23 L17,23 C18.1,23,19,22.1,19,21 L19,3
+C19,1.9,18.1,1,17,1 Z M17,19 L7,19 L7,5 L17,5 L17,19 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_memory.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_memory.xml
new file mode 100644
index 00000000..9c557574
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_memory.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M15,9 L9,9 L9,15 L15,15 L15,9 Z M13,13 L11,13 L11,11 L13,11 L13,13 Z M21,11
+L21,9 L19,9 L19,7 C19,5.9,18.1,5,17,5 L15,5 L15,3 L13,3 L13,5 L11,5 L11,3 L9,3
+L9,5 L7,5 C5.9,5,5,5.9,5,7 L5,9 L3,9 L3,11 L5,11 L5,13 L3,13 L3,15 L5,15 L5,17
+C5,18.1,5.9,19,7,19 L9,19 L9,21 L11,21 L11,19 L13,19 L13,21 L15,21 L15,19 L17,19
+C18.1,19,19,18.1,19,17 L19,15 L21,15 L21,13 L19,13 L19,11 L21,11 Z M17,17 L7,17
+L7,7 L17,7 L17,17 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_more.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_more.xml
new file mode 100644
index 00000000..d29512ec
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_more.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:fillColor="?android:attr/colorAccent"
+        android:pathData="M16.59,8.59 L12,13.17 L7.41,8.59 L6,10 L12,16 L18,10 Z" />
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_multiuser.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_multiuser.xml
new file mode 100644
index 00000000..5a8cab24
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_multiuser.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportHeight="24" android:viewportWidth="24">
+
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path android:fillColor="?android:attr/colorAccent" android:pathData="M16,11 C17.66,11,18.99,9.66,18.99,8 S17.66,5,16,5 C14.34,5,13,6.34,13,8
+S14.34,11,16,11 Z M8,11 C9.66,11,10.99,9.66,10.99,8 S9.66,5,8,5
+C6.34,5,5,6.34,5,8 S6.34,11,8,11 Z M8,13 C5.67,13,1,14.17,1,16.5 L1,19 L15,19
+L15,16.5 C15,14.17,10.33,13,8,13 Z M16,13 C15.71,13,15.38,13.02,15.03,13.05
+C16.19,13.89,17,15.02,17,16.5 L17,19 L23,19 L23,16.5 C23,14.17,18.33,13,16,13 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_notification_slider.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_notification_slider.xml
new file mode 100644
index 00000000..f5722934
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_notification_slider.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M9.30078,3.03906 C7.17969,3.73828,5.46875,5.12109,4.28906,7.07813
+C3.65625,8.13281,3.26953,9.28906,3.10547,10.6211
+C3.05469,11.0352,3.05469,12.3203,3.10547,12.7383
+C3.36328,14.8359,4.16016,16.5039,5.62891,18.0156
+C7.0625,19.4922,8.78906,20.4023,10.7188,20.6914
+C11.5508,20.8164,12.5078,20.8281,13.3281,20.7305
+C15.3438,20.4844,17.168,19.5781,18.6563,18.0781
+C19.4609,17.2695,20.0859,16.3438,20.5391,15.2813
+C20.6523,15.0156,20.9219,14.2656,20.9219,14.2109
+C20.9219,14.1953,20.7773,14.2578,20.5742,14.3594
+C19.8086,14.7539,19.0508,15.0156,18.2383,15.168
+C17.2656,15.3555,16.0938,15.3398,15.0703,15.1289
+C13.6367,14.8359,12.3789,14.1758,11.2227,13.1172
+C10.5938,12.5391,9.96094,11.7578,9.5625,11.0469
+C8.96094,9.98047,8.625,8.77344,8.55859,7.45703
+C8.49219,5.99609,8.79297,4.63281,9.49219,3.26172
+C9.58594,3.08203,9.65625,2.93359,9.65625,2.92969
+C9.65234,2.92578,9.49219,2.97266,9.30078,3.03906 Z M9.30078,3.03906" />
+</vector>
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_notifications.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_notifications.xml
new file mode 100644
index 00000000..4fff6ff7
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_notifications.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M7.58,4.08 L6.15,2.65 C3.75,4.48,2.17,7.3,2.03,10.5 L4.03,10.5
+C4.18,7.85,5.54,5.53,7.58,4.08 Z M19.97,10.5 L21.97,10.5
+C21.82,7.3,20.24,4.48,17.85,2.65 L16.43,4.08 C18.45,5.53,19.82,7.85,19.97,10.5 Z
+M18,11 C18,7.93,16.36,5.36,13.5,4.68 L13.5,4 C13.5,3.17,12.83,2.5,12,2.5
+S10.5,3.17,10.5,4 L10.5,4.68 C7.63,5.36,6,7.92,6,11 L6,16 L4,18 L4,19 L20,19
+L20,18 L18,16 L18,11 Z M12,22 C12.14,22,12.27,21.99,12.4,21.96
+C13.05,21.82,13.58,21.38,13.84,20.78 C13.94,20.54,13.99,20.28,13.99,20 L9.99,20
+C10,21.1,10.89,22,12,22 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_performance.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_performance.xml
new file mode 100644
index 00000000..8b5c0378
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_performance.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M13.5,0.67 S14.24,3.32,14.24,5.47 C14.24,7.53,12.89,9.2,10.83,9.2
+C8.76,9.2,7.2,7.53,7.2,5.47 L7.23,5.11 C5.21,7.51,4,10.62,4,14
+C4,18.42,7.58,22,12,22 S20,18.42,20,14 C20,8.61,17.41,3.8,13.5,0.67 Z M11.71,19
+C9.93,19,8.49,17.6,8.49,15.86 C8.49,14.24,9.54,13.1,11.3,12.74
+C13.07,12.38,14.9,11.53,15.92,10.16 C16.31,11.45,16.51,12.81,16.51,14.2
+C16.51,16.85,14.36,19,11.71,19 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_phone_idle.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_phone_idle.xml
new file mode 100644
index 00000000..acffee1e
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_phone_idle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M9,2 C7.95,2,6.95,2.16,6,2.46 C10.06,3.73,13,7.52,13,12
+C13,16.48,10.06,20.27,6,21.54 C6.95,21.84,7.95,22,9,22 C14.52,22,19,17.52,19,12
+S14.52,2,9,2 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_print.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_print.xml
new file mode 100644
index 00000000..9d108c79
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_print.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M19,8 L5,8 C3.34,8,2,9.34,2,11 L2,17 L6,17 L6,21 L18,21 L18,17 L22,17 L22,11
+C22,9.34,20.66,8,19,8 Z M16,19 L8,19 L8,14 L16,14 L16,19 Z M19,12
+C18.45,12,18,11.55,18,11 S18.45,10,19,10 S20,10.45,20,11 S19.55,12,19,12 Z M18,3
+L6,3 L6,7 L18,7 L18,3 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_privacy.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_privacy.xml
new file mode 100644
index 00000000..9140dbda
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_privacy.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12,1 L3,5 L3,11 C3,16.55,6.84,21.74,12,23 C17.16,21.74,21,16.55,21,11 L21,5
+L12,1 Z M12,11.99 L19,11.99 C18.47,16.11,15.72,19.78,12,20.93 L12,12 L5,12
+L5,6.3 L12,3.19 L12,11.99 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_profiles.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_profiles.xml
new file mode 100644
index 00000000..37a894fa
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_profiles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M7,2 L7,13 L10,13 L10,22 L17,10 L13,10 L17,2 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_security.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_security.xml
new file mode 100644
index 00000000..388ff2e5
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_security.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M18,8 L17,8 L17,6 C17,3.24,14.76,1,12,1 S7,3.24,7,6 L7,8 L6,8 C4.9,8,4,8.9,4,10
+L4,20 C4,21.1,4.9,22,6,22 L18,22 C19.1,22,20,21.1,20,20 L20,10
+C20,8.9,19.1,8,18,8 Z M12,17 C10.9,17,10,16.1,10,15 S10.9,13,12,13
+S14,13.9,14,15 S13.1,17,12,17 Z M15.1,8 L8.9,8 L8.9,6 C8.9,4.29,10.29,2.9,12,2.9
+C13.71,2.9,15.1,4.29,15.1,6 L15.1,8 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_sim.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_sim.xml
new file mode 100644
index 00000000..20756904
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_sim.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M19.99,4 C19.99,2.9,19.1,2,18,2 L10,2 L4,8 L4,20 C4,21.1,4.9,22,6,22 L18.01,22
+C19.11,22,20,21.1,20,20 L19.99,4 Z M9,19 L7,19 L7,17 L9,17 L9,19 Z M17,19 L15,19
+L15,17 L17,17 L17,19 Z M9,15 L7,15 L7,11 L9,11 L9,15 Z M13,19 L11,19 L11,15
+L13,15 L13,19 Z M13,13 L11,13 L11,11 L13,11 L13,13 Z M17,15 L15,15 L15,11 L17,11
+L17,15 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_sounds.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_sounds.xml
new file mode 100644
index 00000000..a733edc0
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_sounds.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M17,2 L7,2 C5.9,2,5,2.9,5,4 L5,20 C5,21.1,5.9,21.99,7,21.99 L17,22
+C18.1,22,19,21.1,19,20 L19,4 C19,2.9,18.1,2,17,2 Z M12,4 C13.1,4,14,4.9,14,6
+S13.1,8,12,8 C10.89,8,10,7.1,10,6 S10.89,4,12,4 Z M12,20 C9.24,20,7,17.76,7,15
+S9.24,10,12,10 S17,12.24,17,15 S14.76,20,12,20 Z M12,12 C10.34,12,9,13.34,9,15
+S10.34,18,12,18 S15,16.66,15,15 S13.66,12,12,12 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_statusbar.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_statusbar.xml
new file mode 100644
index 00000000..6c3507c7
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_statusbar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M19,4 L5,4 C3.89,4,3,4.9,3,6 L3,18 C3,19.1,3.89,20,5,20 L19,20
+C20.1,20,21,19.1,21,18 L21,6 C21,4.9,20.11,4,19,4 Z M19,18 L5,18 L5,8 L19,8
+L19,18 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_storage.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_storage.xml
new file mode 100644
index 00000000..f1529ba5
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_storage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M2,20 L22,20 L22,16 L2,16 L2,20 Z M4,17 L6,17 L6,19 L4,19 L4,17 Z M2,4 L2,8
+L22,8 L22,4 L2,4 Z M6,7 L4,7 L4,5 L6,5 L6,7 Z M2,14 L22,14 L22,10 L2,10 L2,14 Z
+M4,11 L6,11 L6,13 L4,13 L4,11 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_supersu.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_supersu.xml
new file mode 100644
index 00000000..90efcdf4
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_supersu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M8,1.9978 C8,3.9978,8,5.9978,8,7.9978 C6,7.9978,4,7.9978,2,7.9978
+C2,8.66785,2,9.32776,2,9.9978 C4,9.9978,6,9.9978,8,9.9978
+C8,11.3278,8,12.6678,8,13.9978 C6,13.9978,4,13.9978,2,13.9978
+C2,14.6678,2,15.3278,2,15.9978 C4,15.9978,6,15.9978,8,15.9978
+C8,17.9978,8,19.9978,8,21.9978 C8.6667,21.9978,9.3333,21.9978,10,21.9978
+C10,19.9978,10,17.9978,10,15.9978 C11.3333,15.9978,12.6667,15.9978,14,15.9978
+C14,17.9978,14,19.9978,14,21.9978 C14.6667,21.9978,15.3333,21.9978,16,21.9978
+C16,19.9978,16,17.9978,16,15.9978 C18,15.9978,20,15.9978,22,15.9978
+C22,15.3278,22,14.6678,22,13.9978 C20,13.9978,18,13.9978,16,13.9978
+C16,12.6678,16,11.3278,16,9.9978 C18,9.9978,20,9.9978,22,9.9978
+C22,9.32776,22,8.66785,22,7.9978 C20,7.9978,18,7.9978,16,7.9978
+C16,5.9978,16,3.9978,16,1.9978 C15.3333,1.9978,14.6667,1.9978,14,1.9978
+C14,3.9978,14,5.9978,14,7.9978 C12.6667,7.9978,11.3333,7.9978,10,7.9978
+C10,5.9978,10,3.9978,10,1.9978 C9.3333,1.9978,8.6667,1.9978,8,1.9978 Z
+M10,9.9978 C11.3333,9.9978,12.6667,9.9978,14,9.9978
+C14,11.3278,14,12.6678,14,13.9978 C12.6667,13.9978,11.3333,13.9978,10,13.9978
+C10,12.6678,10,11.3278,10,9.9978 Z"/>
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_system.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_system.xml
new file mode 100644
index 00000000..83443e4b
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_system.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M13.5,0.67 S14.24,3.32,14.24,5.47 C14.24,7.53,12.89,9.2,10.83,9.2
+C8.76,9.2,7.2,7.53,7.2,5.47 L7.23,5.11 C5.21,7.51,4,10.62,4,14
+C4,18.42,7.58,22,12,22 S20,18.42,20,14 C20,8.61,17.41,3.8,13.5,0.67 Z M11.71,19
+C9.93,19,8.49,17.6,8.49,15.86 C8.49,14.24,9.54,13.1,11.3,12.74
+C13.07,12.38,14.9,11.53,15.92,10.16 C16.31,11.45,16.51,12.81,16.51,14.2
+C16.51,16.85,14.36,19,11.71,19 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_themes.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_themes.xml
new file mode 100644
index 00000000..b06f21c9
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_themes.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12,3 C7.03,3,3,7.03,3,12 S7.03,21,12,21 C12.83,21,13.5,20.33,13.5,19.5
+C13.5,19.11,13.35,18.76,13.11,18.49 C12.88,18.23,12.73,17.88,12.73,17.5
+C12.73,16.67,13.4,16,14.23,16 L16,16 C18.76,16,21,13.76,21,11
+C21,6.58,16.97,3,12,3 Z M6.5,12 C5.67,12,5,11.33,5,10.5 S5.67,9,6.5,9
+S8,9.67,8,10.5 S7.33,12,6.5,12 Z M9.5,8 C8.67,8,8,7.33,8,6.5 S8.67,5,9.5,5
+S11,5.67,11,6.5 S10.33,8,9.5,8 Z M14.5,8 C13.67,8,13,7.33,13,6.5 S13.67,5,14.5,5
+S16,5.67,16,6.5 S15.33,8,14.5,8 Z M17.5,12 C16.67,12,16,11.33,16,10.5
+S16.67,9,17.5,9 S19,9.67,19,10.5 S18.33,12,17.5,12 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_settings_wireless.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_wireless.xml
new file mode 100644
index 00000000..5bd9e47e
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_settings_wireless.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12.01,21.49 L23.64,7 C23.19,6.66,18.71,3,12,3 C5.28,3,0.81,6.66,0.36,7
+L11.99,21.49 L12,21.5 L12.01,21.49 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_sim_sd.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_sim_sd.xml
new file mode 100644
index 00000000..20756904
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_sim_sd.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M19.99,4 C19.99,2.9,19.1,2,18,2 L10,2 L4,8 L4,20 C4,21.1,4.9,22,6,22 L18.01,22
+C19.11,22,20,21.1,20,20 L19.99,4 Z M9,19 L7,19 L7,17 L9,17 L9,19 Z M17,19 L15,19
+L15,17 L17,17 L17,19 Z M9,15 L7,15 L7,11 L9,11 L9,15 Z M13,19 L11,19 L11,15
+L13,15 L13,19 Z M13,13 L11,13 L11,11 L13,11 L13,13 Z M17,15 L15,15 L15,11 L17,11
+L17,15 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_sysbar_quicksettings.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_sysbar_quicksettings.xml
new file mode 100644
index 00000000..e5159633
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_sysbar_quicksettings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M19.43,12.98 C19.47,12.66,19.5,12.34,19.5,12 S19.47,11.34,19.43,11.02
+L21.54,9.37 C21.73,9.22,21.78,8.95,21.66,8.73 L19.66,5.27
+C19.54,5.05,19.27,4.97,19.05,5.05 L16.56,6.05 C16.04,5.65,15.48,5.32,14.87,5.07
+L14.49,2.42 C14.46,2.18,14.25,2,14,2 L10,2 C9.75,2,9.54,2.18,9.51,2.42
+L9.13,5.07 C8.52,5.32,7.96,5.66,7.44,6.05 L4.95,5.05
+C4.72,4.96,4.46,5.05,4.34,5.27 L2.34,8.73 C2.21,8.95,2.27,9.22,2.46,9.37
+L4.57,11.02 C4.53,11.34,4.5,11.67,4.5,12 S4.53,12.66,4.57,12.98 L2.46,14.63
+C2.27,14.78,2.22,15.05,2.34,15.27 L4.34,18.73 C4.46,18.95,4.73,19.03,4.95,18.95
+L7.44,17.95 C7.96,18.35,8.52,18.68,9.13,18.93 L9.51,21.58
+C9.54,21.82,9.75,22,10,22 L14,22 C14.25,22,14.46,21.82,14.49,21.58 L14.87,18.93
+C15.48,18.68,16.04,18.34,16.56,17.95 L19.05,18.95
+C19.28,19.04,19.54,18.95,19.66,18.73 L21.66,15.27
+C21.78,15.05,21.73,14.78,21.54,14.63 L19.43,12.98 Z M12,15.5
+C10.07,15.5,8.5,13.93,8.5,12 S10.07,8.5,12,8.5 S15.5,10.07,15.5,12
+S13.93,15.5,12,15.5 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_xd_animation.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_xd_animation.xml
new file mode 100644
index 00000000..0b8fcd61
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_xd_animation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M12,2 C6.48,2,2,6.48,2,12 S6.48,22,12,22 S22,17.52,22,12 S17.52,2,12,2 Z
+M10,16.5 L10,7.5 L16,12 L10,16.5 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/drawable/ic_xd_recents.xml b/overlay/common/packages/apps/Settings/res/drawable/ic_xd_recents.xml
new file mode 100644
index 00000000..5d37da7d
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/drawable/ic_xd_recents.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BlissROM icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M7,19 L17,19 L17,4 L7,4 L7,19 Z M2,17 L6,17 L6,6 L2,6 L2,17 Z M18,6 L18,17
+L22,17 L22,6 L18,6 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/values/colors.xml b/overlay/common/packages/apps/Settings/res/values/colors.xml
new file mode 100644
index 00000000..e5176225
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/values/colors.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Theme -->
+    <color name="primary">@*common:color/primary</color>
+    <color name="primary_dark">@*common:color/primary_dark</color>
+    <color name="accent">@*common:color/accent</color>
+
+    <!-- Switchbar -->
+    <color name="switchbar_background_color">@*common:color/primary_lighter</color>
+    <color name="switch_accent_color">@*common:color/icons</color>
+
+    <!-- Icons (?) -->
+    <color name="icon_accent">@*common:color/accent</color>
+    <color name="icons_color">@*common:color/accent</color>
+
+    <!-- Category -->
+    <color name="dashboard_category_background_color">@drawable/dashboard_category_background</color>
+    <color name="dashboard_background_color">@*common:color/background</color>
+    <color name="category_title_color">@*common:color/primary</color>
+
+    <!-- Miscellaneous -->
+    <color name="running_processes_apps_ram">@*common:color/accent</color>
+    <color name="theme_accent">@*common:color/accent</color>
+    <color name="navbar_edit_icon_color">@*common:color/accent</color>
+
+    <!-- Storage Summary Hard colors-->
+    <color name="storage_summary_text_color">@*common:color/primary_text</color>
+    <color name="storage_summary_used_text_color">@*common:color/secondary_text</color>
+    <color name="storage_volume_color_public">#ff9e9e9e</color>
+    <color name="storage_volume_color_warning">#fff4511e</color>
+    <color name="storage_volume_color_private1">@*common:color/accent</color> <!-- teal -->
+    <color name="storage_volume_color_private2">@*common:color/accent</color> <!-- purple -->
+    <color name="storage_volume_color_private3">@*common:color/accent</color> <!-- orange -->
+    <color name="storage_volume_color_private4">@*common:color/accent</color> <!-- pink -->
+    <color name="storage_volume_color_private5">@*common:color/accent</color> <!-- green -->
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Settings/res/values/dimens.xml b/overlay/common/packages/apps/Settings/res/values/dimens.xml
new file mode 100644
index 00000000..aaa3f434
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Cards Style -->
+    <dimen name="dashboard_padding_start">8.0dip</dimen>
+    <dimen name="dashboard_padding_end">8.0dip</dimen>
+    <dimen name="dashboard_padding_top">8.0dip</dimen>
+    <dimen name="dashboard_padding_bottom">0.0dip</dimen>
+
+    <!-- Category card radius -->
+    <dimen name="dashboard_radius">2.0dip</dimen>
+
+    <!-- Category -->
+    <dimen name="dashboard_category_elevation">2.0dip</dimen>
+    <dimen name="dashboard_category_title_margin_start">16.0dip</dimen>
+    <dimen name="dashboard_category_title_height">48dp</dimen>
+    <dimen name="dashboard_tile_image_size">32.0dip</dimen>
+    <dimen name="dashboard_category_padding_start">0.0dip</dimen>
+    <dimen name="dashboard_category_padding_end">0.0dip</dimen>
+
+</resources>
+
diff --git a/overlay/common/packages/apps/Settings/res/values/styles.xml b/overlay/common/packages/apps/Settings/res/values/styles.xml
new file mode 100644
index 00000000..2bbb75ff
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/values/styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Settings">
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+    </style>
+
+    <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">
+        <item name="android:textColor">@color/category_title_color</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/ThemeChooser/res/values/colors.xml b/overlay/common/packages/apps/ThemeChooser/res/values/colors.xml
new file mode 100644
index 00000000..5cd521c0
--- /dev/null
+++ b/overlay/common/packages/apps/ThemeChooser/res/values/colors.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="detailedview_pager_background">#ffeeeeee</color>
+    <color name="title_author_background">#ffffff</color>
+    <color name="offwhite">#e9e8e8</color>
+    <color name="author_grey">#808184</color>
+
+    <color name="primary">@*common:color/primary</color>
+    <color name="primary_dark">@*common:color/primary_dark</color>
+    <color name="accent">@*common:color/accent</color>
+    <color name="actionbar_text_color">#fff</color>
+    <color name="primary_text_color">#000</color>
+
+    <color name="apply_button_text_color_enabled">#ffffff</color>
+    <color name="apply_button_text_color_disabled">#bbbbbb</color>
+
+    <color name="apply_button_progress_color">@*common:color/material_color_500</color>
+    <color name="apply_button_default_color">@*common:color/material_color_700</color>
+    <color name="apply_button_pressed_color">@*common:color/material_color_800</color>
+
+    <color name="designed_for_color">#ff8888</color>
+
+    <!-- Drawer -->
+    <color name="drawer_item_textcolor">#fff</color>
+    <color name="drawer_item_default">@*common:color/primary</color>
+    <color name="drawer_item_pressed">@*common:color/primary_lighter</color>
+    <color name="drawer_divider_line">#ffffff</color>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/ThemeChooser/res/values/style.xml b/overlay/common/packages/apps/ThemeChooser/res/values/style.xml
new file mode 100644
index 00000000..62928b51
--- /dev/null
+++ b/overlay/common/packages/apps/ThemeChooser/res/values/style.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Material.Light">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:actionMenuTextColor">@android:color/white</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/Trebuchet/res/drawable-xxxhdpi/ic_allapps.png b/overlay/common/packages/apps/Trebuchet/res/drawable-xxxhdpi/ic_allapps.png
new file mode 100644
index 00000000..3b507ef0
Binary files /dev/null and b/overlay/common/packages/apps/Trebuchet/res/drawable-xxxhdpi/ic_allapps.png differ
diff --git a/overlay/common/packages/apps/Trebuchet/res/drawable-xxxhdpi/ic_allapps_pressed.png b/overlay/common/packages/apps/Trebuchet/res/drawable-xxxhdpi/ic_allapps_pressed.png
new file mode 100644
index 00000000..3b507ef0
Binary files /dev/null and b/overlay/common/packages/apps/Trebuchet/res/drawable-xxxhdpi/ic_allapps_pressed.png differ
diff --git a/overlay/common/packages/apps/Trebuchet/res/values/colors.xml b/overlay/common/packages/apps/Trebuchet/res/values/colors.xml
new file mode 100644
index 00000000..28f53b4c
--- /dev/null
+++ b/overlay/common/packages/apps/Trebuchet/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="settings_header_text">@*common:color/accent_fallback</color>
+    <color name="settings_bg_color">@*common:color/material_color_800</color>
+    <color name="settings_bg_header_color">@*common:color/accent_fallback</color>
+    <color name="settings_bg_selected_color">@*common:color/material_color_800</color>
+    <color name="settings_transition_selected_color">@*common:color/cards</color>
+
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_background_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_background_lxx_dark.9.png
new file mode 100644
index 00000000..473fcb44
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_background_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_background_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_background_lxx_light.9.png
new file mode 100644
index 00000000..473fcb44
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_background_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_suggest_strip_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_suggest_strip_lxx_dark.9.png
new file mode 100644
index 00000000..fd6eaa50
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_suggest_strip_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_suggest_strip_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_suggest_strip_lxx_light.9.png
new file mode 100644
index 00000000..fd6eaa50
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-nodpi/keyboard_suggest_strip_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
new file mode 100644
index 00000000..1232613f
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png
new file mode 100644
index 00000000..1232613f
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
new file mode 100644
index 00000000..a0b5c2e7
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png
new file mode 100644
index 00000000..a0b5c2e7
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png
new file mode 100644
index 00000000..e338ae3c
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png
new file mode 100644
index 00000000..e338ae3c
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
new file mode 100644
index 00000000..45899e3d
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png
new file mode 100644
index 00000000..45899e3d
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png
new file mode 100644
index 00000000..88bf4d50
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png
new file mode 100644
index 00000000..88bf4d50
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png
new file mode 100644
index 00000000..f30b30f9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png
new file mode 100644
index 00000000..f30b30f9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png
new file mode 100644
index 00000000..c57c63ca
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png
new file mode 100644
index 00000000..c57c63ca
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png
new file mode 100644
index 00000000..7607f52c
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png
new file mode 100644
index 00000000..7607f52c
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png
new file mode 100644
index 00000000..acde2400
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png
new file mode 100644
index 00000000..acde2400
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png
new file mode 100644
index 00000000..35ca9dbc
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png
new file mode 100644
index 00000000..35ca9dbc
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
new file mode 100644
index 00000000..e68dbc88
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
new file mode 100644
index 00000000..e68dbc88
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
new file mode 100644
index 00000000..5cc9d4ea
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
new file mode 100644
index 00000000..5cc9d4ea
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png
new file mode 100644
index 00000000..c3d2dde2
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png
new file mode 100644
index 00000000..c3d2dde2
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_dark.png
new file mode 100644
index 00000000..73347997
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_light.png
new file mode 100644
index 00000000..73347997
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_dark.png
new file mode 100644
index 00000000..3f70e5ab
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_light.png
new file mode 100644
index 00000000..3f70e5ab
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_activated_lxx_dark.png
new file mode 100644
index 00000000..0198bce9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_activated_lxx_light.png
new file mode 100644
index 00000000..0198bce9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_dark.png
new file mode 100644
index 00000000..d9022bbe
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_light.png
new file mode 100644
index 00000000..d9022bbe
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_dark.png
new file mode 100644
index 00000000..12d2367e
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_light.png
new file mode 100644
index 00000000..12d2367e
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_dark.png
new file mode 100644
index 00000000..f6d1885c
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_light.png
new file mode 100644
index 00000000..f6d1885c
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_dark.png
new file mode 100644
index 00000000..fd9b1c40
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_light.png
new file mode 100644
index 00000000..fd9b1c40
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_dark.png
new file mode 100644
index 00000000..086e757d
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_light.png
new file mode 100644
index 00000000..086e757d
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_activated_lxx_dark.png
new file mode 100644
index 00000000..efbf51c1
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_activated_lxx_light.png
new file mode 100644
index 00000000..efbf51c1
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_normal_lxx_dark.png
new file mode 100644
index 00000000..f5531ea1
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_normal_lxx_light.png
new file mode 100644
index 00000000..f5531ea1
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_nature_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_activated_lxx_dark.png
new file mode 100644
index 00000000..730f75d9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_activated_lxx_light.png
new file mode 100644
index 00000000..730f75d9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_dark.png
new file mode 100644
index 00000000..4658ceac
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_light.png
new file mode 100644
index 00000000..4658ceac
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_activated_lxx_dark.png
new file mode 100644
index 00000000..b70f07ac
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_activated_lxx_light.png
new file mode 100644
index 00000000..b70f07ac
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_normal_lxx_dark.png
new file mode 100644
index 00000000..c960d15e
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_normal_lxx_light.png
new file mode 100644
index 00000000..c960d15e
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_people_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_activated_lxx_dark.png
new file mode 100644
index 00000000..bca6bbaa
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_activated_lxx_light.png
new file mode 100644
index 00000000..bca6bbaa
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_normal_lxx_dark.png
new file mode 100644
index 00000000..a06e1d85
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_normal_lxx_light.png
new file mode 100644
index 00000000..a06e1d85
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_places_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_activated_lxx_dark.png
new file mode 100644
index 00000000..3508374b
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_activated_lxx_light.png
new file mode 100644
index 00000000..3508374b
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_dark.png
new file mode 100644
index 00000000..6797d7b3
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_light.png
new file mode 100644
index 00000000..6797d7b3
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_activated_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_activated_lxx_dark.png
new file mode 100644
index 00000000..51336e93
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_activated_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_activated_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_activated_lxx_light.png
new file mode 100644
index 00000000..51336e93
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_activated_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_dark.png
new file mode 100644
index 00000000..e02ad617
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_light.png
new file mode 100644
index 00000000..e02ad617
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png
new file mode 100644
index 00000000..4a0ec2c9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_light.9.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_light.9.png
new file mode 100644
index 00000000..4a0ec2c9
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_light.9.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.png
new file mode 100644
index 00000000..0dc783d7
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.png
new file mode 100644
index 00000000..0dc783d7
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_delete_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_delete_lxx_dark.png
new file mode 100644
index 00000000..ac154975
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_delete_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_delete_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_delete_lxx_light.png
new file mode 100644
index 00000000..ac154975
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_delete_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_language_switch_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_language_switch_lxx_dark.png
new file mode 100644
index 00000000..26f36154
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_language_switch_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_language_switch_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_language_switch_lxx_light.png
new file mode 100644
index 00000000..26f36154
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_language_switch_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png
new file mode 100644
index 00000000..6d7f94f0
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png
new file mode 100644
index 00000000..6d7f94f0
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_dark.png
new file mode 100644
index 00000000..da9b0c60
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png
new file mode 100644
index 00000000..da9b0c60
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_lxx_dark.png
new file mode 100644
index 00000000..9d5b7330
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_lxx_light.png
new file mode 100644
index 00000000..9d5b7330
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_off_lxx_dark.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_off_lxx_dark.png
new file mode 100644
index 00000000..e233d099
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_off_lxx_dark.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_off_lxx_light.png b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_off_lxx_light.png
new file mode 100644
index 00000000..e233d099
Binary files /dev/null and b/overlay/common/packages/inputmethods/LatinIME/java/res/drawable-xxxhdpi/sym_keyboard_voice_off_lxx_light.png differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/values/colors.xml b/overlay/common/packages/inputmethods/LatinIME/java/res/values/colors.xml
new file mode 100644
index 00000000..3dfb2d2f
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/values/colors.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Dark Material Theme -->
+    <color name="key_background_lxx_dark">@*common:color/primary</color>
+    <color name="key_background_pressed_lxx_dark">#ff303030</color>
+    <color name="key_text_color_lxx_dark">#ccffffff</color>
+    <color name="suggested_word_color_lxx_dark">#ccffffff</color>
+    <color name="key_functional_text_color_lxx_dark">#ccffffff</color>
+    <color name="key_text_inactive_color_lxx_dark">#80ffffff</color>
+    <color name="key_hint_letter_color_lxx_dark">#80ffffff</color>
+    <color name="language_on_spacebar_text_color_lxx_dark">#b3ffffff</color>
+    <color name="highlight_color_lxx_dark">#ffffffff</color>
+    <color name="auto_correct_color_lxx_dark">#ffffffff</color>
+    <color name="typed_word_color_lxx_dark">#d9ffffff</color>
+    <color name="gesture_trail_color_lxx_dark">#ff616161</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">#b3424242</color>
+    <color name="gesture_floating_preview_color_lxx_dark">#df424242</color>
+    <color name="suggested_word_background_selected_lxx_dark">#19ffffff</color>
+    <color name="emoji_tab_page_indicator_background_lxx_dark">@*common:color/primary</color>
+    <!-- Light Material Theme -->
+
+    <color name="key_background_lxx_light">@*common:color/primary</color>
+    <color name="key_background_pressed_lxx_light">#ff303030</color>
+    <color name="key_text_color_lxx_light">#ccffffff</color>
+    <color name="suggested_word_color_lxx_light">#ccffffff</color>
+    <color name="key_functional_text_color_lxx_light">#ccffffff</color>
+    <color name="key_text_inactive_color_lxx_light">#80ffffff</color>
+    <color name="key_hint_letter_color_lxx_light">#80ffffff</color>
+    <color name="language_on_spacebar_text_color_lxx_light">#b3ffffff</color>
+    <color name="highlight_color_lxx_light">#ffffffff</color>
+    <color name="auto_correct_color_lxx_light">#ffffffff</color>
+    <color name="typed_word_color_lxx_light">#d9ffffff</color>
+    <color name="gesture_trail_color_lxx_light">#ff616161</color>
+    <color name="sliding_key_input_preview_color_lxx_light">#b3424242</color>
+    <color name="gesture_floating_preview_color_lxx_light">#df424242</color>
+    <color name="suggested_word_background_selected_lxx_light">#19ffffff</color>
+    <color name="emoji_tab_page_indicator_background_lxx_light">@*common:color/primary</color>
+
+    <!-- Misc -->
+    <color name="notification_accent_color">@*common:color/accent</color>
+</resources>
\ No newline at end of file
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/values/dimens.xml b/overlay/common/packages/inputmethods/LatinIME/java/res/values/dimens.xml
new file mode 100644
index 00000000..626a9c94
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/values/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="config_gesture_floating_preview_horizontal_padding">8.0dip</dimen>
+    <dimen name="config_gesture_floating_preview_vertical_padding">8.0dip</dimen>
+    <dimen name="config_gesture_floating_preview_round_radius">2.0dip</dimen>
+
+</resources>
\ No newline at end of file