diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index 5518de2d5c246..f33eb6fd28166 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -26,6 +26,7 @@
@color/secondary_material_settings
@color/tertiary_material_settings
+ @color/quaternary_material_settings
@color/accent_material_light
@color/accent_material_dark
diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml
index 2ac4092a50795..8a6c229bcdd05 100644
--- a/core/res/res/values/colors_material.xml
+++ b/core/res/res/values/colors_material.xml
@@ -34,6 +34,7 @@
@color/material_blue_grey_800
@color/material_blue_grey_700
+ @color/material_blue_grey_200
@color/material_deep_teal_500
@color/material_deep_teal_200
@@ -85,6 +86,7 @@
#ff4db6ac
#ff009688
+ #ffb0bec5
#ff455a64
#ff37474f
#ff263238
diff --git a/packages/SystemUI/res/color/qs_detail_empty.xml b/packages/SystemUI/res/color/qs_detail_empty.xml
new file mode 100644
index 0000000000000..4be39c7ca6e03
--- /dev/null
+++ b/packages/SystemUI/res/color/qs_detail_empty.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index d12ef42590dcc..9061376a32792 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -34,8 +34,7 @@
#FFFFFFFF
#29ffffff
#99FFFFFF
- #24B0BEC5
- #FFB0BEC5
+ @*android:color/quaternary_device_default_settings
#B3FFFFFF
#66FFFFFF
#99FFFFFF
@@ -122,7 +121,7 @@
#14FFFFFF
#FFFFFFFF
- #FFB0BEC5
+ @*android:color/quaternary_device_default_settings
#99000000
#3d000000
@@ -134,7 +133,7 @@
#ffffffff
#7fffffff
- #FFB0BEC5
+ @*android:color/quaternary_device_default_settings
#ff000000
#ffffff
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index e5681ce517f96..1ee13e96ecfeb 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -290,7 +290,7 @@