diff --git a/res/drawable/settings_panel_background.xml b/res/drawable/settings_panel_background.xml
index adb4646ccc3..15821f69272 100644
--- a/res/drawable/settings_panel_background.xml
+++ b/res/drawable/settings_panel_background.xml
@@ -16,7 +16,7 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/res/drawable/settings_panel_rounded_top_corner_background.xml b/res/drawable/settings_panel_rounded_top_corner_background.xml
index 1c234cca9b3..06eae8b2818 100644
--- a/res/drawable/settings_panel_rounded_top_corner_background.xml
+++ b/res/drawable/settings_panel_rounded_top_corner_background.xml
@@ -21,6 +21,6 @@
android:topRightRadius="@dimen/settings_panel_corner_radius"
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"/>
-
+
-
\ No newline at end of file
+
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 53d2e9bc13e..ae766ee78ed 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -29,7 +29,8 @@
@color/m3_ref_palette_red80
@color/m3_ref_palette_purple80
- @*android:color/material_grey_900
+ @*android:color/background_device_default_dark
+ @*android:color/background_device_default_dark
#5F6368
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e71636cf57e..c22d88edb56 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -116,7 +116,7 @@
@color/m3_ref_palette_purple30
@color/m3_ref_palette_purple90
- @*android:color/material_grey_100
+ @*android:color/background_device_default_light
@*android:color/background_device_default_light
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1690361db3d..7fbd86a70d6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -424,7 +424,7 @@
600dp
- 28dp
+ @*android:dimen/config_dialogCornerRadius
24dp
16dp
@dimen/match_parent
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e1aab016195..c319202ba39 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -530,7 +530,7 @@