diff --git a/app/src/main/res/drawable/button_accent_background.xml b/app/src/main/res/drawable/button_accent_background.xml
index d64219d4..6b45cdc9 100644
--- a/app/src/main/res/drawable/button_accent_background.xml
+++ b/app/src/main/res/drawable/button_accent_background.xml
@@ -3,7 +3,7 @@
     android:color="?attr/colorControlHighlight">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="@color/neutral_700" />
+            <solid android:color="?attr/colorSecondaryContainer" />
             <corners
                 android:radius="10dp" />
         </shape>
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index fe91bc2b..6dc3b012 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -170,7 +170,8 @@
             android:background="@drawable/button_accent_background"
             android:contentDescription="@string/check_button_description"
             android:padding="12dp"
-            android:src="@drawable/ic_check" />
+            android:src="@drawable/ic_check"
+            app:tint="?attr/colorOnSecondaryContainer" />
 
         <ImageButton
             android:id="@+id/favorite_button"
@@ -180,7 +181,8 @@
             android:background="@drawable/button_accent_background"
             android:contentDescription="@string/favorite_button_description"
             android:padding="12dp"
-            android:src="@drawable/ic_heart" />
+            android:src="@drawable/ic_heart"
+            app:tint="?attr/colorOnSecondaryContainer" />
 
         <RelativeLayout
             android:id="@+id/download_button_wrapper"
@@ -197,7 +199,7 @@
                 android:contentDescription="@string/download_button_description"
                 android:padding="12dp"
                 android:src="@drawable/ic_download"
-                app:tint="@android:color/white" />
+                app:tint="?attr/colorOnSecondaryContainer" />
 
             <ProgressBar
                 android:id="@+id/progress_download"
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index dcd4d526..7ecff46e 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -154,7 +154,8 @@
                     android:background="@drawable/button_accent_background"
                     android:contentDescription="@string/trailer_button_description"
                     android:padding="12dp"
-                    android:src="@drawable/ic_film" />
+                    android:src="@drawable/ic_film"
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/check_button"
@@ -164,7 +165,8 @@
                     android:background="@drawable/button_accent_background"
                     android:contentDescription="@string/check_button_description"
                     android:padding="12dp"
-                    android:src="@drawable/ic_check" />
+                    android:src="@drawable/ic_check"
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/favorite_button"
@@ -174,7 +176,8 @@
                     android:background="@drawable/button_accent_background"
                     android:contentDescription="@string/download_button_description"
                     android:padding="12dp"
-                    android:src="@drawable/ic_heart" />
+                    android:src="@drawable/ic_heart"
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/download_button"
@@ -186,7 +189,7 @@
                     android:padding="12dp"
                     android:src="@drawable/ic_download"
                     android:visibility="gone"
-                    app:tint="@android:color/white" />
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/delete_button"
@@ -197,7 +200,8 @@
                     android:contentDescription="@string/delete_button_description"
                     android:padding="12dp"
                     android:src="@drawable/ic_trash"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    app:tint="?attr/colorOnSecondaryContainer" />
             </LinearLayout>
 
             <LinearLayout