diff --git a/res/color-night-v35/settings_two_pane_background_color.xml b/res/color-night-v35/settings_two_pane_background_color.xml
new file mode 100644
index 00000000000..1d5daf29f77
--- /dev/null
+++ b/res/color-night-v35/settings_two_pane_background_color.xml
@@ -0,0 +1,18 @@
+<?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-v35/settings_two_pane_background_color.xml b/res/color-v35/settings_two_pane_background_color.xml
new file mode 100644
index 00000000000..ff305abada2
--- /dev/null
+++ b/res/color-v35/settings_two_pane_background_color.xml
@@ -0,0 +1,18 @@
+<?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_light" />
+</selector>
\ No newline at end of file
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index c28bfbb94ef..141badbc9c6 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:attr/colorPrimaryDark</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_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>
@@ -29,9 +29,9 @@
     <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">@android:color/system_primary_dark</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
-        <item name="android:colorBackground">@*android:color/surface_dark</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_high_dark</item>
     </style>
 
     <style name="Theme.Panel.Material" parent="Theme.Panel" >
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 73a7d6769e1..182dd694318 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -115,9 +115,9 @@
     </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">@android:color/system_primary_light</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
-        <item name="android:colorBackground">@*android:color/surface_light</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_high_light</item>
     </style>
 
     <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
@@ -204,6 +204,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>
     </style>
 
     <style name="Theme.Settings.Home.NoAnimation">