diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index e0a02067223..e90d9e41745 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -3373,4 +3373,20 @@
             column="10"/>
     </issue>
 
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:color=&quot;@color/notification_importance_selection_bg&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/button_border_selected.xml"
+            line="21"
+            column="10"/>
+    </issue>
+
 </issues>
diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml
index 9701b382540..d96128b1c99 100644
--- a/res/drawable/button_border_selected.xml
+++ b/res/drawable/button_border_selected.xml
@@ -16,8 +16,10 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
+    <solid
+        android:color="@color/notification_importance_selection_bg" />
     <stroke
-        android:width="2dp"
+        android:width="1dp"
         android:color="?android:attr/textColorSecondary"/>
     <corners android:radius="@dimen/rect_button_radius" />
 </shape>
diff --git a/res/drawable/button_border_unselected.xml b/res/drawable/button_border_unselected.xml
index 4153303667d..092b1246f82 100644
--- a/res/drawable/button_border_unselected.xml
+++ b/res/drawable/button_border_unselected.xml
@@ -17,7 +17,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <stroke
-        android:width="2dp"
+        android:width="1dp"
         android:color="?android:attr/textColorSecondary"/>
 
     <corners android:radius="@dimen/rect_button_radius" />
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index b7b30f5836a..ae81762fdc7 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -26,5 +26,6 @@
   <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>
 </resources>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1245b37ff2c..77f02d5ac1b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -127,6 +127,7 @@
     <color name="notification_silence_color">#FF32c1de</color>
     <color name="notification_alert_color">#FFF87B2B</color>
     <color name="notification_importance_button_unselected">#FFDADCE0</color>
+    <color name="notification_importance_selection_bg">#FFFFFF</color>
 
     <!-- launcher icon color -->
     <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>