diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index b6a80cfd9d81d7baf2becece22a9f8db932d91ff..38aae672f63484c4721bc944825aed69db3b7c69 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -19,7 +19,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:autoMirrored="true"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@lineageos.platform:color/color_default_accent">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />
diff --git a/res/drawable/ic_find_in_page_24px.xml b/res/drawable/ic_find_in_page_24px.xml
index 18895e49a1c883a867a14185fd150547a4627a62..8bde63e2b1b41314e7cd23af30f65f22ce541db2 100644
--- a/res/drawable/ic_find_in_page_24px.xml
+++ b/res/drawable/ic_find_in_page_24px.xml
@@ -20,7 +20,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@lineageos.platform:color/color_default_accent">
   <path
       android:fillColor="#FFFFFFFF"
       android:pathData="M6,2C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8l-6,-6H6zM18,17.59l-2.2,-2.2c0.44,-0.69 0.7,-1.51 0.7,-2.39c0,-2.48 -2.02,-4.5 -4.5,-4.5S7.5,10.52 7.5,13s2.02,4.5 4.5,4.5c0.88,0 1.69,-0.26 2.39,-0.7l3.2,3.2L6,20V4h7.17L18,8.83V17.59zM12,15.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5S13.38,15.5 12,15.5z"/>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 3bdfbd49cbcf0517a8c79718b2a9eba99100d756..724dba7ef89f6e579d4954266010850121f96bf8 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -28,7 +28,7 @@
         android:maxLines="2"
         android:ellipsize="end"
         android:textAppearance="@style/TextAppearance.Switch"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="@lineageos.platform:color/color_default_primary_text"
         android:textAlignment="viewStart"/>
 
     <ImageView
@@ -45,8 +45,7 @@
         android:id="@+id/switch_widget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:theme="@style/Widget.SwitchBar.Switch"/>
+        android:layout_gravity="center_vertical" />
 
 </merge>
 
diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml
index 6df42c4260d9a60e7534683ae438236ef4ad5b92..39261e17d04d06c937d9a427ca753b52e89058c1 100644
--- a/res/menu/time_zone_base_search_menu.xml
+++ b/res/menu/time_zone_base_search_menu.xml
@@ -19,7 +19,7 @@
     <item
         android:id="@+id/time_zone_search_menu"
         android:title="@string/search_settings"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_homepage_search"
         android:showAsAction="always|collapseActionView"
         android:actionViewClass="android.widget.SearchView" />
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 354da77fe149be8e45316c114602fd944c418f8a..6a7011ac62787a587855bac6b02135da1d94ea04 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -20,10 +20,7 @@
     <color name="homepage_accessibility_background">#783BE5</color>
     <color name="homepage_support_background">#3F5FBD</color>
     <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
-    <color name="contextual_card_background">@*android:color/material_grey_900</color>
-    <color name="search_bar_background">@*android:color/material_grey_800</color>
     <!-- Dialog background color. -->
-    <color name="dialog_background">@*android:color/material_grey_800</color>
     <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
     <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
     <color name="notification_importance_button_unselected">#5F6368</color>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 87159b8b76f16ba07396f29e8df79c71c11620c0..30c8bddade589cfa56f1e35720d46a341e08895b 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -18,7 +18,11 @@
 <resources>
 
 <style name="Widget.ActionBar.Base" parent="@android:style/Widget.DeviceDefault.ActionBar.Solid">
-  <item name="android:background">?android:attr/colorPrimaryDark</item>
+  <item name="android:background">@lineageos.platform:color/color_default_primary</item>
+  <item name="android:colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+  <item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+  <item name="android:colorAccent">@lineageos.platform:color/color_default_accent</item>
+  <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
 </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 2105550d591c19ffd989f1e8759ec26e4d0c7fde..79cb1c898b9707ec10e96f33a4d900d1bb2844be 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -18,21 +18,21 @@
 <resources>
 
     <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:attr/colorPrimaryDark</item>
+        <item name="colorPrimary">@lineageos.platform:color/color_default_primary</item>
+        <item name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:colorBackground">@lineageos.platform:color/color_default_background</item>
     </style>
 
     <style name="ThemeOverlay.Settings.SearchBar" parent="Theme.Settings">
-        <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
-        <item name="cardBackgroundColor">?android:attr/colorPrimary</item>
-        <item name="android:colorControlNormal">?android:attr/colorAccent</item>
+        <item name="android:colorBackground">@lineageos.platform:color/color_default_primary</item>
+        <item name="cardBackgroundColor">@lineageos.platform:color/color_default_primary</item>
+        <item name="android:colorControlNormal">@lineageos.platform:color/color_default_accent</item>
     </style>
 
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
         <item name="android:colorBackground">@color/dialog_background</item>
     </style>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4904160b9e5149033719ebe2a358875ac9332ba6..ed043b8b39bd45c5e8ef88f870f05414bdd4a68e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -46,7 +46,7 @@
     <color name="running_processes_system_ram">#ff384248</color>
     <color name="running_processes_free_ram">#ffced7db</color>
 
-    <color name="sim_noitification">@*android:color/accent_device_default_light</color>
+    <color name="sim_noitification">@lineageos.platform:color/color_default_accent</color>
 
     <color name="confirm_device_credential_transparent_black">#60000000</color>
 
@@ -101,7 +101,7 @@
 
     <color name="contextual_card_stroke_color">#1f000000</color>
     <color name="contextual_card_dismissal_background">@*android:color/material_grey_100</color>
-    <color name="contextual_card_background">@*android:color/background_device_default_light</color>
+    <color name="contextual_card_background">@lineageos.platform:color/color_default_background</color>
     <!-- End of dashboard/homepage icon background colors -->
 
     <color name="switchbar_background_color">@*android:color/material_grey_600</color>
@@ -132,7 +132,7 @@
     <color name="notification_history_background">?android:attr/colorBackgroundFloating</color>
 
     <!-- launcher icon color -->
-    <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
+    <color name="icon_launcher_setting_color">@lineageos.platform:color/color_default_accent</color>
 
     <!-- QR code scanner colors -->
     <color name="qr_corner_line_color">#ffdadce0</color>
@@ -141,10 +141,10 @@
     <!-- End of QR code scanner colors -->
 
     <!-- Search bar background color -->
-    <color name="search_bar_background">@android:color/white</color>
+    <color name="search_bar_background">@lineageos.platform:color/color_default_primary_dark</color>
 
     <!-- Dialog background color -->
-    <color name="dialog_background">@*android:color/background_device_default_light</color>
+    <color name="dialog_background">@lineageos.platform:color/color_default_foreground</color>
 
     <color name="face_intro_outline">#ffdadce0</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1be8ba0e0b6c901502f81770c05abc209779b846..fb022248c74ff2185ca23fcc2a555a80b8ce5db5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,9 @@
 <resources>
 
     <style name="Widget.ActionBar.Base"
-           parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid"/>
+           parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
+        <item name="android:background">@lineageos.platform:color/color_default_primary</item>
+    </style>
 
     <style name="Widget.ActionBar"
            parent="Widget.ActionBar.Base">
@@ -787,4 +789,18 @@
            parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
     </style>
+
+    <style name="actionBarTheme" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
+        <item name="android:colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+        <item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:colorAccent">@lineageos.platform:color/color_default_accent</item>
+        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+    </style>
+
+    <style name="customOverFlow" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@lineageos.platform:color/color_default_accent</item>
+    </style>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 172a89a7351c9d3807147b14b5ca1752e2079576..72d330ba3bf21c127dca37cda848be82945191ef 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -23,7 +23,22 @@
         <item name="android:windowIsFloating">true</item>
     </style>
 
-    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
+    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings">
+        <item name="android:actionBarTheme">@style/actionBarTheme</item>
+        <item name="actionBarTheme">@style/actionBarTheme</item>
+        <item name="android:statusBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:colorBackground">@lineageos.platform:color/color_default_background</item>
+        <item name="android:colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+        <item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:colorAccent">@lineageos.platform:color/color_default_accent</item>
+        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
+    </style>
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
         <item name="preferenceTheme">@style/PreferenceTheme</item>
@@ -31,7 +46,6 @@
         <item name="android:clipChildren">false</item>
         <item name="android:listPreferredItemHeight">72dip</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>
 
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -96,7 +110,7 @@
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
         <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
-        <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
+        <item name="switchBarBackgroundActivatedColor">@lineageos.platform:color/color_default_accent</item>
         <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
     </style>
 
@@ -123,7 +137,7 @@
     </style>
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
         <item name="android:colorBackground">@color/dialog_background</item>
     </style>
 
@@ -173,8 +187,8 @@
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">#00000000</item>
-        <item name="android:navigationBarColor">#00000000</item>
+        <item name="android:statusBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
     </style>
 
     <style name="FallbackHome.SetupWizard" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
@@ -182,8 +196,8 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">#00000000</item>
-        <item name="android:navigationBarColor">#00000000</item>
+        <item name="android:statusBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
     </style>
 
     <style name="Theme.BluetoothPermission" parent="@style/Theme.AlertDialog">
@@ -191,12 +205,12 @@
     </style>
 
     <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
-        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="colorPrimary">@lineageos.platform:color/color_default_accent</item>
+        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
         <item name="preferenceTheme">@style/PreferenceTheme</item>
 
         <!-- action bar, needed for search bar icon tinting -->
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>
+        <item name="android:actionBarTheme">@style/actionBarTheme</item>
 
         <!-- Define this color for material design -->
         <item name="colorPrimaryVariant">@android:color/white</item>
@@ -205,9 +219,9 @@
     <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
         <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarDividerColor">@*android:color/ripple_material_light</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:navigationBarDividerColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@lineageos.platform:color/color_default_background</item>
     </style>
 
     <style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">
@@ -229,29 +243,29 @@
          set to ensure settings activity always shows light theme in setupwizard flow. -->
     <style name="LightTheme.SettingsBase.SetupWizard" parent="@android:style/Theme.DeviceDefault">
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
+        <item name="android:navigationBarDividerColor">@lineageos.platform:color/color_default_primary_dark</item>
 
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
-        <item name="android:colorBackground">@*android:color/background_device_default_light</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorPrimary">@lineageos.platform:color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:colorBackground">@lineageos.platform:color/color_default_background</item>
+        <item name="android:colorAccent">@lineageos.platform:color/color_default_accent</item>
 
-        <item name="android:listDivider">@*android:color/list_divider_color_light</item>
+        <item name="android:listDivider">@lineageos.platform:color/color_default_divider</item>
 
-        <item name="android:textColorPrimary">@*android:color/primary_text_light</item>
-        <item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
     </style>
 
     <!-- Light theme for those pages inherit SubSettings and launched during setup flow -->
     <style name="LightTheme.SubSettings.SetupWizard" parent="@android:style/Theme.DeviceDefault.Light">
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
+        <item name="android:statusBarColor">@lineageos.platform:color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@lineageos.platform:color/color_default_primary_dark</item>
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowBackground">@android:color/white</item>
-        <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
+        <item name="android:windowBackground">@lineageos.platform:color/color_default_background</item>
+        <item name="android:navigationBarDividerColor">@lineageos.platform:color/color_default_primary_dark</item>
 
         <item name="android:colorPrimary">@android:color/white</item>
         <item name="android:colorPrimaryDark">@android:color/white</item>
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 9e22bbffa503fe01c3f959c3ae7f8c529747a2a7..59ad0e3922e293371e8f53bdf5120ce04f70bbcf 100644
--- a/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -87,7 +87,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
         }
         final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
                 R.string.search_menu);
-        searchItem.setIcon(R.drawable.ic_search_24dp);
+        searchItem.setIcon(R.drawable.ic_homepage_search);
         searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         searchItem.setOnMenuItemClickListener(target -> {