diff --git a/packages/SystemUI/res/drawable/qs_media_button_background.xml b/packages/SystemUI/res/drawable/qs_media_button_background.xml
index 2241abf130e30..ed9bd263a79df 100644
--- a/packages/SystemUI/res/drawable/qs_media_button_background.xml
+++ b/packages/SystemUI/res/drawable/qs_media_button_background.xml
@@ -26,4 +26,5 @@
             android:right="16dp"
             android:top="8dp"
             android:bottom="8dp" />
+        <solid android:color="@android:color/transparent" />
 </shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/media_carousel.xml b/packages/SystemUI/res/layout/media_carousel.xml
index 95cee66af5362..87acfd088939f 100644
--- a/packages/SystemUI/res/layout/media_carousel.xml
+++ b/packages/SystemUI/res/layout/media_carousel.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:clipChildren="false"
     android:clipToPadding="false"
-    >
+    android:theme="@style/MediaPlayer">
     <com.android.systemui.media.MediaScrollView
         android:id="@+id/media_carousel_scroller"
         android:layout_width="match_parent"
@@ -47,7 +47,7 @@
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginBottom="4dp"
-        android:tint="?android:attr/textColorPrimary"
+        android:tint="?android:attr/textColor"
         android:forceHasOverlappingRendering="false"
     />
 </FrameLayout>
diff --git a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml
index 85354266f2288..8c54e2c1cec4f 100644
--- a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml
+++ b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml
@@ -19,7 +19,6 @@
 <com.android.systemui.util.animation.TransitionLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:id="@+id/media_recommendations"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,7 +27,8 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:forceHasOverlappingRendering="false"
-    android:background="@drawable/qs_media_background">
+    android:background="@drawable/qs_media_background"
+    android:theme="@style/MediaPlayer">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/media_vertical_start_guideline"
@@ -49,7 +49,7 @@
         android:layout_width="@dimen/qs_aa_media_rec_header_icon_size"
         android:layout_height="@dimen/qs_aa_media_rec_header_icon_size"
         android:src="@drawable/ic_headset"
-        android:tint="?android:attr/colorPrimary" />
+        android:tint="?android:attr/textColor" />
 
     <TextView
         android:id="@+id/recommendation_card_text"
@@ -58,7 +58,6 @@
         android:singleLine="true"
         android:text="@string/controls_media_smartspace_rec_title"
         android:fontFamily="google-sans-medium"
-        android:textColor="?android:attr/colorPrimary"
         android:textDirection="locale"
         android:textSize="@dimen/qq_aa_media_rec_header_text_size" />
 
@@ -68,7 +67,7 @@
         android:layout_height="@dimen/qs_aa_media_rec_album_size"
         android:adjustViewBounds="true"
         android:background="@drawable/bg_smartspace_media_item"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
+        style="@style/MediaPlayer.Album"
         android:clipToOutline="true"
         android:scaleType="centerCrop"/>
 
@@ -76,7 +75,7 @@
         android:id="@+id/media_logo1"
         android:layout_width="@dimen/qs_media_icon_size"
         android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background" />
+        style="@style/MediaPlayer.AppIcon" />
 
     <ImageView
         android:id="@+id/media_cover2"
@@ -84,7 +83,7 @@
         android:layout_height="@dimen/qs_aa_media_rec_album_size"
         android:adjustViewBounds="true"
         android:background="@drawable/bg_smartspace_media_item"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
+        style="@style/MediaPlayer.Album"
         android:clipToOutline="true"
         android:scaleType="centerCrop"/>
 
@@ -92,7 +91,7 @@
         android:id="@+id/media_logo2"
         android:layout_width="@dimen/qs_media_icon_size"
         android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background" />
+        style="@style/MediaPlayer.AppIcon" />
 
     <ImageView
         android:id="@+id/media_cover3"
@@ -100,7 +99,7 @@
         android:layout_height="@dimen/qs_aa_media_rec_album_size"
         android:adjustViewBounds="true"
         android:background="@drawable/bg_smartspace_media_item"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
+        style="@style/MediaPlayer.Album"
         android:clipToOutline="true"
         android:scaleType="centerCrop"/>
 
@@ -108,7 +107,7 @@
         android:id="@+id/media_logo3"
         android:layout_width="@dimen/qs_media_icon_size"
         android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background" />
+        style="@style/MediaPlayer.AppIcon" />
 
     <ImageView
         android:id="@+id/media_cover4"
@@ -116,7 +115,7 @@
         android:layout_height="@dimen/qs_aa_media_rec_album_size"
         android:adjustViewBounds="true"
         android:background="@drawable/bg_smartspace_media_item"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
+        style="@style/MediaPlayer.Album"
         android:clipToOutline="true"
         android:scaleType="centerCrop"/>
 
@@ -124,7 +123,7 @@
         android:id="@+id/media_logo4"
         android:layout_width="@dimen/qs_media_icon_size"
         android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background" />
+        style="@style/MediaPlayer.AppIcon" />
 
     <ImageView
         android:id="@+id/media_cover5"
@@ -132,7 +131,7 @@
         android:layout_height="@dimen/qs_aa_media_rec_album_size"
         android:adjustViewBounds="true"
         android:background="@drawable/bg_smartspace_media_item"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
+        style="@style/MediaPlayer.Album"
         android:clipToOutline="true"
         android:scaleType="centerCrop"/>
 
@@ -140,7 +139,7 @@
         android:id="@+id/media_logo5"
         android:layout_width="@dimen/qs_media_icon_size"
         android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background" />
+        style="@style/MediaPlayer.AppIcon" />
 
     <ImageView
         android:id="@+id/media_cover6"
@@ -148,7 +147,7 @@
         android:layout_height="@dimen/qs_aa_media_rec_album_size"
         android:adjustViewBounds="true"
         android:background="@drawable/bg_smartspace_media_item"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
+        style="@style/MediaPlayer.Album"
         android:clipToOutline="true"
         android:scaleType="centerCrop"/>
 
@@ -156,7 +155,7 @@
         android:id="@+id/media_logo6"
         android:layout_width="@dimen/qs_media_icon_size"
         android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background" />
+        style="@style/MediaPlayer.AppIcon" />
 
     <!-- Long press menu -->
     <TextView
@@ -168,7 +167,6 @@
         android:id="@+id/remove_text"
         android:fontFamily="@*android:string/config_headlineFontFamily"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimary"
         android:text="@string/controls_media_close_session"
         android:gravity="center_horizontal|top"
         app:layout_constraintTop_toTopOf="parent"
@@ -193,9 +191,7 @@
             android:layout_gravity="bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/qs_media_button_background"
-            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/MediaPlayer.OutlineButton"
             android:text="@string/controls_media_settings_button" />
     </FrameLayout>
 
@@ -216,9 +212,7 @@
             android:layout_gravity="bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/qs_media_button_background"
-            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/MediaPlayer.OutlineButton"
             android:text="@string/cancel" />
     </FrameLayout>
 
@@ -239,9 +233,7 @@
             android:layout_gravity="bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/qs_media_button_background"
-            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/MediaPlayer.OutlineButton"
             android:text="@string/controls_media_dismiss_button"
             />
     </FrameLayout>
diff --git a/packages/SystemUI/res/layout/media_view.xml b/packages/SystemUI/res/layout/media_view.xml
index cdced5a1be717..e9a24e2846011 100644
--- a/packages/SystemUI/res/layout/media_view.xml
+++ b/packages/SystemUI/res/layout/media_view.xml
@@ -18,7 +18,6 @@
 <!-- Layout for media controls inside QSPanel carousel -->
 <com.android.systemui.util.animation.TransitionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:id="@+id/qs_media_controls"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -26,7 +25,8 @@
     android:clipToPadding="false"
     android:gravity="center_horizontal|fill_vertical"
     android:forceHasOverlappingRendering="false"
-    android:background="@drawable/qs_media_background">
+    android:background="@drawable/qs_media_background"
+    android:theme="@style/MediaPlayer">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/center_vertical_guideline"
@@ -55,7 +55,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:fontFamily="@*android:string/config_bodyFontFamily"
-            android:textColor="?android:attr/textColorPrimary"
             android:gravity="start"
             android:textSize="12sp" />
 
@@ -65,7 +64,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:fontFamily="@*android:string/config_bodyFontFamily"
-            android:textColor="?android:attr/textColorPrimary"
             android:gravity="end"
             android:textSize="12sp" />
     </FrameLayout>
@@ -86,31 +84,31 @@
 
     <ImageButton
         android:id="@+id/action0"
-        style="@style/MediaPlayer.Button"
+        style="@style/MediaPlayer.Action"
         android:layout_width="48dp"
         android:layout_height="48dp" />
 
     <ImageButton
         android:id="@+id/action1"
-        style="@style/MediaPlayer.Button"
+        style="@style/MediaPlayer.Action"
         android:layout_width="48dp"
         android:layout_height="48dp" />
 
     <ImageButton
         android:id="@+id/action2"
-        style="@style/MediaPlayer.Button"
+        style="@style/MediaPlayer.Action"
         android:layout_width="48dp"
         android:layout_height="48dp" />
 
     <ImageButton
         android:id="@+id/action3"
-        style="@style/MediaPlayer.Button"
+        style="@style/MediaPlayer.Action"
         android:layout_width="48dp"
         android:layout_height="48dp" />
 
     <ImageButton
         android:id="@+id/action4"
-        style="@style/MediaPlayer.Button"
+        style="@style/MediaPlayer.Action"
         android:layout_width="48dp"
         android:layout_height="48dp" />
 
@@ -120,8 +118,8 @@
         android:layout_width="@dimen/qs_media_album_size"
         android:layout_height="@dimen/qs_media_album_size"
         android:layout_gravity="center_vertical"
+        style="@style/MediaPlayer.Album"
         android:background="@drawable/qs_media_art_background"
-        android:backgroundTint="?androidprv:attr/colorAccentSecondary"
         android:clipToOutline="true" />
 
     <!-- Seamless Output Switcher -->
@@ -138,6 +136,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="@dimen/qs_seamless_height"
+            android:theme="@style/MediaPlayer.SolidButton"
             android:background="@drawable/qs_media_seamless_background"
             android:orientation="horizontal"
             android:contentDescription="@string/quick_settings_media_device_label">
@@ -146,7 +145,6 @@
                 android:layout_width="@dimen/qs_seamless_icon_size"
                 android:layout_height="@dimen/qs_seamless_icon_size"
                 android:layout_gravity="center"
-                android:tint="?android:attr/colorPrimary"
                 android:src="@*android:drawable/ic_media_seamless" />
             <TextView
                 android:id="@+id/media_seamless_text"
@@ -157,7 +155,6 @@
                 android:fontFamily="@*android:string/config_headlineFontFamily"
                 android:singleLine="true"
                 android:text="@*android:string/ext_media_seamless_action"
-                android:textColor="?android:attr/colorPrimary"
                 android:textDirection="locale"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -171,7 +168,7 @@
         android:layout_marginBottom="@dimen/qs_media_padding"
         android:layout_marginStart="@dimen/qs_center_guideline_padding"
         android:layout_marginEnd="@dimen/qs_seamless_fallback_margin"
-        android:tint="?android:attr/textColorPrimary"
+        android:tint="?android:attr/textColor"
         android:src="@drawable/ic_cast_connected"
         android:forceHasOverlappingRendering="false" />
 
@@ -179,17 +176,13 @@
     <!-- As per Material Design on Biderectionality, this is forced to LTR in code -->
     <SeekBar
         android:id="@+id/media_progress_bar"
-        style="@android:style/Widget.ProgressBar.Horizontal"
+        style="@style/MediaPlayer.ProgressBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:clickable="true"
         android:maxHeight="@dimen/qs_media_enabled_seekbar_height"
         android:paddingTop="@dimen/qs_media_enabled_seekbar_vertical_padding"
         android:layout_marginTop="-22dp"
         android:paddingBottom="0dp"
-        android:thumbTint="?android:attr/textColorPrimary"
-        android:progressTint="?android:attr/textColorPrimary"
-        android:progressBackgroundTint="?android:attr/textColorTertiary"
         android:splitTrack="false" />
 
     <!-- Song name -->
@@ -199,7 +192,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp" />
 
     <!-- Artist name -->
@@ -209,16 +201,14 @@
         android:layout_height="wrap_content"
         android:fontFamily="@*android:string/config_headlineFontFamily"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
+        style="@style/MediaPlayer.Subtitle"
         android:textSize="14sp" />
 
     <com.android.internal.widget.CachingIconView
         android:id="@+id/icon"
-        android:tint="?android:attr/colorAccent"
+        style="@style/MediaPlayer.AppIcon"
         android:layout_width="@dimen/qs_media_icon_size"
-        android:layout_height="@dimen/qs_media_icon_size"
-        android:background="@drawable/qs_media_icon_background"
-    />
+        android:layout_height="@dimen/qs_media_icon_size" />
 
     <!-- Long press menu -->
     <TextView
@@ -230,7 +220,6 @@
         android:id="@+id/remove_text"
         android:fontFamily="@*android:string/config_headlineFontFamily"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimary"
         android:text="@string/controls_media_close_session"
         android:gravity="center_horizontal|top"
         app:layout_constraintTop_toTopOf="parent"
@@ -255,9 +244,7 @@
             android:layout_gravity="bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/qs_media_button_background"
-            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/MediaPlayer.OutlineButton"
             android:text="@string/controls_media_settings_button" />
     </FrameLayout>
 
@@ -278,9 +265,7 @@
             android:layout_gravity="bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/qs_media_button_background"
-            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/MediaPlayer.OutlineButton"
             android:text="@string/cancel" />
     </FrameLayout>
 
@@ -301,9 +286,7 @@
             android:layout_gravity="bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/qs_media_button_background"
-            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/MediaPlayer.OutlineButton"
             android:text="@string/controls_media_dismiss_button"
         />
     </FrameLayout>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index ac9ced93f2df7..aa1f954cb27aa 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <style name="ClearAllButtonDefaultMargins">
         <item name="android:layout_marginStart">0dp</item>
         <item name="android:layout_marginTop">0dp</item>
@@ -609,12 +610,54 @@
         <item name="android:elevation">10dp</item>
     </style>
 
-    <style name="MediaPlayer.Button" parent="@android:style/Widget.Material.Button.Borderless.Small">
+    <!-- Media controls always have light background -->
+    <style name="MediaPlayer" parent="@*android:style/Theme.DeviceDefault.Light">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:backgroundTint">@android:color/system_accent2_50</item>
+    </style>
+
+    <style name="MediaPlayer.ProgressBar" parent="@android:style/Widget.ProgressBar.Horizontal">
+        <item name="android:thumbTint">?android:attr/textColorPrimary</item>
+        <item name="android:progressTint">?android:attr/textColorPrimary</item>
+        <item name="android:progressBackgroundTint">?android:attr/textColorTertiary</item>
+        <item name="android:clickable">true</item>
+        <item name="android:splitTrack">false</item>
+    </style>
+
+    <style name="MediaPlayer.Subtitle" parent="MediaPlayer">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="MediaPlayer.Action" parent="@android:style/Widget.Material.Button.Borderless.Small">
         <item name="android:background">@drawable/qs_media_light_source</item>
         <item name="android:tint">?android:attr/textColorPrimary</item>
         <item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>
     </style>
 
+    <style name="MediaPlayer.OutlineButton">
+        <item name="android:background">@drawable/qs_media_button_background</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:backgroundTint">?androidprv:attr/colorAccentPrimaryVariant</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+    </style>
+
+    <style name="MediaPlayer.SolidButton">
+        <item name="android:backgroundTint">?android:attr/colorAccent</item>
+        <item name="android:tint">?android:attr/colorPrimary</item>
+        <item name="android:textColor">?android:attr/colorPrimary</item>
+    </style>
+
+    <style name="MediaPlayer.AppIcon">
+        <item name="android:background">@drawable/qs_media_icon_background</item>
+        <item name="android:backgroundTint">?android:attr/colorPrimary</item>
+        <item name="android:tint">?android:attr/colorAccent</item>
+    </style>
+
+    <style name="MediaPlayer.Album">
+        <item name="android:backgroundTint">?androidprv:attr/colorAccentSecondary</item>
+
+    </style>
+
     <!-- Used to style charging animation AVD animation -->
     <style name="ChargingAnim" />
 
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
index 6a2d0afa813b1..24503675ae369 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
@@ -3,7 +3,6 @@ package com.android.systemui.media
 import android.app.smartspace.SmartspaceTarget
 import android.content.Context
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.provider.Settings.ACTION_MEDIA_CONTROLS_SETTINGS
 import android.util.Log
@@ -116,7 +115,6 @@ class MediaCarouselController @Inject constructor(
     private var needsReordering: Boolean = false
     private var keysNeedRemoval = mutableSetOf<String>()
     private var bgColor = getBackgroundColor()
-    private var fgColor = getForegroundColor()
     private var isRtl: Boolean = false
         set(value) {
             if (value != field) {
@@ -276,10 +274,6 @@ class MediaCarouselController @Inject constructor(
     }
 
     private fun addOrUpdatePlayer(key: String, oldKey: String?, data: MediaData) {
-        data.actions.forEach {
-            it.icon?.setTintList(ColorStateList.valueOf(fgColor))
-        }
-        data.appIcon?.setTintList(ColorStateList.valueOf(fgColor))
         val dataCopy = data.copy(backgroundColor = bgColor)
         val existingPlayer = MediaPlayerData.getMediaPlayer(key, oldKey)
         if (existingPlayer == null) {
@@ -328,7 +322,7 @@ class MediaCarouselController @Inject constructor(
         val lp = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.WRAP_CONTENT)
         newRecs.recommendationViewHolder?.recommendations?.setLayoutParams(lp)
-        newRecs.bindRecommendation(data, fgColor, bgColor)
+        newRecs.bindRecommendation(data, bgColor)
         MediaPlayerData.addMediaPlayer(key, newRecs)
         updatePlayerToState(newRecs, noAnimation = true)
         reorderAllPlayers()
@@ -368,8 +362,6 @@ class MediaCarouselController @Inject constructor(
 
     private fun recreatePlayers() {
         bgColor = getBackgroundColor()
-        fgColor = getForegroundColor()
-        pageIndicator.tintList = ColorStateList.valueOf(fgColor)
 
         MediaPlayerData.mediaData().forEach { (key, data) ->
             removePlayer(key, dismissMediaData = false)
@@ -381,11 +373,6 @@ class MediaCarouselController @Inject constructor(
         return context.getColor(android.R.color.system_accent2_50)
     }
 
-    private fun getForegroundColor(): Int {
-        return com.android.settingslib.Utils.getColorAttr(context,
-                com.android.internal.R.attr.textColorPrimary).defaultColor
-    }
-
     private fun updatePageIndicator() {
         val numPages = mediaContent.getChildCount()
         pageIndicator.setNumPages(numPages)
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
index ed16777110c90..1e9cc8cb08ccf 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
@@ -265,9 +265,6 @@ public class MediaControlPanel {
         ConstraintSet expandedSet = mMediaViewController.getExpandedLayout();
         ConstraintSet collapsedSet = mMediaViewController.getCollapsedLayout();
 
-        mPlayerViewHolder.getPlayer().setBackgroundTintList(
-                ColorStateList.valueOf(mBackgroundColor));
-
         // Click action
         PendingIntent clickIntent = data.getClickIntent();
         if (clickIntent != null) {
@@ -465,15 +462,11 @@ public class MediaControlPanel {
     /** Bind this recommendation view based on the data given. */
     public void bindRecommendation(
             @NonNull SmartspaceTarget target,
-            @NonNull int primaryColor,
             @NonNull int backgroundColor) {
         if (mRecommendationViewHolder == null) {
             return;
         }
 
-        mRecommendationViewHolder.getCardIcon().setColorFilter(primaryColor);
-        mRecommendationViewHolder.getCardText().setTextColor(primaryColor);
-
         mInstanceId = target.getSmartspaceTargetId().hashCode();
         mRecommendationViewHolder.getRecommendations()
                 .setBackgroundTintList(ColorStateList.valueOf(backgroundColor));
diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
index 94252d2b83310..800daa1e96aa0 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
@@ -17,7 +17,6 @@
 package com.android.systemui.media
 
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.RippleDrawable
@@ -221,17 +220,6 @@ public class MediaControlPanelTest : SysuiTestCase() {
         assertThat(artistText.getText()).isEqualTo(ARTIST)
     }
 
-    @Test
-    fun bindBackgroundColor() {
-        player.attachPlayer(holder)
-        val state = MediaData(USER_ID, true, BG_COLOR, APP, null, ARTIST, TITLE, null, emptyList(),
-                emptyList(), PACKAGE, session.getSessionToken(), null, device, true, null)
-        player.bindPlayer(state, PACKAGE)
-        val list = ArgumentCaptor.forClass(ColorStateList::class.java)
-        verify(view).setBackgroundTintList(list.capture())
-        assertThat(list.value).isEqualTo(ColorStateList.valueOf(BG_COLOR))
-    }
-
     @Test
     fun bindDevice() {
         player.attachPlayer(holder)