diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 08238a73f..f23cd0fa2 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -353,7 +353,7 @@
 				android:id="@+id/btn_media"
 				android:layout_width="36dp"
 				android:layout_height="36dp"
-				android:layout_marginEnd="8dp"
+				android:layout_marginEnd="6dp"
 				android:background="?android:attr/actionBarItemBackground"
 				android:padding="0px"
 				android:tint="@color/compose_button"
@@ -366,7 +366,7 @@
 				android:id="@+id/btn_poll"
 				android:layout_width="36dp"
 				android:layout_height="36dp"
-				android:layout_marginEnd="8dp"
+				android:layout_marginEnd="6dp"
 				android:background="?android:attr/actionBarItemBackground"
 				android:padding="0px"
 				android:tint="@color/compose_button"
@@ -379,7 +379,7 @@
 				android:id="@+id/btn_emoji"
 				android:layout_width="36dp"
 				android:layout_height="36dp"
-				android:layout_marginEnd="8dp"
+				android:layout_marginEnd="6dp"
 				android:background="?android:attr/actionBarItemBackground"
 				android:padding="0px"
 				android:tint="@color/compose_button"
@@ -392,7 +392,7 @@
 				android:id="@+id/btn_spoiler"
 				android:layout_width="36dp"
 				android:layout_height="36dp"
-				android:layout_marginEnd="8dp"
+				android:layout_marginEnd="6dp"
 				android:background="?android:attr/actionBarItemBackground"
 				android:padding="0px"
 				android:tint="@color/compose_button"
@@ -405,7 +405,7 @@
 				android:id="@+id/btn_visibility"
 				android:layout_width="36dp"
 				android:layout_height="36dp"
-				android:layout_marginEnd="8dp"
+				android:layout_marginEnd="6dp"
 				android:background="?android:attr/actionBarItemBackground"
 				android:padding="0px"
 				android:tint="@color/compose_button"
@@ -418,7 +418,7 @@
 				android:id="@+id/btn_content_type"
 				android:layout_width="36dp"
 				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
+				android:layout_marginEnd="6dp"
 				android:background="?android:attr/actionBarItemBackground"
 				android:padding="0px"
 				android:tint="@color/compose_button"
@@ -433,7 +433,7 @@
 				android:layout_height="32dp"
 				android:padding="0px"
 				android:paddingStart="4dp"
-				android:layout_marginEnd="8dp"
+				android:layout_marginEnd="6dp"
 				android:drawableStart="@drawable/ic_fluent_clock_24_regular"
 				android:drawableTint="@color/compose_button"
 				android:textColor="?android:textColorSecondary"