diff --git a/packages/SystemUI/res/drawable/button_border_selected.xml b/packages/SystemUI/res/drawable/button_border_selected.xml
index 1e40adefca2a0..01e7099844a9f 100644
--- a/packages/SystemUI/res/drawable/button_border_selected.xml
+++ b/packages/SystemUI/res/drawable/button_border_selected.xml
@@ -19,7 +19,7 @@
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/button_border_unselected.xml b/packages/SystemUI/res/drawable/button_border_unselected.xml
index 4ea37640780ff..b9c4ced3631bf 100644
--- a/packages/SystemUI/res/drawable/button_border_unselected.xml
+++ b/packages/SystemUI/res/drawable/button_border_unselected.xml
@@ -18,7 +18,7 @@
android:shape="rectangle"
android:color="@color/notification_guts_selection_bg">
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index f9bf47bb7d08d..89d1a19737ee6 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -37,16 +37,17 @@
#30ffffff
- @*android:color/notification_material_background_color
+ @color/GM2_grey_900
@*android:color/notification_primary_text_color_dark
- #202124
- #669DF6
- @color/GM2_grey_200
+ @color/GM2_grey_800
+ @color/GM2_grey_700
+ @color/GM2_grey_500
@color/GM2_grey_200
- @color/GM2_grey_100
+ @color/GM2_grey_200
+ @color/GM2_blue_200
@color/GM2_grey_900
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 4e1a7d07e687e..b673e5207f804 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -95,6 +95,7 @@
@color/GM2_grey_900
#FF32c1de
#FFF87B2B
+ @color/GM2_blue_700
#ffffff
@@ -177,6 +178,9 @@
#F28B82
#B71C1C
+ #AECBFA
+ #1967D2
+
#FFFBBC04
#FF34A853
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 23de2acf14c9a..aa89dce4114ad 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -452,7 +452,7 @@