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 915dde92b..29cc86c89 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -299,9 +299,16 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		sensitiveItem=view.findViewById(R.id.sensitive_item);
 		replyText=view.findViewById(R.id.reply_text);
 
+		boolean smallStyle = getContext().getResources().getBoolean(R.bool.show_small_publish_button);
+
 		if(GlobalUserPreferences.relocatePublishButton){
-			publishButton=view.findViewById(R.id.publish);
-			publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+			if(smallStyle){
+				publishButton=view.findViewById(R.id.publishSmall);
+//				publishButton.
+			}else{
+				publishButton=view.findViewById(R.id.publish);
+				publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+			}
 			publishButton.setOnClickListener(this::onPublishClick);
 			publishButton.setVisibility(View.VISIBLE);
 		}
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 931340a0b..a049700fe 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -316,6 +316,16 @@
 			android:textColor="?android:textColorSecondary"
 			tools:text="500"/>
 
+		<Button
+			android:id="@+id/publishSmall"
+			android:layout_width="48dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8dp"
+			android:drawableLeft="@drawable/ic_fluent_send_24_regular"
+			android:visibility="gone"
+			/>
+
+
 		<Button
 			android:id="@+id/publish"
 			android:layout_width="wrap_content"