From 7f45cef86fc183c3d2efa2496cd3e350bcbd3d37 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 19 May 2025 15:35:14 +0530
Subject: [PATCH 1/2] Theme app according to our palette

---
 ...ingerprint_background_1_path_animation.xml | 18 ++---
 ...ingerprint_background_2_path_animation.xml | 18 ++---
 ...ingerprint_background_5_path_animation.xml | 18 ++---
 ...ingerprint_background_6_path_animation.xml | 18 ++---
 ...ingerprint_background_7_path_animation.xml | 18 ++---
 .../settings_two_pane_background_color.xml    | 18 -----
 .../accent_select_primary_text.xml            | 18 -----
 .../accent_select_secondary_text.xml          | 18 -----
 .../settings_two_pane_background_color.xml    | 18 -----
 .../settings_two_pane_background_color.xml    |  4 +-
 res/color/accent_select_background.xml        |  2 +-
 .../settings_two_pane_background_color.xml    |  2 +-
 .../enrollment_fingerprint_isolated.xml       | 10 +--
 res/drawable/fp_illustration_enrollment.xml   | 10 +--
 .../ic_accessibility_magnification_ftsw.xml   | 29 ++++++++
 .../ic_adaptive_font_download_ftsw.xml        | 26 +++++++
 res/drawable/ic_e_settings_about.xml          | 40 +++++++++++
 res/drawable/ic_e_settings_accessibility.xml  | 38 +++++++++++
 res/drawable/ic_e_settings_accounts.xml       | 57 ++++++++++++++++
 .../ic_e_settings_advanced_privacy.xml        | 41 +++++++++++
 res/drawable/ic_e_settings_apps.xml           | 48 +++++++++++++
 res/drawable/ic_e_settings_battery.xml        | 54 +++++++++++++++
 res/drawable/ic_e_settings_devices_other.xml  | 40 +++++++++++
 res/drawable/ic_e_settings_display.xml        | 68 +++++++++++++++++++
 res/drawable/ic_e_settings_emergency.xml      | 55 +++++++++++++++
 res/drawable/ic_e_settings_location.xml       | 36 ++++++++++
 res/drawable/ic_e_settings_modes.xml          | 32 +++++++++
 res/drawable/ic_e_settings_notifications.xml  | 45 ++++++++++++
 res/drawable/ic_e_settings_privacy.xml        | 37 ++++++++++
 res/drawable/ic_e_settings_security.xml       | 37 ++++++++++
 res/drawable/ic_e_settings_sound.xml          | 41 +++++++++++
 res/drawable/ic_e_settings_storage.xml        | 47 +++++++++++++
 res/drawable/ic_e_settings_system.xml         | 43 ++++++++++++
 res/drawable/ic_e_settings_updater.xml        | 42 ++++++++++++
 res/drawable/ic_e_settings_wallpaper.xml      | 40 +++++++++++
 res/drawable/ic_e_settings_wireless.xml       | 41 +++++++++++
 res/drawable/ic_files_go_round.xml            | 56 +++++++++++++++
 res/drawable/ic_homepage_advanced_privacy.xml | 39 -----------
 res/drawable/ic_lock_pin.xml                  |  2 +-
 res/drawable/ic_password.xml                  |  8 +--
 res/drawable/ic_pattern.xml                   | 10 +--
 res/drawable/ic_pin.xml                       |  2 +-
 res/drawable/ic_screen_zoom_ftsw.xml          | 26 +++++++
 res/drawable/ring_progress.xml                |  2 +-
 .../settingslib_main_switch_bar.xml           |  5 +-
 res/layout/homepage_preference.xml            |  6 +-
 res/layout/notification_history.xml           |  2 +-
 .../preference_widget_switch_compat.xml       |  5 +-
 res/values-night/colors.xml                   |  6 +-
 res/values-night/themes.xml                   |  4 +-
 res/values/colors.xml                         |  6 +-
 res/values/styles.xml                         |  4 +-
 res/values/themes.xml                         |  7 +-
 ...ccessibility_settings_for_setup_wizard.xml |  4 +-
 res/xml/storage_category_fragment.xml         |  1 +
 res/xml/storage_dashboard_fragment.xml        |  1 +
 res/xml/top_level_settings.xml                | 42 ++++++------
 .../ManageStoragePreferenceController.java    |  1 -
 .../settings/homepage/TopLevelSettings.java   |  7 --
 ...ighlightableTopLevelPreferenceAdapter.java |  8 ---
 60 files changed, 1117 insertions(+), 264 deletions(-)
 delete mode 100644 res/color-night-v35/settings_two_pane_background_color.xml
 delete mode 100644 res/color-night/accent_select_primary_text.xml
 delete mode 100644 res/color-night/accent_select_secondary_text.xml
 delete mode 100644 res/color-night/settings_two_pane_background_color.xml
 create mode 100644 res/drawable/ic_accessibility_magnification_ftsw.xml
 create mode 100644 res/drawable/ic_adaptive_font_download_ftsw.xml
 create mode 100644 res/drawable/ic_e_settings_about.xml
 create mode 100644 res/drawable/ic_e_settings_accessibility.xml
 create mode 100644 res/drawable/ic_e_settings_accounts.xml
 create mode 100644 res/drawable/ic_e_settings_advanced_privacy.xml
 create mode 100644 res/drawable/ic_e_settings_apps.xml
 create mode 100644 res/drawable/ic_e_settings_battery.xml
 create mode 100644 res/drawable/ic_e_settings_devices_other.xml
 create mode 100644 res/drawable/ic_e_settings_display.xml
 create mode 100644 res/drawable/ic_e_settings_emergency.xml
 create mode 100644 res/drawable/ic_e_settings_location.xml
 create mode 100644 res/drawable/ic_e_settings_modes.xml
 create mode 100644 res/drawable/ic_e_settings_notifications.xml
 create mode 100644 res/drawable/ic_e_settings_privacy.xml
 create mode 100644 res/drawable/ic_e_settings_security.xml
 create mode 100644 res/drawable/ic_e_settings_sound.xml
 create mode 100644 res/drawable/ic_e_settings_storage.xml
 create mode 100644 res/drawable/ic_e_settings_system.xml
 create mode 100644 res/drawable/ic_e_settings_updater.xml
 create mode 100644 res/drawable/ic_e_settings_wallpaper.xml
 create mode 100644 res/drawable/ic_e_settings_wireless.xml
 create mode 100644 res/drawable/ic_files_go_round.xml
 delete mode 100644 res/drawable/ic_homepage_advanced_privacy.xml
 create mode 100644 res/drawable/ic_screen_zoom_ftsw.xml

diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
index 60654fc7824..d85ac2047f6 100644
--- a/res/anim/enrollment_fingerprint_background_1_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
@@ -21,27 +21,17 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#000000"
-            android:valueTo="#4285F4"
+            android:valueFrom="@color/e_fingerprint_hint"
+            android:valueTo="@*android:color/accent_device_default"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.07"
-            android:valueTo="0.65" />
     </set>
     <set
         android:ordering="together" >
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#4285F4"
-            android:valueTo="#000000"
+            android:valueFrom="@*android:color/accent_device_default"
+            android:valueTo="@color/e_fingerprint_hint"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.65"
-            android:valueTo="0.07" />
     </set>
 </set>
diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
index 60654fc7824..d85ac2047f6 100644
--- a/res/anim/enrollment_fingerprint_background_2_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
@@ -21,27 +21,17 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#000000"
-            android:valueTo="#4285F4"
+            android:valueFrom="@color/e_fingerprint_hint"
+            android:valueTo="@*android:color/accent_device_default"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.07"
-            android:valueTo="0.65" />
     </set>
     <set
         android:ordering="together" >
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#4285F4"
-            android:valueTo="#000000"
+            android:valueFrom="@*android:color/accent_device_default"
+            android:valueTo="@color/e_fingerprint_hint"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.65"
-            android:valueTo="0.07" />
     </set>
 </set>
diff --git a/res/anim/enrollment_fingerprint_background_5_path_animation.xml b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
index 60654fc7824..d85ac2047f6 100644
--- a/res/anim/enrollment_fingerprint_background_5_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
@@ -21,27 +21,17 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#000000"
-            android:valueTo="#4285F4"
+            android:valueFrom="@color/e_fingerprint_hint"
+            android:valueTo="@*android:color/accent_device_default"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.07"
-            android:valueTo="0.65" />
     </set>
     <set
         android:ordering="together" >
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#4285F4"
-            android:valueTo="#000000"
+            android:valueFrom="@*android:color/accent_device_default"
+            android:valueTo="@color/e_fingerprint_hint"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.65"
-            android:valueTo="0.07" />
     </set>
 </set>
diff --git a/res/anim/enrollment_fingerprint_background_6_path_animation.xml b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
index 60654fc7824..d85ac2047f6 100644
--- a/res/anim/enrollment_fingerprint_background_6_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
@@ -21,27 +21,17 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#000000"
-            android:valueTo="#4285F4"
+            android:valueFrom="@color/e_fingerprint_hint"
+            android:valueTo="@*android:color/accent_device_default"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.07"
-            android:valueTo="0.65" />
     </set>
     <set
         android:ordering="together" >
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#4285F4"
-            android:valueTo="#000000"
+            android:valueFrom="@*android:color/accent_device_default"
+            android:valueTo="@color/e_fingerprint_hint"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.65"
-            android:valueTo="0.07" />
     </set>
 </set>
diff --git a/res/anim/enrollment_fingerprint_background_7_path_animation.xml b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
index 60654fc7824..d85ac2047f6 100644
--- a/res/anim/enrollment_fingerprint_background_7_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
@@ -21,27 +21,17 @@
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#000000"
-            android:valueTo="#4285F4"
+            android:valueFrom="@color/e_fingerprint_hint"
+            android:valueTo="@*android:color/accent_device_default"
             android:interpolator="@android:interpolator/linear_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.07"
-            android:valueTo="0.65" />
     </set>
     <set
         android:ordering="together" >
         <objectAnimator
             android:duration="300"
             android:propertyName="fillColor"
-            android:valueFrom="#4285F4"
-            android:valueTo="#000000"
+            android:valueFrom="@*android:color/accent_device_default"
+            android:valueTo="@color/e_fingerprint_hint"
             android:interpolator="@android:interpolator/fast_out_slow_in" />
-        <objectAnimator
-            android:duration="300"
-            android:propertyName="fillAlpha"
-            android:valueFrom="0.65"
-            android:valueTo="0.07" />
     </set>
 </set>
diff --git a/res/color-night-v35/settings_two_pane_background_color.xml b/res/color-night-v35/settings_two_pane_background_color.xml
deleted file mode 100644
index 1d5daf29f77..00000000000
--- a/res/color-night-v35/settings_two_pane_background_color.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2024 The Android Open Source 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_surface_dim_dark" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/accent_select_primary_text.xml b/res/color-night/accent_select_primary_text.xml
deleted file mode 100644
index 049ddf63678..00000000000
--- a/res/color-night/accent_select_primary_text.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorPrimaryInverse" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/accent_select_secondary_text.xml b/res/color-night/accent_select_secondary_text.xml
deleted file mode 100644
index 6b7b4f27dcf..00000000000
--- a/res/color-night/accent_select_secondary_text.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorSecondaryInverse" />
-</selector>
\ No newline at end of file
diff --git a/res/color-night/settings_two_pane_background_color.xml b/res/color-night/settings_two_pane_background_color.xml
deleted file mode 100644
index 86aa0ed1855..00000000000
--- a/res/color-night/settings_two_pane_background_color.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 The Android Open Source 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500" android:lStar="5" />
-</selector>
\ No newline at end of file
diff --git a/res/color-v35/settings_two_pane_background_color.xml b/res/color-v35/settings_two_pane_background_color.xml
index ff305abada2..2f34f7761e7 100644
--- a/res/color-v35/settings_two_pane_background_color.xml
+++ b/res/color-v35/settings_two_pane_background_color.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_surface_dim_light" />
-</selector>
\ No newline at end of file
+    <item android:color="@*android:color/e_background" />
+</selector>
diff --git a/res/color/accent_select_background.xml b/res/color/accent_select_background.xml
index 5dab7230532..fbbd8da462b 100644
--- a/res/color/accent_select_background.xml
+++ b/res/color/accent_select_background.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_accent2_500" android:lStar="80" />
+    <item android:color="@*android:color/accent_device_default" android:alpha="0.20" />
 </selector>
\ No newline at end of file
diff --git a/res/color/settings_two_pane_background_color.xml b/res/color/settings_two_pane_background_color.xml
index 6cb8e703077..d3f0a3958d6 100644
--- a/res/color/settings_two_pane_background_color.xml
+++ b/res/color/settings_two_pane_background_color.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral1_500" android:lStar="87" />
+    <item android:color="?android:attr/colorBackground" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/enrollment_fingerprint_isolated.xml b/res/drawable/enrollment_fingerprint_isolated.xml
index 960552f4bce..80533ad6d2e 100644
--- a/res/drawable/enrollment_fingerprint_isolated.xml
+++ b/res/drawable/enrollment_fingerprint_isolated.xml
@@ -30,7 +30,7 @@
             <path
                 android:name="ridge_5_path"
                 android:pathData="M 24.9488677979,32.3508300781 c -1.81059265137,0.338500976562 -3.58520507812,0.447387695312 -4.62879943848,0.447387695312 c -4.12730407715,0.0 -8.05894470215,-0.96842956543 -11.5207061768,-3.45275878906 c -5.33699035645,-3.830078125 -8.56369018555,-10.0885009766 -8.56369018555,-17.1589355469"
-                android:strokeColor="#4D4285F4"
+                android:strokeColor="@*android:color/accent_device_default"
                 android:strokeWidth="5"
                 android:strokeLineCap="round"
                 android:trimPathEnd="0" />
@@ -40,7 +40,7 @@
             <path
                 android:name="ridge_7_path"
                 android:pathData="M -9.23379516602,40.8356933594 c -3.24549865723,-3.46032714844 -5.1540222168,-5.77195739746 -7.87710571289,-10.9068603516 c -2.76379394531,-5.21166992188 -4.04838562012,-11.3482666016 -4.04838562012,-17.6915283203 c 0.0,-11.6563720703 9.44940185547,-21.1059570312 21.1058959961,-21.1059570312 c 11.6564941406,0.0 21.1058959961,9.44958496094 21.1058959961,21.1059570312"
-                android:strokeColor="#4D4285F4"
+                android:strokeColor="@*android:color/accent_device_default"
                 android:strokeWidth="5"
                 android:strokeLineCap="round"
                 android:trimPathEnd="0" />
@@ -50,7 +50,7 @@
             <path
                 android:name="ridge_6_path"
                 android:pathData="M -28.8249053955,28.5169677734 c -2.41259765625,-6.82202148438 -2.85319519043,-12.3121337891 -2.85319519043,-16.3226318359 c 0.0,-4.64868164062 0.792999267578,-9.06323242188 2.59269714355,-13.0396728516 c 4.96929931641,-10.9801025391 16.0211029053,-18.619140625 28.857208252,-18.619140625 c 17.4846954346,0.0 31.6587982178,14.1740722656 31.6587982178,31.6588134766 c 0.0,5.82824707031 -4.72470092773,10.5529785156 -10.5529022217,10.5529785156 c -5.82820129395,0.0 -10.5529937744,-4.72473144531 -10.5529937744,-10.5529785156 c 0.0,-5.82824707031 -4.72470092773,-10.5529785156 -10.5529022217,-10.5529785156 c -5.82820129395,0.0 -10.5529022217,4.72473144531 -10.5529022217,10.5529785156 c 0.0,8.17932128906 3.10879516602,15.5925292969 8.25030517578,21.0004882812 c 3.88919067383,4.09069824219 7.77758789062,6.64123535156 14.2838897705,8.52136230469"
-                android:strokeColor="#4D4285F4"
+                android:strokeColor="@*android:color/accent_device_default"
                 android:strokeWidth="5"
                 android:strokeLineCap="round"
                 android:trimPathStart="1" />
@@ -60,7 +60,7 @@
             <path
                 android:name="ridge_2_path"
                 android:pathData="M -34.4861907959,-11.6943359375 c 3.78790283203,-5.64636230469 8.36389160156,-9.94665527344 14.3594970703,-13.2164306641 c 5.99560546875,-3.26977539062 12.8716125488,-5.1279296875 20.1817016602,-5.1279296875 c 7.27980041504,0.0 14.129196167,1.84289550781 20.1071014404,5.08740234375 c 5.97790527344,3.24450683594 10.7957000732,7.759765625 14.5897064209,13.3666992188"
-                android:strokeColor="#4D4285F4"
+                android:strokeColor="@*android:color/accent_device_default"
                 android:strokeWidth="5"
                 android:strokeLineCap="round"
                 android:trimPathStart="1" />
@@ -72,7 +72,7 @@
             <path
                 android:name="ridge_1_path"
                 android:pathData="M 121.472564697,107.859741211 c -7.39790344238,-4.03979492188 -15.2462921143,-6.34167480469 -24.3116912842,-6.34167480469 c -9.06539916992,0.0 -16.2951049805,2.40405273438 -23.12550354,6.34167480469"
-                android:strokeColor="#4D4285F4"
+                android:strokeColor="@*android:color/accent_device_default"
                 android:strokeWidth="5"
                 android:strokeLineCap="round"
                 android:trimPathEnd="0" />
diff --git a/res/drawable/fp_illustration_enrollment.xml b/res/drawable/fp_illustration_enrollment.xml
index be98a87bdb9..20e6d996958 100644
--- a/res/drawable/fp_illustration_enrollment.xml
+++ b/res/drawable/fp_illustration_enrollment.xml
@@ -23,23 +23,23 @@ Copyright (C) 2015 The Android Open Source Project
         android:translateY="44">
         <path
             android:name="background_5_path"
-            android:fillColor="#12000000"
+            android:fillColor="@color/e_fingerprint_hint"
             android:pathData="M67.74,11.59c-0.41,0.0 -0.82,-0.1 -1.2,-0.31c-7.44,-4.06 -15.0,-6.04 -23.11,-6.04c-7.92,0.0 -14.67,1.85 -21.88,6.01c-1.2,0.69 -2.73,0.28 -3.42,-0.92s-0.28,-2.72 0.92,-3.41c7.9,-4.55 15.65,-6.68 24.37,-6.68c8.97,0.0 17.32,2.17 25.51,6.65c1.21,0.66 1.66,2.18 1.0,3.39C69.48,11.12 68.62,11.59 67.74,11.59z"/>
         <path
             android:name="background_7_path"
-            android:fillColor="#12000000"
+            android:fillColor="@color/e_fingerprint_hint"
             android:pathData="M9.25,34.74c-0.48,0.0 -0.96,-0.14 -1.39,-0.42c-1.15,-0.77 -1.45,-2.32 -0.68,-3.47c4.09,-6.09 9.3,-10.89 15.49,-14.27c6.52,-3.55 13.91,-5.43 21.38,-5.43c7.44,0.0 14.8,1.86 21.3,5.39c6.17,3.35 11.38,8.12 15.47,14.16c0.77,1.14 0.47,2.7 -0.67,3.47c-1.14,0.77 -2.7,0.47 -3.47,-0.67c-3.64,-5.38 -8.25,-9.61 -13.71,-12.57c-5.77,-3.13 -12.31,-4.78 -18.92,-4.78c-6.63,0.0 -13.2,1.67 -18.98,4.82c-5.48,2.99 -10.1,7.25 -13.73,12.66C10.85,34.35 10.06,34.74 9.25,34.74z"/>
         <path
             android:name="background_6_path"
-            android:fillColor="#12000000"
+            android:fillColor="@color/e_fingerprint_hint"
             android:pathData="M34.76,86.82c-0.67,0.0 -1.33,-0.27 -1.82,-0.79c-3.49,-3.72 -5.51,-6.25 -8.26,-11.45c-2.84,-5.35 -4.34,-11.88 -4.34,-18.86c0.0,-13.02 10.59,-23.61 23.61,-23.61c13.02,0.0 23.61,10.59 23.61,23.61c0.0,1.38 -1.12,2.5 -2.5,2.5s-2.5,-1.12 -2.5,-2.5c0.0,-10.26 -8.35,-18.61 -18.61,-18.61c-10.26,0.0 -18.61,8.35 -18.61,18.61c0.0,6.17 1.3,11.89 3.76,16.52c2.62,4.94 4.37,7.04 7.49,10.37c0.94,1.01 0.89,2.59 -0.11,3.53C35.99,86.6 35.38,86.82 34.76,86.82z"/>
         <path
             android:name="background_2_path"
-            android:fillColor="#12000000"
+            android:fillColor="@color/e_fingerprint_hint"
             android:pathData="M64.28,78.84c-4.99,0.0 -9.35,-1.32 -12.98,-3.92c-6.17,-4.43 -9.86,-11.6 -9.86,-19.19c0.0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5c0.0,5.98 2.91,11.64 7.77,15.13c2.8,2.01 6.09,2.98 10.06,2.98c0.97,0.0 2.57,-0.11 4.17,-0.4c1.36,-0.25 2.66,0.64 2.92,2.0c0.25,1.36 -0.64,2.66 -2.0,2.92C66.93,78.8 64.86,78.84 64.28,78.84z"/>
         <path
             android:name="background_1_path"
-            android:fillColor="#12000000"
+            android:fillColor="@color/e_fingerprint_hint"
             android:pathData="M55.92,87.75c-0.23,0.0 -0.46,-0.03 -0.7,-0.1c-6.6,-1.91 -10.92,-4.49 -15.4,-9.2c-5.76,-6.06 -8.94,-14.13 -8.94,-22.72c0.0,-7.2 5.86,-13.05 13.05,-13.05c7.2,0.0 13.05,5.86 13.05,13.05c0.0,4.44 3.61,8.05 8.05,8.05s8.05,-3.61 8.05,-8.05c0.0,-16.08 -13.08,-29.16 -29.16,-29.16c-11.43,0.0 -21.86,6.73 -26.58,17.15c-1.57,3.48 -2.37,7.52 -2.37,12.01c0.0,3.36 0.28,8.62 2.71,15.49c0.46,1.3 -0.22,2.73 -1.52,3.19c-1.3,0.46 -2.73,-0.22 -3.19,-1.52c-2.02,-5.7 -3.0,-11.31 -3.0,-17.16c0.0,-5.21 0.95,-9.94 2.82,-14.07c5.52,-12.2 17.74,-20.09 31.13,-20.09c18.83,0.0 34.16,15.32 34.16,34.16c0.0,7.2 -5.86,13.05 -13.05,13.05S52.0,62.92 52.0,55.73c0.0,-4.44 -3.61,-8.05 -8.05,-8.05s-8.05,3.61 -8.05,8.05c0.0,7.3 2.69,14.15 7.56,19.28c3.86,4.06 7.43,6.18 13.17,7.84c1.33,0.38 2.09,1.77 1.71,3.1C58.01,87.04 57.01,87.75 55.92,87.75z"/>
     </group>
 </vector>
diff --git a/res/drawable/ic_accessibility_magnification_ftsw.xml b/res/drawable/ic_accessibility_magnification_ftsw.xml
new file mode 100644
index 00000000000..59f55901d39
--- /dev/null
+++ b/res/drawable/ic_accessibility_magnification_ftsw.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector 
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="32dp" 
+  android:viewportHeight="24"
+  android:viewportWidth="24" 
+  android:width="32dp" >
+  <path 
+    android:fillColor="?android:attr/textColorPrimary" 
+    android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+  <path 
+    android:fillColor="?android:attr/textColorPrimary" 
+    android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
+</vector>
diff --git a/res/drawable/ic_adaptive_font_download_ftsw.xml b/res/drawable/ic_adaptive_font_download_ftsw.xml
new file mode 100644
index 00000000000..045342fd953
--- /dev/null
+++ b/res/drawable/ic_adaptive_font_download_ftsw.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M6.4,18h2.1l1.1,-3.05h4.8L15.5,18h2.1L13.05,6h-2.1zM10.2,13.2l1.75,-4.95h0.1l1.75,4.95zM4,22q-0.825,0 -1.413,-0.587Q2,20.825 2,20L2,4q0,-0.825 0.587,-1.413Q3.175,2 4,2h16q0.825,0 1.413,0.587Q22,3.175 22,4v16q0,0.825 -0.587,1.413Q20.825,22 20,22zM4,20h16L20,4L4,4v16zM4,4v16L4,4z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_e_settings_about.xml b/res/drawable/ic_e_settings_about.xml
new file mode 100644
index 00000000000..75adc8fd662
--- /dev/null
+++ b/res/drawable/ic_e_settings_about.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#2CCF69"/>
+    <path
+        android:pathData="M16.011,7.001C11.035,7.001 7.001,11.035 7.001,16.011C7.001,20.988 11.035,25.022 16.011,25.022C20.988,25.022 25.022,20.988 25.022,16.011C25.022,11.035 20.988,7.001 16.011,7.001ZM5.42,16.011C5.42,10.162 10.162,5.42 16.011,5.42C21.861,5.42 26.603,10.162 26.603,16.011C26.603,21.861 21.861,26.603 16.011,26.603C10.162,26.603 5.42,21.861 5.42,16.011Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.011,14.001C16.448,14.001 16.802,14.355 16.802,14.792V21.002C16.802,21.438 16.448,21.792 16.011,21.792C15.575,21.792 15.221,21.438 15.221,21.002V14.792C15.221,14.355 15.575,14.001 16.011,14.001Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.011,12.714C16.61,12.714 17.095,12.229 17.095,11.63C17.095,11.031 16.61,10.546 16.011,10.546C15.413,10.546 14.927,11.031 14.927,11.63C14.927,12.229 15.413,12.714 16.011,12.714Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_accessibility.xml b/res/drawable/ic_e_settings_accessibility.xml
new file mode 100644
index 00000000000..c36b014b34d
--- /dev/null
+++ b/res/drawable/ic_e_settings_accessibility.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#0088ED"/>
+    <path
+        android:pathData="M14.905,12.42C12.827,12.42 11.133,10.727 11.133,8.649C11.133,6.571 12.827,4.878 14.905,4.878C16.982,4.878 18.676,6.571 18.676,8.649C18.676,10.727 16.982,12.42 14.905,12.42ZM14.905,6.459C13.708,6.459 12.714,7.452 12.714,8.649C12.714,9.846 13.708,10.84 14.905,10.84C16.101,10.84 17.095,9.846 17.095,8.649C17.095,7.452 16.124,6.459 14.905,6.459Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M13.911,27.122C10.478,27.122 7.565,24.457 7.339,20.979C7.159,18.247 8.717,15.65 11.201,14.521C11.608,14.34 12.059,14.521 12.24,14.927C12.42,15.334 12.24,15.785 11.833,15.966C9.936,16.824 8.762,18.789 8.898,20.866C9.078,23.622 11.472,25.699 14.227,25.518C15.808,25.406 17.208,24.593 18.089,23.26C18.337,22.899 18.812,22.786 19.173,23.034C19.534,23.283 19.647,23.757 19.399,24.118C18.247,25.857 16.395,26.941 14.318,27.077C14.227,27.122 14.069,27.122 13.911,27.122Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M23.87,24.502C23.667,24.502 23.464,24.434 23.306,24.276L19.692,20.663H14.905C14.476,20.663 14.114,20.302 14.114,19.873V14.317C14.114,13.888 14.476,13.527 14.905,13.527C15.334,13.527 15.695,13.888 15.695,14.317V19.082H20.054C20.257,19.082 20.46,19.173 20.618,19.308L24.457,23.147C24.773,23.463 24.773,23.96 24.457,24.254C24.277,24.434 24.073,24.502 23.87,24.502Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_accounts.xml b/res/drawable/ic_e_settings_accounts.xml
new file mode 100644
index 00000000000..27136a49468
--- /dev/null
+++ b/res/drawable/ic_e_settings_accounts.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#953EB4"/>
+    <path
+        android:pathData="M10.727,15.356C10.29,15.356 9.937,15.71 9.937,16.147C9.937,16.583 10.29,16.937 10.727,16.937C11.163,16.937 11.517,16.583 11.517,16.147C11.517,15.71 11.163,15.356 10.727,15.356ZM8.356,16.147C8.356,14.837 9.417,13.776 10.727,13.776C12.036,13.776 13.098,14.837 13.098,16.147C13.098,17.456 12.036,18.518 10.727,18.518C9.417,18.518 8.356,17.456 8.356,16.147Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M10.725,17.592C10.733,17.592 10.741,17.592 10.75,17.592C10.758,17.592 10.766,17.592 10.774,17.592C11.05,17.592 11.373,17.592 11.679,17.632C12.001,17.674 12.367,17.767 12.701,17.998C13.415,18.492 13.663,19.37 13.663,20.505C13.663,20.942 13.309,21.296 12.872,21.296C12.436,21.296 12.082,20.942 12.082,20.505C12.082,19.518 11.855,19.335 11.802,19.298C11.752,19.264 11.66,19.224 11.474,19.199C11.281,19.174 11.056,19.173 10.75,19.173C10.443,19.173 10.218,19.174 10.025,19.199C9.838,19.224 9.747,19.264 9.697,19.298C9.644,19.335 9.417,19.518 9.417,20.505C9.417,20.942 9.063,21.296 8.627,21.296C8.19,21.296 7.836,20.942 7.836,20.505C7.836,19.37 8.084,18.492 8.798,17.998C9.132,17.767 9.498,17.674 9.82,17.632C10.126,17.592 10.449,17.592 10.725,17.592Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M5.284,10.592C5.284,10.155 5.638,9.801 6.075,9.801H25.903C26.339,9.801 26.693,10.155 26.693,10.592V24.841C26.693,25.278 26.339,25.632 25.903,25.632H6.075C5.638,25.632 5.284,25.278 5.284,24.841V10.592ZM6.865,11.382V24.051H25.112V11.382H6.865Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M13.866,7.159C13.866,6.722 14.22,6.369 14.656,6.369H17.344C17.78,6.369 18.134,6.722 18.134,7.159V10.592C18.134,11.028 17.78,11.382 17.344,11.382H14.656C14.22,11.382 13.866,11.028 13.866,10.592V7.159ZM15.447,7.949V9.801H16.553V7.949H15.447Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.553,14.566C16.553,14.13 16.907,13.776 17.344,13.776H23.351C23.787,13.776 24.141,14.13 24.141,14.566C24.141,15.003 23.787,15.356 23.351,15.356H17.344C16.907,15.356 16.553,15.003 16.553,14.566Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.553,17.728C16.553,17.291 16.907,16.937 17.344,16.937H23.351C23.787,16.937 24.141,17.291 24.141,17.728C24.141,18.164 23.787,18.518 23.351,18.518H17.344C16.907,18.518 16.553,18.164 16.553,17.728Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.553,20.867C16.553,20.43 16.907,20.076 17.344,20.076H23.351C23.787,20.076 24.141,20.43 24.141,20.867C24.141,21.303 23.787,21.657 23.351,21.657H17.344C16.907,21.657 16.553,21.303 16.553,20.867Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_advanced_privacy.xml b/res/drawable/ic_e_settings_advanced_privacy.xml
new file mode 100644
index 00000000000..747fd5c6b39
--- /dev/null
+++ b/res/drawable/ic_e_settings_advanced_privacy.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#2CCF69"/>
+    <path
+        android:pathData="M15.983,6.667V6.667C15.917,6.666 15.85,6.675 15.785,6.693L7.869,10.044C7.815,10.069 7.765,10.111 7.727,10.168C7.689,10.228 7.667,10.301 7.667,10.377L7.667,10.379C7.667,18.181 12.058,23.35 15.862,24.975L15.865,24.977C15.902,24.992 15.94,25 15.978,25C16.016,25 16.054,24.992 16.091,24.977L16.097,24.974L16.097,24.974C19.126,23.687 24.324,19.049 24.333,10.402C24.33,10.323 24.305,10.248 24.263,10.186C24.22,10.122 24.162,10.075 24.099,10.049C24.099,10.049 24.099,10.049 24.099,10.049L16.169,6.691C16.112,6.675 16.053,6.667 15.994,6.667L15.983,6.667ZM16.75,5.127L24.75,8.514C25.114,8.669 25.425,8.927 25.647,9.258C25.869,9.589 25.992,9.979 26,10.379C26,19.777 20.332,24.986 16.749,26.508C16.505,26.613 16.243,26.667 15.978,26.667C15.713,26.667 15.451,26.613 15.207,26.508C10.749,24.603 6,18.803 6,10.379C5.999,9.982 6.114,9.594 6.328,9.262C6.543,8.931 6.849,8.671 7.208,8.514L15.207,5.127C15.463,5.041 15.73,4.998 15.999,5C16.255,5.001 16.508,5.044 16.75,5.127Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M13.672,11.986C13.998,12.312 13.998,12.84 13.672,13.165C13.03,13.808 12.708,14.649 12.708,15.493C12.708,16.336 13.03,17.177 13.672,17.82C14.315,18.463 15.156,18.784 16,18.784C16.844,18.784 17.684,18.463 18.327,17.82C18.97,17.177 19.291,16.336 19.291,15.493C19.291,14.649 18.97,13.808 18.327,13.165C18.002,12.84 18.002,12.312 18.327,11.986C18.653,11.661 19.18,11.661 19.506,11.986C20.474,12.955 20.958,14.225 20.958,15.493C20.958,16.76 20.474,18.03 19.506,18.998C18.538,19.966 17.267,20.451 16,20.451C14.732,20.451 13.462,19.966 12.494,18.998C11.526,18.03 11.042,16.76 11.042,15.493C11.042,14.225 11.526,12.955 12.494,11.986C12.819,11.661 13.347,11.661 13.672,11.986Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.085,11C16.545,11 16.918,11.373 16.918,11.833L16.918,15.554C16.918,16.014 16.545,16.387 16.085,16.387C15.624,16.387 15.251,16.014 15.251,15.554L15.251,11.833C15.251,11.373 15.624,11 16.085,11Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_apps.xml b/res/drawable/ic_e_settings_apps.xml
new file mode 100644
index 00000000000..54a70a2d357
--- /dev/null
+++ b/res/drawable/ic_e_settings_apps.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#E83A52"/>
+    <path
+        android:pathData="M6.775,7.565C6.775,7.129 7.129,6.775 7.565,6.775H13.64C14.077,6.775 14.431,7.129 14.431,7.565V13.64C14.431,14.077 14.077,14.431 13.64,14.431H7.565C7.129,14.431 6.775,14.077 6.775,13.64V7.565ZM8.356,8.356V12.85H12.85V8.356H8.356Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M24.435,7.565H18.36V13.64H24.435V7.565Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M17.57,7.565C17.57,7.129 17.924,6.775 18.36,6.775H24.435C24.871,6.775 25.225,7.129 25.225,7.565V13.64C25.225,14.077 24.871,14.431 24.435,14.431H18.36C17.924,14.431 17.57,14.077 17.57,13.64V7.565ZM19.15,8.356V12.85H23.644V8.356H19.15Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M6.775,18.36C6.775,17.924 7.129,17.57 7.565,17.57H13.64C14.077,17.57 14.431,17.924 14.431,18.36V24.435C14.431,24.871 14.077,25.225 13.64,25.225H7.565C7.129,25.225 6.775,24.871 6.775,24.435V18.36ZM8.356,19.15V23.644H12.85V19.15H8.356Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M17.57,18.36C17.57,17.924 17.924,17.57 18.36,17.57H24.435C24.871,17.57 25.225,17.924 25.225,18.36V24.435C25.225,24.871 24.871,25.225 24.435,25.225H18.36C17.924,25.225 17.57,24.871 17.57,24.435V18.36ZM19.15,19.15V23.644H23.644V19.15H19.15Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_battery.xml b/res/drawable/ic_e_settings_battery.xml
new file mode 100644
index 00000000000..ed3c6bafe5a
--- /dev/null
+++ b/res/drawable/ic_e_settings_battery.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#2CCF69"/>
+    <path
+        android:pathData="M8.604,7.339C8.604,6.903 8.958,6.549 9.395,6.549H22.628C23.065,6.549 23.419,6.903 23.419,7.339V26.512C23.419,26.949 23.065,27.303 22.628,27.303H9.395C8.958,27.303 8.604,26.949 8.604,26.512V7.339ZM10.185,8.13V25.722H21.838V8.13H10.185Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M18.405,5.51H13.618V7.339H18.405V5.51Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M12.827,5.51C12.827,5.074 13.181,4.72 13.617,4.72H18.405C18.841,4.72 19.195,5.074 19.195,5.51V7.339C19.195,7.776 18.841,8.13 18.405,8.13H13.617C13.181,8.13 12.827,7.776 12.827,7.339V5.51ZM14.408,6.301V6.549H17.615V6.301H14.408Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M19.737,22.944H12.262V23.419H19.737V22.944Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M11.472,22.154H20.528V24.209H11.472V22.154Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M19.737,19.376H12.262V19.85H19.737V19.376Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M11.472,18.586H20.528V20.641H11.472V18.586Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_devices_other.xml b/res/drawable/ic_e_settings_devices_other.xml
new file mode 100644
index 00000000000..b45490d0a0b
--- /dev/null
+++ b/res/drawable/ic_e_settings_devices_other.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#0088ED"/>
+    <path
+        android:pathData="M5.013,7.204C5.013,6.768 5.367,6.414 5.804,6.414H24.232C24.668,6.414 25.022,6.768 25.022,7.204V8.13C25.022,8.567 24.668,8.92 24.232,8.92C23.795,8.92 23.441,8.567 23.441,8.13V7.995H6.594V19.805H15.808C16.245,19.805 16.598,20.159 16.598,20.596C16.598,21.032 16.245,21.386 15.808,21.386H5.804C5.367,21.386 5.013,21.032 5.013,20.596V7.204Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M17.637,10.546C17.637,10.11 17.991,9.756 18.428,9.756H26.219C26.655,9.756 27.009,10.11 27.009,10.546V24.819C27.009,25.255 26.655,25.609 26.219,25.609H18.428C17.991,25.609 17.637,25.255 17.637,24.819V23.102C17.637,23.064 17.64,23.026 17.645,22.989C17.64,22.952 17.637,22.915 17.637,22.876V10.546ZM19.21,22.989C19.215,23.026 19.218,23.064 19.218,23.102V24.028H25.428V11.337H19.218V22.876C19.218,22.915 19.215,22.952 19.21,22.989Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M22.312,21.77C22.718,21.77 23.057,22.109 23.057,22.515C23.057,22.922 22.718,23.26 22.312,23.26C21.905,23.26 21.567,22.922 21.567,22.515C21.567,22.109 21.905,21.77 22.312,21.77Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_display.xml b/res/drawable/ic_e_settings_display.xml
new file mode 100644
index 00000000000..ce2c928bb11
--- /dev/null
+++ b/res/drawable/ic_e_settings_display.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#0088ED"/>
+    <path
+        android:pathData="M16.011,5.036C16.448,5.036 16.802,5.39 16.802,5.826V6.843C16.802,7.279 16.448,7.633 16.011,7.633C15.575,7.633 15.221,7.279 15.221,6.843V5.826C15.221,5.39 15.575,5.036 16.011,5.036Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.011,24.367C16.448,24.367 16.802,24.721 16.802,25.157V26.174C16.802,26.61 16.448,26.964 16.011,26.964C15.575,26.964 15.221,26.61 15.221,26.174V25.157C15.221,24.721 15.575,24.367 16.011,24.367Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M5.036,16.011C5.036,15.575 5.39,15.221 5.826,15.221H6.843C7.279,15.221 7.633,15.575 7.633,16.011C7.633,16.448 7.279,16.802 6.843,16.802H5.826C5.39,16.802 5.036,16.448 5.036,16.011Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M24.367,16.011C24.367,15.575 24.721,15.221 25.157,15.221H26.174C26.61,15.221 26.964,15.575 26.964,16.011C26.964,16.448 26.61,16.802 26.174,16.802H25.157C24.721,16.802 24.367,16.448 24.367,16.011Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M8.248,8.248C8.557,7.94 9.058,7.94 9.366,8.248L10.089,8.971C10.398,9.28 10.398,9.78 10.089,10.089C9.78,10.398 9.28,10.398 8.971,10.089L8.248,9.366C7.94,9.058 7.94,8.557 8.248,8.248Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M21.911,21.911C22.22,21.603 22.72,21.603 23.029,21.911L23.752,22.634C24.06,22.942 24.06,23.443 23.752,23.752C23.443,24.06 22.942,24.06 22.634,23.752L21.911,23.029C21.603,22.72 21.603,22.22 21.911,21.911Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M23.752,8.248C24.06,8.557 24.06,9.058 23.752,9.366L23.029,10.089C22.72,10.398 22.22,10.398 21.911,10.089C21.603,9.78 21.603,9.28 21.911,8.971L22.634,8.248C22.942,7.94 23.443,7.94 23.752,8.248Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M10.089,21.911C10.398,22.22 10.398,22.72 10.089,23.029L9.366,23.752C9.058,24.06 8.557,24.06 8.248,23.752C7.94,23.443 7.94,22.942 8.248,22.634L8.971,21.911C9.28,21.603 9.78,21.603 10.089,21.911Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.011,10.32C12.868,10.32 10.32,12.868 10.32,16.011C10.32,19.154 12.868,21.702 16.011,21.702C19.154,21.702 21.702,19.154 21.702,16.011C21.702,12.868 19.154,10.32 16.011,10.32ZM8.74,16.011C8.74,11.995 11.995,8.74 16.011,8.74C20.027,8.74 23.283,11.995 23.283,16.011C23.283,20.027 20.027,23.283 16.011,23.283C11.995,23.283 8.74,20.027 8.74,16.011Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M22.47,16.011C22.47,12.443 19.579,9.53 15.989,9.53V22.47C19.579,22.47 22.47,19.579 22.47,16.011Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_emergency.xml b/res/drawable/ic_e_settings_emergency.xml
new file mode 100644
index 00000000000..42348bb3497
--- /dev/null
+++ b/res/drawable/ic_e_settings_emergency.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#E83A52"/>
+    <group>
+      <clip-path
+          android:pathData="M4.952,5.904h22.097v20.192h-22.097z"/>
+      <path
+          android:pathData="M24.858,26.096H7.142C5.928,26.096 4.952,25.12 4.952,23.905V11.381C4.952,10.166 5.928,9.19 7.142,9.19H24.858C26.072,9.19 27.048,10.166 27.048,11.381V23.905C27.048,25.12 26.072,26.096 24.858,26.096ZM7.142,10.857C6.857,10.857 6.618,11.095 6.618,11.381V23.905C6.618,24.191 6.857,24.429 7.142,24.429H24.858C25.143,24.429 25.382,24.191 25.382,23.905V11.381C25.382,11.095 25.143,10.857 24.858,10.857H7.142Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19.024,10.857H12.976C12.524,10.857 12.143,10.476 12.143,10.024V8.071C12.143,6.88 13.119,5.904 14.309,5.904H17.667C18.857,5.904 19.834,6.88 19.834,8.071V10.024C19.857,10.476 19.476,10.857 19.024,10.857ZM13.809,9.19H18.167V8.071C18.167,7.785 17.952,7.571 17.667,7.571H14.309C14.024,7.571 13.809,7.785 13.809,8.071V9.19Z"
+          android:fillColor="#ffffff"/>
+      <group>
+        <clip-path
+            android:pathData="M11,12.666h10.001v10.001h-10.001z"/>
+        <path
+            android:pathData="M16,13.692V21.594"
+            android:strokeWidth="1.6"
+            android:fillColor="#00000000"
+            android:strokeColor="#ffffff"
+            android:strokeLineCap="round"/>
+        <path
+            android:pathData="M19.951,17.643L12.049,17.643"
+            android:strokeWidth="1.6"
+            android:fillColor="#00000000"
+            android:strokeColor="#ffffff"
+            android:strokeLineCap="round"/>
+      </group>
+    </group>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_location.xml b/res/drawable/ic_e_settings_location.xml
new file mode 100644
index 00000000000..3f2c50b35b7
--- /dev/null
+++ b/res/drawable/ic_e_settings_location.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#E83A52"/>
+    <path
+        android:pathData="M19.389,7.492C17.961,6.607 16.427,6.345 14.762,6.67L14.753,6.672C12.878,7.015 11.437,8.01 10.398,9.618C9.509,11.014 9.188,12.537 9.431,14.179L9.432,14.186C9.533,14.915 9.759,15.643 10.042,16.384L10.043,16.386C10.693,18.097 11.609,19.715 12.632,21.295L12.632,21.295C13.602,22.794 14.685,24.232 15.84,25.632C15.889,25.686 15.939,25.741 15.988,25.796L16.53,25.152C17.736,23.656 18.885,22.107 19.875,20.479L19.879,20.472C20.9,18.83 21.763,17.182 22.299,15.381C22.616,14.303 22.748,13.256 22.572,12.214L22.571,12.213C22.224,10.151 21.18,8.571 19.397,7.497L19.389,7.492ZM16.721,27.379L16.721,27.379L16.721,27.379L16.721,27.38L16.721,27.38L16.721,27.38L16.721,27.381L16.721,27.381L16.72,27.381L16.72,27.381L16.72,27.382L16.72,27.382L16.72,27.382L16.72,27.382L16.719,27.383L16.719,27.383L16.719,27.383L16.719,27.383L16.719,27.384L16.719,27.385L16.719,27.385L16.718,27.385C16.6,27.622 16.371,27.784 16.108,27.816C15.845,27.849 15.583,27.747 15.411,27.546C15.371,27.5 15.332,27.454 15.293,27.409C15.066,27.143 14.863,26.906 14.661,26.685C14.651,26.675 14.643,26.665 14.634,26.654C13.445,25.214 12.319,23.721 11.305,22.154C10.252,20.528 9.271,18.805 8.566,16.948C8.262,16.155 7.992,15.303 7.867,14.407C7.569,12.393 7.971,10.485 9.067,8.766L9.069,8.763C10.333,6.805 12.142,5.543 14.464,5.118C16.501,4.721 18.44,5.046 20.217,6.146C22.407,7.466 23.71,9.453 24.13,11.951C24.359,13.302 24.176,14.603 23.815,15.828L23.815,15.83C23.222,17.821 22.28,19.604 21.224,21.303C20.183,23.014 18.987,24.623 17.756,26.15C17.752,26.155 17.749,26.159 17.745,26.163L16.721,27.379Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M18.653,13.166C18.653,11.698 17.457,10.479 15.921,10.524C14.476,10.569 13.324,11.766 13.324,13.189C13.347,14.656 14.589,15.944 16.147,15.831C17.57,15.74 18.676,14.566 18.653,13.166Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_modes.xml b/res/drawable/ic_e_settings_modes.xml
new file mode 100644
index 00000000000..8fb342cbd27
--- /dev/null
+++ b/res/drawable/ic_e_settings_modes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2025
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#FF7301"/>
+    <path
+        android:pathData="M16,6C10.48,6 6,10.48 6,16C6,21.52 10.48,26 16,26C21.52,26 26,21.52 26,16C26,10.48 21.52,6 16,6ZM16,24C11.59,24 8,20.41 8,16C8,11.59 11.59,8 16,8C20.41,8 24,11.59 24,16C24,20.41 20.41,24 16,24ZM11,15H21V17H11V15Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_notifications.xml b/res/drawable/ic_e_settings_notifications.xml
new file mode 100644
index 00000000000..bc8b60af04f
--- /dev/null
+++ b/res/drawable/ic_e_settings_notifications.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#FF7301"/>
+    <path
+        android:pathData="M16.011,27.009C15.085,27.009 14.318,26.241 14.318,25.315H17.705C17.705,26.241 16.937,27.009 16.011,27.009Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M13.527,24.525H18.496V25.315C18.496,26.678 17.374,27.8 16.011,27.8C14.649,27.8 13.527,26.678 13.527,25.315V24.525ZM15.581,26.106C15.71,26.178 15.857,26.219 16.011,26.219C16.166,26.219 16.313,26.178 16.441,26.106H15.581Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.011,5.781C15.37,5.781 14.86,6.302 14.86,6.933C14.86,7.37 14.506,7.723 14.069,7.723C13.633,7.723 13.279,7.37 13.279,6.933C13.279,5.441 14.485,4.2 16.011,4.2C17.503,4.2 18.744,5.406 18.744,6.933C18.744,7.37 18.39,7.723 17.954,7.723C17.517,7.723 17.163,7.37 17.163,6.933C17.163,6.291 16.642,5.781 16.011,5.781Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M15.882,8.085C19.598,8.007 22.606,11.119 22.606,14.792V18.428C22.606,19.152 22.942,19.847 23.539,20.308C23.539,20.308 23.54,20.308 23.54,20.309L25.301,21.663C25.569,21.869 25.676,22.223 25.567,22.544C25.458,22.864 25.157,23.08 24.819,23.08H7.227C6.888,23.08 6.587,22.864 6.478,22.544C6.369,22.223 6.476,21.869 6.745,21.663L8.501,20.312C9.08,19.85 9.417,19.152 9.417,18.428V14.679C9.417,11.086 12.292,8.162 15.882,8.085L15.882,8.085ZM15.915,9.665C18.703,9.607 21.025,11.961 21.025,14.792V18.428C21.025,19.613 21.562,20.74 22.497,21.499H9.547C10.46,20.742 10.998,19.615 10.998,18.428V14.679C10.998,11.949 13.182,9.724 15.915,9.665"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
+
diff --git a/res/drawable/ic_e_settings_privacy.xml b/res/drawable/ic_e_settings_privacy.xml
new file mode 100644
index 00000000000..afa70a03525
--- /dev/null
+++ b/res/drawable/ic_e_settings_privacy.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#2CCF69"/>
+    <path
+        android:pathData="M16,18.5C17.381,18.5 18.5,17.381 18.5,16C18.5,14.619 17.381,13.5 16,13.5C14.619,13.5 13.5,14.619 13.5,16C13.5,17.381 14.619,18.5 16,18.5ZM16,20.167C18.302,20.167 20.167,18.302 20.167,16C20.167,13.699 18.302,11.833 16,11.833C13.699,11.833 11.833,13.699 11.833,16C11.833,18.302 13.699,20.167 16,20.167Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M6.998,16C8.654,19.296 12.065,21.554 16,21.554C19.935,21.554 23.346,19.296 25.002,16C23.346,12.704 19.935,10.446 16,10.446C12.065,10.446 8.654,12.704 6.998,16ZM26.834,16C25.066,11.76 20.881,8.779 16,8.779C11.119,8.779 6.934,11.76 5.165,16C6.934,20.24 11.119,23.221 16,23.221C20.881,23.221 25.066,20.24 26.834,16Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_security.xml b/res/drawable/ic_e_settings_security.xml
new file mode 100644
index 00000000000..50a7cb7082f
--- /dev/null
+++ b/res/drawable/ic_e_settings_security.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#E83A52"/>
+    <path
+        android:pathData="M9.282,15.718C9.12,15.718 8.988,15.849 8.988,16.011V24.254C8.988,24.415 9.119,24.548 9.282,24.548H22.718C22.881,24.548 23.012,24.415 23.012,24.254V16.011C23.012,15.85 22.881,15.718 22.718,15.718H9.282ZM7.407,16.011C7.407,14.954 8.269,14.137 9.282,14.137H22.718C23.775,14.137 24.593,14.998 24.593,16.011V24.254C24.593,25.267 23.775,26.128 22.718,26.128H9.282C8.225,26.128 7.407,25.267 7.407,24.254V16.011Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M15.989,7.475C13.738,7.475 11.901,9.312 11.901,11.563V14.905C11.901,15.341 11.547,15.695 11.111,15.695C10.674,15.695 10.32,15.341 10.32,14.905V11.563C10.32,8.439 12.865,5.894 15.989,5.894C19.113,5.894 21.657,8.439 21.657,11.563V14.905C21.657,15.341 21.303,15.695 20.867,15.695C20.43,15.695 20.076,15.341 20.076,14.905V11.563C20.076,9.312 18.24,7.475 15.989,7.475Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_sound.xml b/res/drawable/ic_e_settings_sound.xml
new file mode 100644
index 00000000000..1ab100ff444
--- /dev/null
+++ b/res/drawable/ic_e_settings_sound.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#FF7301"/>
+    <path
+        android:pathData="M19.133,11.162C19.442,10.853 19.943,10.853 20.251,11.162C22.931,13.841 22.931,18.181 20.251,20.861C19.943,21.17 19.442,21.17 19.133,20.861C18.825,20.552 18.825,20.052 19.133,19.743C21.196,17.681 21.196,14.342 19.133,12.279C18.825,11.971 18.825,11.47 19.133,11.162Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M21.866,8.429C22.175,8.12 22.675,8.12 22.984,8.429C27.177,12.622 27.177,19.4 22.984,23.593C22.675,23.902 22.175,23.902 21.866,23.593C21.557,23.285 21.557,22.784 21.866,22.476C25.442,18.9 25.442,13.122 21.866,9.547C21.557,9.238 21.557,8.738 21.866,8.429Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M16.7,5.436C16.994,5.559 17.186,5.846 17.186,6.165V25.835C17.186,26.153 16.994,26.441 16.701,26.564C16.407,26.687 16.068,26.622 15.841,26.399L9.568,20.234H6.685C6.473,20.234 6.27,20.149 6.121,19.998C5.973,19.847 5.891,19.643 5.894,19.431L6.007,12.566C6.014,12.134 6.366,11.788 6.797,11.788H9.567L15.84,5.602C16.067,5.378 16.406,5.313 16.7,5.436ZM15.605,8.055L10.446,13.141C10.298,13.287 10.099,13.369 9.891,13.369H7.575L7.488,18.653H9.891C10.099,18.653 10.297,18.735 10.445,18.88L15.605,23.95V8.055Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_storage.xml b/res/drawable/ic_e_settings_storage.xml
new file mode 100644
index 00000000000..fe83ba35d47
--- /dev/null
+++ b/res/drawable/ic_e_settings_storage.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#24527F"/>
+    <path
+        android:pathData="M5.578,17.592C5.578,12.707 9.523,8.762 14.408,8.762C14.844,8.762 15.198,9.116 15.198,9.553V16.802H22.447C22.884,16.802 23.238,17.156 23.238,17.592C23.238,22.478 19.293,26.422 14.408,26.422C9.523,26.422 5.578,22.478 5.578,17.592ZM13.618,10.385C9.979,10.778 7.159,13.847 7.159,17.592C7.159,21.604 10.396,24.841 14.408,24.841C18.153,24.841 21.222,22.021 21.615,18.382H14.408C13.971,18.382 13.618,18.029 13.618,17.592V10.385Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M17.592,6.368V14.408H25.632C25.654,9.959 22.041,6.368 17.592,6.368Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M16.802,6.368C16.802,5.932 17.156,5.578 17.592,5.578C22.474,5.578 26.447,9.52 26.422,14.412C26.42,14.847 26.066,15.198 25.632,15.198H17.592C17.156,15.198 16.802,14.844 16.802,14.408V6.368ZM18.382,7.201V13.618H24.803C24.453,10.242 21.767,7.565 18.382,7.201Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M17.592,9.169V14.408H22.831C22.831,11.517 20.505,9.169 17.592,9.169Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M16.802,8.378H17.592C20.944,8.378 23.622,11.083 23.622,14.408V15.198H16.802V8.378ZM18.382,10.028V13.618H21.971C21.647,11.793 20.216,10.354 18.382,10.028Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_system.xml b/res/drawable/ic_e_settings_system.xml
new file mode 100644
index 00000000000..c1d0f8f3267
--- /dev/null
+++ b/res/drawable/ic_e_settings_system.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#0088ED"/>
+    <path
+        android:pathData="M12.963,7.136C10.568,7.136 8.627,9.077 8.627,11.472C8.627,13.867 10.568,15.808 12.963,15.808C15.357,15.808 17.299,13.867 17.299,11.472C17.299,9.077 15.357,7.136 12.963,7.136ZM7.046,11.472C7.046,8.204 9.695,5.555 12.963,5.555C16.23,5.555 18.879,8.204 18.879,11.472C18.879,14.74 16.23,17.389 12.963,17.389C9.695,17.389 7.046,14.74 7.046,11.472Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M12.91,17.953L14.024,17.953C14.46,17.953 14.814,18.307 14.814,18.744C14.814,19.18 14.46,19.534 14.024,19.534H12.94C11.968,19.534 11.109,19.535 10.339,19.636C9.577,19.735 8.968,19.926 8.483,20.26C7.561,20.899 6.797,22.284 6.797,25.677C6.797,26.113 6.444,26.467 6.007,26.467C5.571,26.467 5.217,26.113 5.217,25.677C5.217,22.136 6.001,20.055 7.584,18.96C8.353,18.429 9.237,18.185 10.135,18.068C11.016,17.953 11.972,17.953 12.91,17.953Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M21.07,16.734L22.719,16.757L22.809,17.75C23.351,17.908 23.87,18.202 24.277,18.608L25.18,18.224L25.97,19.602L25.203,20.189C25.361,20.799 25.361,21.431 25.18,22.018L25.97,22.628L25.112,24.028L24.186,23.644C23.983,23.825 23.78,23.983 23.531,24.119C23.283,24.277 23.012,24.39 22.719,24.457L22.583,25.428L20.934,25.451L20.822,24.457C20.257,24.299 19.715,24.006 19.286,23.577L18.383,23.961L17.592,22.583L18.36,21.996C18.202,21.409 18.202,20.776 18.36,20.212L17.615,19.625L18.45,18.202L19.376,18.586C19.58,18.405 19.805,18.224 20.054,18.089C20.325,17.931 20.618,17.818 20.912,17.728L21.07,16.734ZM21.07,15.153C20.302,15.153 19.625,15.718 19.512,16.486L19.489,16.576C19.421,16.621 19.331,16.644 19.263,16.689C19.218,16.711 19.173,16.734 19.15,16.757L19.06,16.711C18.857,16.644 18.676,16.598 18.473,16.598C17.931,16.598 17.412,16.892 17.118,17.366L16.26,18.834C15.853,19.534 16.034,20.415 16.666,20.912L16.711,20.934C16.711,21.07 16.711,21.205 16.711,21.318L16.666,21.341C16.034,21.815 15.853,22.696 16.26,23.396L17.05,24.774C17.344,25.27 17.863,25.564 18.428,25.564C18.631,25.564 18.834,25.519 19.038,25.451L19.083,25.428C19.173,25.496 19.286,25.541 19.399,25.609V25.677C19.489,26.467 20.167,27.077 20.957,27.077C20.957,27.077 20.957,27.077 20.98,27.077L22.628,27.054C23.419,27.054 24.073,26.467 24.186,25.699L24.209,25.609C24.254,25.587 24.322,25.564 24.367,25.519C24.39,25.496 24.412,25.496 24.435,25.474L24.525,25.519C24.728,25.609 24.932,25.654 25.135,25.654C25.677,25.654 26.196,25.383 26.49,24.909L27.348,23.509C27.777,22.831 27.596,21.928 26.964,21.431L26.896,21.386C26.896,21.228 26.896,21.093 26.896,20.934L26.941,20.912C27.574,20.438 27.754,19.557 27.348,18.857L26.558,17.479C26.264,16.982 25.745,16.689 25.18,16.689C24.977,16.689 24.774,16.734 24.57,16.802L24.525,16.824C24.457,16.779 24.367,16.734 24.277,16.689V16.621C24.186,15.808 23.531,15.198 22.719,15.198L21.07,15.153Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M21.815,22.718C22.701,22.718 23.419,22 23.419,21.115C23.419,20.229 22.701,19.512 21.815,19.512C20.93,19.512 20.212,20.229 20.212,21.115C20.212,22 20.93,22.718 21.815,22.718Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_e_settings_updater.xml b/res/drawable/ic_e_settings_updater.xml
new file mode 100644
index 00000000000..8f5d5530072
--- /dev/null
+++ b/res/drawable/ic_e_settings_updater.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+  <group>
+    <clip-path
+        android:pathData="M0,0.13h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#E83A52"/>
+    <group>
+      <clip-path
+          android:pathData="M7.689,6.452h16.622v19.356h-16.622z"/>
+      <path
+          android:pathData="M16,19.274C15.8,19.274 15.6,19.185 15.444,19.052L11.644,15.252C11.333,14.941 11.333,14.452 11.644,14.163C11.955,13.874 12.444,13.852 12.733,14.163L15.978,17.408L19.244,14.163C19.556,13.852 20.044,13.852 20.333,14.163C20.644,14.474 20.644,14.963 20.333,15.252L16.556,19.052C16.4,19.185 16.2,19.274 16,19.274Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,19.274C15.578,19.274 15.222,18.919 15.222,18.497V7.23C15.222,6.808 15.578,6.452 16,6.452C16.422,6.452 16.778,6.808 16.778,7.23V18.497C16.778,18.919 16.422,19.274 16,19.274Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23.533,25.808H8.467C8.044,25.808 7.689,25.452 7.689,25.03V9.963C7.689,9.541 8.044,9.185 8.467,9.185H10.267C10.689,9.185 11.044,9.541 11.044,9.963C11.044,10.385 10.689,10.741 10.267,10.741H9.244V24.252H22.756V10.741H21.667C21.244,10.741 20.889,10.385 20.889,9.963C20.889,9.541 21.244,9.185 21.667,9.185H23.533C23.955,9.185 24.311,9.541 24.311,9.963V25.03C24.311,25.452 23.955,25.808 23.533,25.808Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_e_settings_wallpaper.xml b/res/drawable/ic_e_settings_wallpaper.xml
new file mode 100644
index 00000000000..2511fb49a67
--- /dev/null
+++ b/res/drawable/ic_e_settings_wallpaper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#0088ED"/>
+    <group>
+      <clip-path
+          android:pathData="M4.793,6.727h22.414v18.546h-22.414z"/>
+      <path
+          android:pathData="M17.802,19.868C17.604,19.868 17.406,19.802 17.253,19.648C16.945,19.34 16.945,18.857 17.253,18.571L25.273,10.55C25.801,10.023 25.801,9.188 25.273,8.661C24.746,8.133 23.911,8.133 23.383,8.661L15.363,16.681C15.055,16.989 14.572,16.989 14.286,16.681C13.978,16.374 13.978,15.89 14.286,15.604L22.307,7.562C23.427,6.441 25.251,6.441 26.372,7.562C27.493,8.683 27.493,10.507 26.372,11.627L18.351,19.648C18.198,19.802 18,19.868 17.802,19.868Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11.979,25.273C9.21,25.273 6.507,23.647 5.057,22.372C4.771,22.109 4.705,21.691 4.925,21.362C5.145,21.032 5.562,20.922 5.914,21.098C5.958,21.12 7.101,21.647 8.155,20.988C8.639,20.681 8.771,20.307 9.012,19.538C9.232,18.835 9.474,17.956 10.243,17.033C11.1,15.978 12.462,15.341 13.847,15.341C15.121,15.341 16.264,15.868 17.033,16.791C18.088,18.088 19.406,20.659 16.374,23.515C15.011,24.79 13.495,25.273 11.979,25.273ZM8.199,22.658C8.573,22.856 8.968,23.054 9.386,23.208C11.759,24.131 13.737,23.867 15.297,22.395C16.945,20.856 17.121,19.34 15.824,17.758C15.341,17.187 14.638,16.857 13.825,16.857C12.902,16.857 12.001,17.274 11.408,17.978C10.836,18.659 10.66,19.318 10.463,19.955C10.221,20.79 9.957,21.625 8.968,22.263C8.705,22.46 8.463,22.57 8.199,22.658Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
+</vector>
+
diff --git a/res/drawable/ic_e_settings_wireless.xml b/res/drawable/ic_e_settings_wireless.xml
new file mode 100644
index 00000000000..db5d8be7a9c
--- /dev/null
+++ b/res/drawable/ic_e_settings_wireless.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#0088ED"/>
+    <path
+        android:pathData="M16.011,24.706C17.408,24.706 18.541,23.573 18.541,22.177C18.541,20.78 17.408,19.647 16.011,19.647C14.615,19.647 13.482,20.78 13.482,22.177C13.482,23.573 14.615,24.706 16.011,24.706Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M21.548,18.556C18.493,15.481 13.507,15.478 10.428,18.558C10.119,18.866 9.619,18.866 9.31,18.558C9.001,18.249 9.001,17.749 9.31,17.44C13.005,13.745 18.994,13.742 22.67,17.442C22.977,17.751 22.975,18.252 22.666,18.559C22.356,18.867 21.856,18.865 21.548,18.556Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M25.48,14.674C20.233,9.448 11.767,9.45 6.543,14.673C6.235,14.982 5.734,14.982 5.426,14.673C5.117,14.365 5.117,13.864 5.426,13.555C11.268,7.713 20.733,7.715 26.596,13.554C26.905,13.862 26.906,14.363 26.598,14.672C26.29,14.981 25.79,14.982 25.48,14.674Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
+
diff --git a/res/drawable/ic_files_go_round.xml b/res/drawable/ic_files_go_round.xml
new file mode 100644
index 00000000000..3dc14f64d49
--- /dev/null
+++ b/res/drawable/ic_files_go_round.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="180"
+    android:viewportHeight="181">
+  <group>
+    <clip-path
+        android:pathData="M0,0.03h180v180h-180z"/>
+    <path
+        android:pathData="M142,0.03H38C17.01,0.03 0,17.04 0,38.03V142.03C0,163.02 17.01,180.03 38,180.03H142C162.99,180.03 180,163.02 180,142.03V38.03C180,17.04 162.99,0.03 142,0.03Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="90"
+            android:startY="0.03"
+            android:endX="90"
+            android:endY="179.28"
+            android:type="linear">
+          <item android:offset="0" android:color="?android:attr/colorBackgroundFloating"/>
+          <item android:offset="1" android:color="?android:attr/colorBackgroundFloating"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M139.45,40.9H40.54C34.79,40.9 30.13,45.56 30.13,51.31V112.11C30.13,117.86 34.79,122.52 40.54,122.52H139.45C145.2,122.52 149.86,117.86 149.86,112.11V51.31C149.86,45.56 145.2,40.9 139.45,40.9Z"
+        android:fillColor="#00A9ED"/>
+    <path
+        android:pathData="M137.25,46.56H42.75C37,46.56 32.34,51.22 32.34,56.97V117.77C32.34,123.52 37,128.18 42.75,128.18H137.25C143,128.18 147.66,123.52 147.66,117.77V56.97C147.66,51.22 143,46.56 137.25,46.56Z"
+        android:fillColor="#FAF17A"/>
+    <path
+        android:pathData="M137.25,53.44H42.75C37,53.44 32.34,58.1 32.34,63.85V124.65C32.34,130.4 37,135.06 42.75,135.06H137.25C143,135.06 147.66,130.4 147.66,124.65V63.85C147.66,58.1 143,53.44 137.25,53.44Z"
+        android:fillColor="#FAF17A"/>
+    <path
+        android:pathData="M30.13,69.24H139.46C142.22,69.24 144.87,70.34 146.82,72.29C148.77,74.24 149.87,76.89 149.87,79.65V126.76C149.87,129.52 148.77,132.17 146.82,134.12C144.87,136.07 142.22,137.17 139.46,137.17H40.54C37.78,137.17 35.13,136.07 33.18,134.12C31.23,132.17 30.13,129.52 30.13,126.76V69.24Z"
+        android:fillColor="#00A9ED"/>
+    <path
+        android:pathData="M71.97,62.37L72.05,62.53C70.45,59.59 67.24,57.53 64.67,57.53H38.21C37.15,57.53 36.1,57.74 35.12,58.15C34.14,58.55 33.25,59.15 32.5,59.9C31.75,60.65 31.16,61.54 30.75,62.52C30.35,63.5 30.14,64.55 30.14,65.61V69.23H82.14C78.58,69.23 73.87,65.86 71.97,62.37Z"
+        android:fillColor="#00A9ED"/>
+  </group>
+</vector>
diff --git a/res/drawable/ic_homepage_advanced_privacy.xml b/res/drawable/ic_homepage_advanced_privacy.xml
deleted file mode 100644
index c75e102402b..00000000000
--- a/res/drawable/ic_homepage_advanced_privacy.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019-2022 ECORP SAS
-
-  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="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M15.99,4V4C15.79,3.998 15.592,4.028 15.402,4.089L5.845,8.136C5.598,8.244 5.385,8.425 5.233,8.658C5.081,8.893 5,9.17 5,9.453L5,9.455C5,19.19 10.484,25.771 15.442,27.89L15.444,27.891C15.612,27.963 15.792,28 15.974,28C16.155,28 16.335,27.963 16.504,27.891L16.507,27.889C20.475,26.204 26.995,20.295 27,9.466C26.992,9.179 26.904,8.902 26.746,8.666C26.587,8.429 26.365,8.247 26.11,8.138L15.99,4ZM15.99,4L15.996,4C16.182,4.001 16.368,4.03 16.545,4.088L26.109,8.138L15.99,4Z"
-        android:strokeWidth="2"
-        android:strokeColor="#0088ED" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19.5,12.291C20.466,13.257 20.95,14.524 20.95,15.791C20.95,17.058 20.466,18.324 19.5,19.291C18.534,20.257 17.267,20.741 16,20.741C14.733,20.741 13.466,20.258 12.5,19.291C11.533,18.324 11.05,17.058 11.05,15.791C11.05,14.524 11.533,13.257 12.5,12.291"
-        android:strokeWidth="2"
-        android:strokeColor="#0088ED"
-        android:strokeLineCap="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M16.101,11.4L16.101,15.864"
-        android:strokeWidth="2"
-        android:strokeColor="#0088ED"
-        android:strokeLineCap="round" />
-</vector>
diff --git a/res/drawable/ic_lock_pin.xml b/res/drawable/ic_lock_pin.xml
index 4614f533393..4b61c327d5a 100644
--- a/res/drawable/ic_lock_pin.xml
+++ b/res/drawable/ic_lock_pin.xml
@@ -22,5 +22,5 @@
     android:tint="?android:attr/colorControlNormal">
   <path
       android:pathData="M6,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM16,6c0,1.1 0.9,2 2,2s2,-0.9 2,-2 -0.9,-2 -2,-2 -2,0.9 -2,2zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"
-      android:fillColor="?android:attr/colorAccent"/>
+      android:fillColor="?attr/sudListItemIconColor"/>
 </vector>
diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml
index cf3b408537f..0eac6d42879 100644
--- a/res/drawable/ic_password.xml
+++ b/res/drawable/ic_password.xml
@@ -21,15 +21,15 @@
     android:viewportWidth="24.0"
     android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M21.5,9.39l-1.63,0l0.81,-1.42l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0z" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M13.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M6.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M21,17.89H3c-0.28,0 -0.5,-0.22 -0.5,-0.5v-1c0,-0.28 0.22,-0.5 0.5,-0.5h18c0.28,0 0.5,0.22 0.5,0.5v1C21.5,17.66 21.28,17.89 21,17.89z" />
 </vector>
diff --git a/res/drawable/ic_pattern.xml b/res/drawable/ic_pattern.xml
index e56fb003a21..f47fd18ca04 100644
--- a/res/drawable/ic_pattern.xml
+++ b/res/drawable/ic_pattern.xml
@@ -21,18 +21,18 @@
     android:viewportWidth="24.0"
     android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M4,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M4,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M20,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M20,18c-0.93,0 -1.7,0.64 -1.93,1.5h-4.14c-0.22,-0.86 -1,-1.5 -1.93,-1.5s-1.7,0.64 -1.93,1.5H5.93c-0.05,-0.18 -0.12,-0.35 -0.21,-0.51l5.28,-5.28C11.29,13.89 11.63,14 12,14c1.1,0 2,-0.9 2,-2c0,-0.37 -0.11,-0.71 -0.28,-1.01l5.28,-5.28C19.29,5.89 19.63,6 20,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C12.71,10.11 12.37,10 12,10c-1.1,0 -2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C4.71,18.11 4.37,18 4,18c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c0.93,0 1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5s1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5c1.1,0 2,-0.9 2,-2S21.1,18 20,18z" />
 </vector>
diff --git a/res/drawable/ic_pin.xml b/res/drawable/ic_pin.xml
index 8520ec12468..132c6436231 100644
--- a/res/drawable/ic_pin.xml
+++ b/res/drawable/ic_pin.xml
@@ -21,6 +21,6 @@
     android:viewportWidth="24.0"
     android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?attr/sudListItemIconColor"
         android:pathData="M20,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,6A2,2 0,0 0,20 4ZM7.1,15L5.9,15L5.9,10.2L4.7,10.2L4.7,9L7.1,9v6ZM13.2,11.4A1.2,1.2 0,0 1,12 12.6L10.8,12.6v1.2h2.4L13.2,15L9.6,15L9.6,12.6a1.2,1.2 0,0 1,1.2 -1.2L12,11.4L12,10.2L9.6,10.2L9.6,9L12,9a1.2,1.2 0,0 1,1.2 1.2v1.2ZM19.3,11.1a0.9,0.9 0,0 1,-0.9 0.9,0.9 0.9,0 0,1 0.9,0.9v0.9A1.2,1.2 0,0 1,18.1 15L15.7,15L15.7,13.8h2.4L18.1,12.6L16.9,12.6L16.9,11.4h1.2L18.1,10.2L15.7,10.2L15.7,9h2.4a1.2,1.2 0,0 1,1.2 1.2v0.9Z" />
 </vector>
diff --git a/res/drawable/ic_screen_zoom_ftsw.xml b/res/drawable/ic_screen_zoom_ftsw.xml
new file mode 100644
index 00000000000..4e5f0851384
--- /dev/null
+++ b/res/drawable/ic_screen_zoom_ftsw.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,21L7,21v-1h10v1zM17,18L7,18L7,6h10v12zM17,4L7,4L7,3h10v1zM9.5,8.5L12,8.5L12,7L8,7v4h1.5zM12,17h4v-4h-1.5v2.5L12,15.5z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ring_progress.xml b/res/drawable/ring_progress.xml
index 346ff5f5bed..81d99273a9d 100644
--- a/res/drawable/ring_progress.xml
+++ b/res/drawable/ring_progress.xml
@@ -21,7 +21,7 @@
             android:shape="ring"
             android:thickness="@dimen/ring_progress_bar_thickness"
             android:useLevel="false"
-            android:tint="?android:colorControlNormal">
+            android:tint="@color/e_fingerprint_progress">
             <solid android:color="@*android:color/white_disabled_material" />
         </shape>
     </item>
diff --git a/res/layout-v34/settingslib_main_switch_bar.xml b/res/layout-v34/settingslib_main_switch_bar.xml
index 3a44d2ae86f..4fb9fb5c2f2 100644
--- a/res/layout-v34/settingslib_main_switch_bar.xml
+++ b/res/layout-v34/settingslib_main_switch_bar.xml
@@ -49,15 +49,14 @@
             android:lineBreakWordStyle="phrase"
             style="@style/MainSwitchText.Settingslib" />
 
-        <com.google.android.material.materialswitch.MaterialSwitch
+        <Switch
             android:id="@android:id/switch_widget"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:background="@null"
             android:clickable="false"
-            android:focusable="false"
-            android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
+            android:focusable="false" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/homepage_preference.xml b/res/layout/homepage_preference.xml
index 38cb4910d81..82a88a768cb 100644
--- a/res/layout/homepage_preference.xml
+++ b/res/layout/homepage_preference.xml
@@ -40,8 +40,8 @@
 
         <androidx.preference.internal.PreferenceImageView
             android:id="@android:id/icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             app:maxWidth="48dp"
             app:maxHeight="48dp"/>
 
@@ -54,7 +54,7 @@
         android:layout_weight="1"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
-        android:paddingStart="@dimen/homepage_preference_text_padding_start"
+        android:paddingStart="20dp"
         android:paddingEnd="24dp">
 
         <TextView
diff --git a/res/layout/notification_history.xml b/res/layout/notification_history.xml
index 29744cc7846..34a440fab90 100644
--- a/res/layout/notification_history.xml
+++ b/res/layout/notification_history.xml
@@ -17,7 +17,7 @@
 <androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scroll"
-    android:background="?android:attr/colorBackgroundFloating"
+    android:background="?android:attr/colorBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/res/layout/preference_widget_switch_compat.xml b/res/layout/preference_widget_switch_compat.xml
index e833171d5da..c52a05294f8 100644
--- a/res/layout/preference_widget_switch_compat.xml
+++ b/res/layout/preference_widget_switch_compat.xml
@@ -15,12 +15,11 @@
   ~ limitations under the License.
   -->
 
-<com.google.android.material.materialswitch.MaterialSwitch
+<Switch
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/switchWidget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@null"
     android:clickable="false"
-    android:focusable="false"
-    android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
+    android:focusable="false" />
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 69f17f64b88..0fd0372a012 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -19,7 +19,7 @@
     <color name="homepage_accessibility_background">#783BE5</color>
     <color name="homepage_support_background">#3F5FBD</color>
     <color name="contextual_card_background">@*android:color/material_grey_900</color>
-    <color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
+    <color name="search_bar_background">@*android:color/e_action_bar_dark</color>
     <color name="notification_importance_button_unselected">#5F6368</color>
 
     <!-- Palette list preference colors. -->
@@ -82,5 +82,9 @@
 
     <!-- Connected displays -->
     <color name="display_topology_background_color">@color/settingslib_color_charcoal</color>
+
+    <!-- Fingerprint colors -->
+    <color name="e_fingerprint_progress">#1FFFFFFF</color>
+    <color name="e_fingerprint_hint">#1FFFFFFF</color>
 </resources>
 
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 141badbc9c6..44e2fe641d6 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -20,7 +20,7 @@
     <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
         <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
         <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorBackground">@android:color/system_surface_container_dark</item>
+        <item name="android:colorBackground">@*android:color/e_background_dark</item>
         <!-- Homepage should follow device default design, the values is same as device default theme.-->
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
@@ -31,7 +31,7 @@
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@android:color/system_primary_dark</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
-        <item name="android:colorBackground">@android:color/system_surface_container_high_dark</item>
+        <item name="android:colorBackground">@*android:color/e_floating_background_dark</item>
     </style>
 
     <style name="Theme.Panel.Material" parent="Theme.Panel" >
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 91598fe6309..e53ba63fab1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -94,7 +94,7 @@
     <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
 
     <!-- Search bar background color -->
-    <color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
+    <color name="search_bar_background">@android:color/system_neutral1_50</color>
 
     <color name="face_enroll_icon_color">#42a5f5</color> <!-- Blue 400 -->
 
@@ -224,4 +224,8 @@
 
     <!-- Connected displays -->
     <color name="display_topology_background_color">@color/settingslib_color_grey100</color>
+
+    <!-- Fingerprint colors -->
+    <color name="e_fingerprint_progress">#14212121</color>
+    <color name="e_fingerprint_hint">#14212121</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5bcb805aeaf..53b38bdd0fa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -398,8 +398,8 @@
     </style>
 
     <style name="LockPatternStyle">
-        <item name="*android:regularColor">?android:attr/colorAccent</item>
-        <item name="*android:successColor">?android:attr/textColorPrimary</item>
+        <item name="*android:regularColor">?android:attr/textColorPrimary</item>
+        <item name="*android:successColor">?android:attr/colorAccent</item>
         <item name="*android:errorColor">?android:attr/colorError</item>
         <item name="*android:dotColor">?android:attr/textColorSecondary</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4f20d8c9091..2ad5be4b92d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -47,7 +47,7 @@
         <item name="wifi_friction">@drawable/wifi_friction</item>
 
         <item name="side_margin">0dp</item>
-        <item name="sudListItemIconColor">?android:attr/colorAccent</item>
+        <item name="sudListItemIconColor">?android:attr/textColorSecondary</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Widget.ActionBar</item>
@@ -118,6 +118,9 @@
     </style>
 
     <style name="Theme.AlertDialog" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="colorAccent">@*android:color/e_accent</item>
+        <item name="android:colorError">@color/settings_dialog_colorError</item>
+        <item name="android:colorBackground">@*android:color/e_floating_background</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="android:clipToPadding">true</item>
         <item name="android:clipChildren">true</item>
@@ -202,7 +205,7 @@
         <!-- Homepage should follow device default design, the values is same as device default theme.-->
         <item name="android:navigationBarColor">@android:color/white</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:colorBackground">@android:color/system_surface_container_light</item>
+        <item name="android:colorBackground">@*android:color/e_background_light</item>
     </style>
 
     <style name="Theme.Settings.Home.NoAnimation">
diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml
index 250954353f5..673f8c8b5ce 100644
--- a/res/xml/accessibility_settings_for_setup_wizard.xml
+++ b/res/xml/accessibility_settings_for_setup_wizard.xml
@@ -22,7 +22,7 @@
 
     <Preference
         android:fragment="com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard"
-        android:icon="@drawable/ic_adaptive_font_download"
+        android:icon="@drawable/ic_adaptive_font_download_ftsw"
         android:key="text_reading_options"
         android:persistent="false"
         android:title="@string/accessibility_text_reading_options_title"
@@ -48,7 +48,7 @@
     <Preference
         android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard"
         android:key="screen_magnification_preference"
-        android:icon="@drawable/ic_accessibility_magnification"
+        android:icon="@drawable/ic_accessibility_magnification_ftsw"
         android:summary="@string/accessibility_preference_magnification_summary"
         android:title="@string/accessibility_screen_magnification_title" />
 
diff --git a/res/xml/storage_category_fragment.xml b/res/xml/storage_category_fragment.xml
index 8af66396bd5..96cf8bdd318 100644
--- a/res/xml/storage_category_fragment.xml
+++ b/res/xml/storage_category_fragment.xml
@@ -24,6 +24,7 @@
         android:order="4"
         android:title="@string/storage_free_up_space_title"
         android:summary="@string/storage_free_up_space_summary"
+        android:icon="@drawable/ic_files_go_round"
         settings:controller="com.android.settings.deviceinfo.storage.ManageStoragePreferenceController"/>
     <!-- Preference order 100~200 are 'ONLY' for storage category preferences below. -->
     <Preference
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 6c2b8d48b66..044ccbd1767 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -43,6 +43,7 @@
         android:order="4"
         android:title="@string/storage_free_up_space_title"
         android:summary="@string/storage_free_up_space_summary"
+        android:icon="@drawable/ic_files_go_round"
         settings:controller="com.android.settings.deviceinfo.storage.ManageStoragePreferenceController"/>
     <!-- Preference order 100~200 are 'ONLY' for storage category preferences below. -->
     <Preference
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 8aa41aebb06..c34f15e6a22 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -25,7 +25,7 @@
         android:key="top_level_update"
         android:title="@string/system_update_settings_list_item_title"
         android:summary="@string/system_update_summary"
-        android:icon="@drawable/ic_system_update"
+        android:icon="@drawable/ic_e_settings_updater"
         android:order="-170"
         settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
         settings:keywords="@string/keywords_system_update_settings">
@@ -34,7 +34,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.accounts.AccountDashboardFragment"
-        android:icon="@drawable/ic_settings_accounts"
+        android:icon="@drawable/ic_e_settings_accounts"
         android:key="top_level_accounts"
         android:order="-160"
         android:title="@string/account_settings_title"
@@ -44,7 +44,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.network.NetworkDashboardFragment"
-        android:icon="@drawable/ic_settings_wireless"
+        android:icon="@drawable/ic_e_settings_wireless"
         android:key="top_level_network"
         android:order="-150"
         android:title="@string/network_dashboard_title"
@@ -64,7 +64,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
-        android:icon="@drawable/ic_devices_other"
+        android:icon="@drawable/ic_e_settings_devices_other"
         android:key="top_level_connected_devices"
         android:order="-140"
         android:title="@string/connected_devices_dashboard_title"
@@ -74,7 +74,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.applications.AppDashboardFragment"
-        android:icon="@drawable/ic_apps"
+        android:icon="@drawable/ic_e_settings_apps"
         android:key="top_level_apps"
         android:order="-130"
         android:title="@string/apps_dashboard_title"
@@ -83,7 +83,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
-        android:icon="@drawable/ic_notifications"
+        android:icon="@drawable/ic_e_settings_notifications"
         android:key="top_level_notifications"
         android:order="-120"
         android:title="@string/configure_notification_settings"
@@ -92,7 +92,7 @@
 
     <com.android.settings.widget.RestrictedHomepagePreference
         android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
-        android:icon="@*android:drawable/ic_zen_priority_modes"
+        android:icon="@drawable/ic_e_settings_modes"
         android:key="top_level_priority_modes"
         android:order="-115"
         android:title="@string/zen_modes_list_title"
@@ -102,7 +102,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
-        android:icon="@drawable/ic_settings_battery_white"
+        android:icon="@drawable/ic_e_settings_battery"
         android:key="top_level_battery"
         android:order="-110"
         android:title="@string/power_usage_summary_title"
@@ -112,7 +112,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
-        android:icon="@drawable/ic_storage_white"
+        android:icon="@drawable/ic_e_settings_storage"
         android:key="top_level_storage"
         android:order="-100"
         android:title="@string/storage_settings"
@@ -122,7 +122,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.notification.SoundSettings"
-        android:icon="@drawable/ic_volume_up_24dp"
+        android:icon="@drawable/ic_e_settings_sound"
         android:key="top_level_sound"
         android:order="-90"
         android:title="@string/sound_settings"
@@ -132,7 +132,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.DisplaySettings"
-        android:icon="@drawable/ic_settings_display_white"
+        android:icon="@drawable/ic_e_settings_display"
         android:key="top_level_display"
         android:order="-80"
         android:title="@string/display_settings"
@@ -141,7 +141,7 @@
         settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
 
     <com.android.settings.widget.RestrictedHomepagePreference
-        android:icon="@drawable/ic_settings_wallpaper_white"
+        android:icon="@drawable/ic_e_settings_wallpaper"
         android:key="top_level_wallpaper"
         android:order="-70"
         android:title="@string/wallpaper_settings_title"
@@ -151,7 +151,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.accessibility.AccessibilitySettings"
-        android:icon="@drawable/ic_settings_accessibility"
+        android:icon="@drawable/ic_e_settings_accessibility"
         android:key="top_level_accessibility"
         android:order="-60"
         android:title="@string/accessibility_settings"
@@ -160,7 +160,7 @@
         settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
 
     <com.android.settings.widget.HomepagePreference
-        android:icon="@drawable/ic_settings_safety_center"
+        android:icon="@drawable/ic_e_settings_security"
         android:key="top_level_safety_center"
         android:order="-55"
         android:title="@string/safety_center_title"
@@ -170,7 +170,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.security.SecuritySettings"
-        android:icon="@drawable/ic_settings_security_white"
+        android:icon="@drawable/ic_e_settings_security"
         android:key="top_level_security"
         android:order="-50"
         android:title="@string/security_settings_title"
@@ -180,7 +180,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
-        android:icon="@drawable/ic_settings_privacy"
+        android:icon="@drawable/ic_e_settings_privacy"
         android:key="top_level_privacy"
         android:order="-40"
         android:title="@string/privacy_dashboard_title"
@@ -192,7 +192,7 @@
         android:key="top_level_advanced_privacy"
         android:title="@string/advanced_privacy_dashboard_title"
         android:summary="@string/advanced_privacy_dashboard_summary"
-        android:icon="@drawable/ic_homepage_advanced_privacy"
+        android:icon="@drawable/ic_e_settings_advanced_privacy"
         android:order="-35"
         android:fragment="com.android.settings.privacy.AdvancedPrivacyDashboardFragment"/>
 
@@ -215,7 +215,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.location.LocationSettings"
-        android:icon="@drawable/ic_settings_location"
+        android:icon="@drawable/ic_e_settings_location"
         android:key="top_level_location"
         android:order="-30"
         android:title="@string/location_settings_title"
@@ -227,7 +227,7 @@
         android:key="top_level_emergency"
         android:title="@string/emergency_settings_preference_title"
         android:summary="@string/emergency_dashboard_summary"
-        android:icon="@drawable/ic_settings_emergency"
+        android:icon="@drawable/ic_e_settings_emergency"
         android:order="-20"
         android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
         settings:isPreferenceVisible="@bool/config_show_emergency_settings"
@@ -235,7 +235,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.system.SystemDashboardFragment"
-        android:icon="@drawable/ic_settings_system_dashboard_white"
+        android:icon="@drawable/ic_e_settings_system"
         android:key="top_level_system"
         android:order="10"
         android:title="@string/header_category_system"
@@ -244,7 +244,7 @@
 
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
-        android:icon="@drawable/ic_settings_about_device"
+        android:icon="@drawable/ic_e_settings_about"
         android:key="top_level_about_device"
         android:order="20"
         android:title="@string/about_settings"
diff --git a/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java b/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java
index 442531bae26..e35b0cd025e 100644
--- a/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java
@@ -61,7 +61,6 @@ public class ManageStoragePreferenceController extends BasePreferenceController
         super.displayPreference(screen);
 
         Preference preference = screen.findPreference(getPreferenceKey());
-        preference.setIcon(mManageStorageDrawable);
     }
 
     @Override
diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
index 87e5560c959..83efd707dc2 100644
--- a/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -215,13 +215,6 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
         if (Flags.homepageRevamp()) {
             return;
         }
-        int tintColor = Utils.getHomepageIconColor(getContext());
-        iteratePreferences(preference -> {
-            Drawable icon = preference.getIcon();
-            if (icon != null) {
-                icon.setTint(tintColor);
-            }
-        });
     }
 
     @Override
diff --git a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
index 15e83de9149..43f7cc27d37 100644
--- a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
+++ b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
@@ -247,10 +247,6 @@ public class HighlightableTopLevelPreferenceAdapter extends RoundCornerPreferenc
             v.setBackgroundResource(RES_HIGHLIGHTED_BACKGROUND);
             ((TextView) v.findViewById(android.R.id.title)).setTextColor(mTitleColorHighlight);
             ((TextView) v.findViewById(android.R.id.summary)).setTextColor(mSummaryColorHighlight);
-            final Drawable drawable = ((ImageView) v.findViewById(android.R.id.icon)).getDrawable();
-            if (drawable != null) {
-                drawable.setTint(mIconColorHighlight);
-            }
         }
     }
 
@@ -263,10 +259,6 @@ public class HighlightableTopLevelPreferenceAdapter extends RoundCornerPreferenc
             v.setBackgroundResource(RES_NORMAL_BACKGROUND);
             ((TextView) v.findViewById(android.R.id.title)).setTextColor(mTitleColorNormal);
             ((TextView) v.findViewById(android.R.id.summary)).setTextColor(mSummaryColorNormal);
-            final Drawable drawable = ((ImageView) v.findViewById(android.R.id.icon)).getDrawable();
-            if (drawable != null) {
-                drawable.setTint(mIconColorNormal);
-            }
         }
     }
 
-- 
GitLab


From bb066c3d8f88214b79ded04541df145dfc296535 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 26 May 2025 11:37:18 +0530
Subject: [PATCH 2/2] Change default highlight key which makes top entries
 visible in tablet

---
 res/values/menu_keys.xml                                        | 2 +-
 src/com/android/settings/homepage/SettingsHomepageActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/menu_keys.xml b/res/values/menu_keys.xml
index 36fdb818c6c..4590577fdd9 100755
--- a/res/values/menu_keys.xml
+++ b/res/values/menu_keys.xml
@@ -37,5 +37,5 @@
     <string name="menu_key_system" translatable="false">top_level_system</string>
     <string name="menu_key_about_device" translatable="false">top_level_about_device</string>
     <string name="menu_key_support" translatable="false">top_level_support</string>
-
+    <string name="menu_key_updater" translatable="false">top_level_update</string>
 </resources>
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 4b9f6a8da9d..f7f30bb953b 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -105,7 +105,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
     @VisibleForTesting
     static final String EXTRA_INITIAL_REFERRER = "initial_referrer";
 
-    static final int DEFAULT_HIGHLIGHT_MENU_KEY = R.string.menu_key_network;
+    static final int DEFAULT_HIGHLIGHT_MENU_KEY = R.string.menu_key_updater;
     private static final long HOMEPAGE_LOADING_TIMEOUT_MS = 300;
 
     private TopLevelSettings mMainFragment;
-- 
GitLab