diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml
index 113ae0cf49d..3757517c179 100644
--- a/res/drawable/button_border_selected.xml
+++ b/res/drawable/button_border_selected.xml
@@ -18,9 +18,9 @@
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
     <solid
-        android:color="?androidprv:attr/materialColorPrimaryContainer" />
+        android:color="?androidprv:attr/materialColorSecondaryContainer" />
     <stroke
         android:width="1dp"
-        android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
+        android:color="?androidprv:attr/materialColorOnSecondaryContainer"/>
     <corners android:radius="@dimen/rect_button_radius" />
 </shape>
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 346cca37275..44b8d171a73 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -168,7 +168,7 @@ public class BubblePreference extends Preference implements View.OnClickListener
             mView.setSelected(selected);
 
             int colorResId = selected
-                    ? com.android.internal.R.attr.materialColorOnPrimaryContainer
+                    ? com.android.internal.R.attr.materialColorOnSecondaryContainer
                     : com.android.internal.R.attr.materialColorOnSurfaceVariant;
             ColorStateList stateList = Utils.getColorAttr(context, colorResId);
             mImageView.setImageTintList(stateList);