diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index ce651ed41..c68b55345 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -467,6 +467,8 @@
 				android:padding="0px"
 				android:contentDescription="@string/add_media"
 				android:tooltipText="@string/add_media"
+				android:tint="@color/action_bar_icons"
+				android:tintMode="src_in"
 				android:src="@drawable/ic_fluent_image_add_24_regular"/>
 
 			<ImageButton
@@ -477,6 +479,8 @@
 				android:padding="0px"
 				android:contentDescription="@string/add_poll"
 				android:tooltipText="@string/add_poll"
+				android:tint="@color/action_bar_icons"
+				android:tintMode="src_in"
 				android:src="@drawable/ic_fluent_poll_24_selector"/>
 
 			<ImageButton
@@ -487,6 +491,8 @@
 				android:padding="0px"
 				android:contentDescription="@string/emoji"
 				android:tooltipText="@string/emoji"
+				android:tint="@color/action_bar_icons"
+				android:tintMode="src_in"
 				android:src="@drawable/ic_fluent_emoji_24_selector"/>
 
 			<ImageButton
@@ -497,6 +503,8 @@
 				android:padding="0px"
 				android:contentDescription="@string/content_warning"
 				android:tooltipText="@string/content_warning"
+				android:tint="@color/action_bar_icons"
+				android:tintMode="src_in"
 				android:src="@drawable/ic_fluent_chat_warning_24_selector"/>
 
 			<ImageButton
@@ -507,6 +515,8 @@
 				android:padding="0px"
 				android:contentDescription="@string/sk_content_type"
 				android:tooltipText="@string/sk_content_type"
+				android:tint="@color/action_bar_icons"
+				android:tintMode="src_in"
 				android:src="@drawable/ic_fluent_text_edit_style_24_selector"/>
 
 			<ImageButton
@@ -520,6 +530,8 @@
 				android:textColor="?android:textColorSecondary"
 				android:background="@drawable/bg_icon_button"
 				android:visibility="gone"
+				android:tint="@color/action_bar_icons"
+				android:tintMode="src_in"
 				android:contentDescription="@string/sk_schedule_or_draft"
 				android:tooltipText="@string/sk_schedule_or_draft" />
 
@@ -535,7 +547,7 @@
 				android:layout_marginEnd="24dp"
 				android:background="?android:attr/selectableItemBackgroundBorderless"
 				android:padding="0px"
-				android:tint="@color/compose_button"
+				android:tint="@color/action_bar_icons"
 				android:tintMode="src_in"
 				android:contentDescription="@string/more_options"
 				android:tooltipText="@string/more_options"