diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index cf9f6709e..af183ee17 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1599,7 +1599,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		} else {
 			draftsBtn.setImageDrawable(getContext().getDrawable(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_regular : R.drawable.ic_fluent_clock_20_regular));
 			if(GlobalUserPreferences.relocatePublishButton){
-				publishButtonRelocated.setImageResource(R.drawable.ic_fluent_send_24_selector);
+				publishButtonRelocated.setImageResource(R.drawable.ic_fluent_send_24_regular);
 			}
 			resetPublishButtonText();
 		}
diff --git a/mastodon/src/main/res/drawable/ic_fluent_drafts_24_filled_enabled.xml b/mastodon/src/main/res/drawable/ic_fluent_drafts_24_filled_enabled.xml
deleted file mode 100644
index 738bd63c4..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_drafts_24_filled_enabled.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M13.94 5l5.061 5.06L9.063 20c-0.277 0.277-0.621 0.477-1 0.58l-5.115 1.395c-0.56 0.153-1.073-0.361-0.92-0.921l1.394-5.116c0.103-0.377 0.303-0.722 0.58-0.999L13.94 5zm-7.414 6l-1.5 1.5H2.75C2.337 12.5 2 12.165 2 11.75 2 11.336 2.337 11 2.75 11h3.775zm14.352-8.174l0.153 0.144 0.145 0.153c1.25 1.405 1.203 3.56-0.145 4.908L20.061 9 15 3.94l0.97-0.97c1.348-1.348 3.503-1.396 4.908-0.144zM10.526 7l-1.5 1.5H2.75C2.337 8.5 2 8.165 2 7.75 2 7.336 2.337 7 2.75 7h7.775zm4-4l-1.5 1.5H2.75C2.337 4.5 2 4.165 2 3.75 2 3.336 2.337 3 2.75 3h11.775z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_drafts_24_selector.xml b/mastodon/src/main/res/drawable/ic_fluent_drafts_24_selector.xml
index 75fb9327f..b88fafb4b 100644
--- a/mastodon/src/main/res/drawable/ic_fluent_drafts_24_selector.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_drafts_24_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_fluent_drafts_24_filled_enabled" android:state_enabled="true"/>
+    <item android:drawable="@drawable/ic_fluent_drafts_24_filled" android:state_enabled="true"/>
     <item android:drawable="@drawable/ic_fluent_drafts_24_regular"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_save_24_filled_enabled.xml b/mastodon/src/main/res/drawable/ic_fluent_save_24_filled_enabled.xml
deleted file mode 100644
index 764f58c2e..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_save_24_filled_enabled.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:pathData="M6.75,3H5.75C4.231,3 3,4.231 3,5.75V18.25C3,19.769 4.231,21 5.75,21H6V15C6,13.757 7.007,12.75 8.25,12.75H15.75C16.993,12.75 18,13.757 18,15V21H18.25C19.769,21 21,19.769 21,18.25V8.286C21,7.424 20.658,6.597 20.048,5.987L18.013,3.952C17.411,3.351 16.599,3.009 15.75,3V7.5C15.75,8.743 14.743,9.75 13.5,9.75H9C7.757,9.75 6.75,8.743 6.75,7.5V3ZM14.25,3V7.5C14.25,7.914 13.914,8.25 13.5,8.25H9C8.586,8.25 8.25,7.914 8.25,7.5V3H14.25ZM16.5,21V15C16.5,14.586 16.164,14.25 15.75,14.25H8.25C7.836,14.25 7.5,14.586 7.5,15V21H16.5Z"
-		android:fillColor="?colorM3Surface"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_save_24_selector.xml b/mastodon/src/main/res/drawable/ic_fluent_save_24_selector.xml
index 162a86698..6618d92dd 100644
--- a/mastodon/src/main/res/drawable/ic_fluent_save_24_selector.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_save_24_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_fluent_save_24_filled_enabled" android:state_enabled="true"/>
+    <item android:drawable="@drawable/ic_fluent_save_24_filled" android:state_enabled="true"/>
     <item android:drawable="@drawable/ic_fluent_save_24_regular"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_send_24_enabled.xml b/mastodon/src/main/res/drawable/ic_fluent_send_24_enabled.xml
deleted file mode 100644
index bc5cd0a68..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_send_24_enabled.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.694 12L2.299 3.27C2.063 2.664 2.655 2.083 3.241 2.29l0.093 0.039 18 9c0.518 0.259 0.55 0.968 0.097 1.284l-0.097 0.058-18 9c-0.583 0.291-1.216-0.245-1.065-0.848l0.03-0.095L5.694 12 2.299 3.27 5.694 12zM4.402 4.54l2.61 6.71h6.627c0.38 0 0.693 0.282 0.743 0.648L14.389 12c0 0.38-0.282 0.693-0.649 0.743l-0.1 0.007H7.01l-2.609 6.71L19.322 12 4.401 4.54z" android:fillColor="?colorM3Surface"/>
-</vector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_send_24_selector.xml b/mastodon/src/main/res/drawable/ic_fluent_send_24_selector.xml
deleted file mode 100644
index 2168caa74..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_send_24_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_fluent_send_24_enabled" android:state_activated="true"/>
-    <item android:drawable="@drawable/ic_fluent_send_24_enabled" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_fluent_send_24_enabled" android:state_selected="true"/>
-    <item android:drawable="@drawable/ic_fluent_send_24_enabled" android:state_enabled="true"/>
-    <item android:drawable="@drawable/ic_fluent_send_24_regular"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 72d4eb0aa..9c87fce4b 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -578,7 +578,7 @@
 				android:contentDescription="@string/publish"
 				android:tint="@color/compose_button"
 				android:tintMode="src_in"
-				android:src="@drawable/ic_fluent_send_24_selector"
+				android:src="@drawable/ic_fluent_send_24_regular"
 				android:visibility="gone"
 				android:singleLine="true" />