diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml
index 1402380d0ed..113ae0cf49d 100644
--- a/res/drawable/button_border_selected.xml
+++ b/res/drawable/button_border_selected.xml
@@ -15,9 +15,12 @@
   limitations under the License.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
+    <solid
+        android:color="?androidprv:attr/materialColorPrimaryContainer" />
     <stroke
-        android:width="2dp"
-        android:color="?android:attr/colorAccent"/>
+        android:width="1dp"
+        android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
     <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 d0ce75b8c86..c97a5ba4827 100644
--- a/res/drawable/button_border_unselected.xml
+++ b/res/drawable/button_border_unselected.xml
@@ -15,10 +15,10 @@
   limitations under the License.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="?android:attr/colorAccent"/>
-
+        android:color="?androidprv:attr/materialColorOutlineVariant"/>
     <corners android:radius="@dimen/rect_button_radius" />
 </shape>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 53766e74368..fe152266f9e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -420,7 +420,7 @@
 
     <style name="WorkChallengeEmergencyButtonStyle">
         <item name="android:background">@drawable/work_challenge_emergency_button_background</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@android:color/system_accent3_900</item>
         <item name="android:outlineProvider">none</item>
         <item name="android:paddingTop">15dp</item>
         <item name="android:paddingBottom">15dp</item>
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 9de7e0c9b12..346cca37275 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -167,9 +167,10 @@ public class BubblePreference extends Preference implements View.OnClickListener
                 : R.drawable.button_border_unselected));
             mView.setSelected(selected);
 
-            ColorStateList stateList = selected
-                    ? Utils.getColorAccent(context)
-                    : Utils.getColorAttr(context, android.R.attr.textColorPrimary);
+            int colorResId = selected
+                    ? com.android.internal.R.attr.materialColorOnPrimaryContainer
+                    : com.android.internal.R.attr.materialColorOnSurfaceVariant;
+            ColorStateList stateList = Utils.getColorAttr(context, colorResId);
             mImageView.setImageTintList(stateList);
             mTextView.setTextColor(stateList);
         }