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 b3931b2a3..428c3bdbd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1644,9 +1644,15 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
scheduleDraftText.setText(R.string.sk_compose_draft);
scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_regular, 0, 0, 0);
scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_draft));
- draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_drafts_24_filled : R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
- publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
- ? R.string.save : R.string.sk_draft);
+ draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_drafts_24_regular : R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
+
+ if(GlobalUserPreferences.relocatePublishButton){
+ publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
+ ? R.drawable.ic_fluent_save_24_filled : R.drawable.ic_fluent_drafts_24_selector, 0, 0, 0);
+ }else{
+ publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
+ ? R.string.save : R.string.sk_draft);
+ }
} else {
scheduleMenuItem.setVisible(false);
unscheduleMenuItem.setVisible(true);
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
new file mode 100644
index 000000000..fd035831a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_drafts_24_filled_enabled.xml
@@ -0,0 +1,3 @@
+
+
+
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
new file mode 100644
index 000000000..75fb9327f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_drafts_24_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_save_24_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_save_24_filled.xml
new file mode 100644
index 000000000..e1d9f2e5d
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_save_24_filled.xml
@@ -0,0 +1,9 @@
+
+
+