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..620e94e5e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -301,8 +301,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
if(GlobalUserPreferences.relocatePublishButton){
publishButton=view.findViewById(R.id.publish);
- publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+// publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+ publishButton.setEllipsize(TextUtils.TruncateAt.END);
publishButton.setOnClickListener(this::onPublishClick);
+ publishButton.setSingleLine(true);
publishButton.setVisibility(View.VISIBLE);
}
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
new file mode 100644
index 000000000..a8ccdeb36
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_send_24_enabled.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
new file mode 100644
index 000000000..a26d4548f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
@@ -0,0 +1,3 @@
+
+
+
\ 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
new file mode 100644
index 000000000..2168caa74
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_send_24_selector.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ 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 b7f8dba37..438779cda 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -294,7 +294,7 @@
android:id="@+id/btn_visibility"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px"
android:tint="@color/compose_button"
@@ -322,6 +322,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:visibility="gone"
+ android:tooltipText="@string/publish"
+ android:drawableStart="@drawable/ic_fluent_send_24_selector"
/>