diff --git a/mastodon/src/main/res/color/bookmark_icon.xml b/mastodon/src/main/res/color/bookmark_icon.xml
index 085890f67..442c8fbbc 100644
--- a/mastodon/src/main/res/color/bookmark_icon.xml
+++ b/mastodon/src/main/res/color/bookmark_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="@color/bookmark_selected" android:state_selected="true"/>
-	<item android:color="?android:textColorSecondary"/>
+	<item android:color="?colorM3OnSurfaceVariant"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/boost_icon.xml b/mastodon/src/main/res/color/boost_icon.xml
index 0053912b1..e5d690f47 100644
--- a/mastodon/src/main/res/color/boost_icon.xml
+++ b/mastodon/src/main/res/color/boost_icon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="?colorM3Primary" android:state_selected="true"/>
-	<item android:color="?colorM3OnBackground" android:state_enabled="true"/>
+	<item android:color="?colorM3OnSurfaceVariant" android:state_enabled="true"/>
 	<item android:color="@color/m3_on_background_alpha38" />
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/favorite_icon.xml b/mastodon/src/main/res/color/favorite_icon.xml
index 5c11b63ca..201576cd7 100644
--- a/mastodon/src/main/res/color/favorite_icon.xml
+++ b/mastodon/src/main/res/color/favorite_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="@color/favorite_selected" android:state_selected="true"/>
-	<item android:color="?android:textColorSecondary"/>
+	<item android:color="?colorM3OnSurfaceVariant"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index 51e1c6843..fe2373c7c 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -36,7 +36,7 @@
 						android:layout_marginStart="16dp"
 						android:duplicateParentState="true"
 						android:src="@drawable/ic_fluent_chat_multiple_24_selector_text"
-						android:tint="?android:textColorSecondary"
+						android:tint="?colorM3OnSurfaceVariant"
 						android:gravity="center_vertical" />
 					<TextView
 						android:id="@+id/reply"
@@ -47,6 +47,7 @@
 						android:minWidth="16dp"
 						android:gravity="center_vertical"
 						android:textAppearance="@style/m3_label_large"
+						android:textColor="?colorM3OnSurfaceVariant"
 						android:maxLines="1"
 						android:ellipsize="end"
 						tools:text="123"
@@ -62,7 +63,6 @@
 					android:id="@+id/boost_btn"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
-					android:foregroundTint="@color/boost_icon"
 					android:paddingVertical="12dp">
 					<ImageView
 						android:layout_width="24sp"
@@ -161,7 +161,7 @@
 					android:layout_gravity="center_vertical"
 					android:layout_marginHorizontal="16dp"
 					android:src="@drawable/ic_fluent_share_24_regular"
-					android:tint="?android:textColorSecondary"
+					android:tint="?colorM3OnSurfaceVariant"
 					android:gravity="center_vertical"/>
 			</FrameLayout>