diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index b4b0a10d..f6bbaf55 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -56,8 +56,8 @@
             android:background="@drawable/circle_background"
             android:gravity="center"
             android:text="@{item.userData.unplayedItemCount.toString()}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
-            android:textColor="@color/white"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textColor="?attr/colorOnPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="9" />
@@ -74,6 +74,7 @@
             android:src="@drawable/ic_check"
             android:visibility="@{item.userData.played == true ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="@id/item_image"
-            app:layout_constraintTop_toTopOf="@id/item_image" />
+            app:layout_constraintTop_toTopOf="@id/item_image"
+            app:tint="?attr/colorOnPrimary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index 90fe870f..fe91bc2b 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -149,7 +149,7 @@
                 android:paddingHorizontal="24dp"
                 android:paddingVertical="12dp"
                 android:src="@drawable/ic_play"
-                app:tint="@android:color/white" />
+                app:tint="?attr/colorOnPrimary" />
 
             <ProgressBar
                 android:id="@+id/progress_circular"
diff --git a/app/src/main/res/layout/episode_item.xml b/app/src/main/res/layout/episode_item.xml
index 28e91259..dbc2adb4 100644
--- a/app/src/main/res/layout/episode_item.xml
+++ b/app/src/main/res/layout/episode_item.xml
@@ -46,7 +46,8 @@
             android:src="@drawable/ic_check"
             android:visibility="@{episode.userData.played == true ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="@id/episode_image"
-            app:layout_constraintTop_toTopOf="@id/episode_image" />
+            app:layout_constraintTop_toTopOf="@id/episode_image"
+            app:tint="?attr/colorOnPrimary" />
 
         <FrameLayout
             android:id="@+id/missing_icon"
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index 16c93204..dcd4d526 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -133,7 +133,7 @@
                         android:paddingHorizontal="24dp"
                         android:paddingVertical="12dp"
                         android:src="@drawable/ic_play"
-                        app:tint="@android:color/white" />
+                        app:tint="?attr/colorOnPrimary" />
 
                     <ProgressBar
                         android:id="@+id/progress_circular"
diff --git a/app/src/main/res/layout/server_item.xml b/app/src/main/res/layout/server_item.xml
index eac0d261..9ad427b6 100644
--- a/app/src/main/res/layout/server_item.xml
+++ b/app/src/main/res/layout/server_item.xml
@@ -39,7 +39,7 @@
                 android:layout_gravity="center"
                 android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_server"
-                app:tint="@color/white" />
+                app:tint="?attr/colorOnPrimary" />
 
         </FrameLayout>