diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
index 75b24fc45..d4e50917b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
@@ -56,8 +56,8 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
-		private final TextView reply, boost, favorite, bookmark;
-		private final ImageView share;
+		private final TextView reply, boost, favorite;
+		private final ImageView share, bookmark;
 		private static final Animation opacityOut, opacityIn;
 
 		private View touchingView = null;
@@ -100,7 +100,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				UiUtils.fixCompoundDrawableTintOnAndroid6(reply);
 				UiUtils.fixCompoundDrawableTintOnAndroid6(boost);
 				UiUtils.fixCompoundDrawableTintOnAndroid6(favorite);
-				UiUtils.fixCompoundDrawableTintOnAndroid6(bookmark);
 			}
 			View reply=findViewById(R.id.reply_btn);
 			View boost=findViewById(R.id.boost_btn);
@@ -181,8 +180,9 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			} else if (action == MotionEvent.ACTION_DOWN) {
 				longClickPerformed = false;
 				touchingView = v;
-				// 20dp to center in middle of icon, because: (icon width = 24dp) / 2 + (paddingStart = 8dp)
-				v.setPivotX(V.dp(20));
+				// 28dp to center in middle of icon, because:
+				// (icon width = 24dp) / 2 + (paddingStart = 8dp) + (paddingHorizontal = 8dp)
+				v.setPivotX(V.dp(28));
 				v.animate().scaleX(0.85f).scaleY(0.85f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(75).start();
 				if (disabled) return true;
 				v.postDelayed(longClickRunnable, ViewConfiguration.getLongPressTimeout());
diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index 23e7edef0..dcd358586 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -3,122 +3,128 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:maxWidth="600dp"
-	app:defaultWidth="350dp"
+	app:defaultWidth="450dp"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
+
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="48dp"
-		android:paddingHorizontal="16dp">
+		android:layout_height="48dp">
 
 		<FrameLayout
-			android:id="@+id/reply_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:minWidth="56dp">
-			<TextView
-				android:id="@+id/reply"
+			android:layout_weight="1"
+			android:layout_width="0dp"
+			android:layout_height="match_parent">
+			<FrameLayout
+				android:id="@+id/reply_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:layout_gravity="center_vertical"
-				android:drawableStart="@drawable/ic_fluent_chat_multiple_24_selector_text"
-				android:drawablePadding="8dp"
-				android:paddingHorizontal="8dp"
-				android:drawableTint="?android:textColorSecondary"
-				android:gravity="center_vertical"
-				android:textAppearance="@style/m3_label_large"
-				tools:text="123"/>
+				android:paddingHorizontal="16dp"
+				android:minWidth="56dp">
+				<TextView
+					android:id="@+id/reply"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:drawableStart="@drawable/ic_fluent_chat_multiple_24_selector_text"
+					android:drawablePadding="8dp"
+					android:drawableTint="?android:textColorSecondary"
+					android:gravity="center_vertical"
+					android:textAppearance="@style/m3_label_large"
+					android:maxLines="1"
+					android:ellipsize="end"
+					tools:text="123"/>
+			</FrameLayout>
 		</FrameLayout>
 
-		<Space
-			android:layout_width="0px"
-			android:layout_height="1px"
-			android:layout_weight="1"/>
-
 		<FrameLayout
-			android:id="@+id/boost_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:minWidth="56dp">
-			<TextView
-				android:id="@+id/boost"
+			android:layout_weight="1"
+			android:layout_width="0dp"
+			android:layout_height="match_parent">
+			<FrameLayout
+				android:id="@+id/boost_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:layout_gravity="center_vertical"
-				android:drawableStart="@drawable/ic_boost"
-				android:drawablePadding="8dp"
-				android:paddingHorizontal="8dp"
-				android:drawableTint="@color/boost_icon"
-				android:textColor="@color/boost_icon"
-				android:gravity="center_vertical"
-				android:textAppearance="@style/m3_label_large"
-				tools:text="123"/>
+				android:paddingHorizontal="16dp"
+				android:minWidth="56dp">
+				<TextView
+					android:id="@+id/boost"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:drawableStart="@drawable/ic_boost"
+					android:drawablePadding="8dp"
+					android:drawableTint="@color/boost_icon"
+					android:textColor="@color/boost_icon"
+					android:gravity="center_vertical"
+					android:textAppearance="@style/m3_label_large"
+					android:maxLines="1"
+					android:ellipsize="end"
+					tools:text="123"/>
+			</FrameLayout>
 		</FrameLayout>
 
-		<Space
-			android:layout_width="0px"
-			android:layout_height="1px"
-			android:layout_weight="1"/>
-
 		<FrameLayout
-			android:id="@+id/favorite_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:minWidth="56dp">
-			<TextView
-				android:id="@+id/favorite"
+			android:layout_weight="1"
+			android:layout_width="0dp"
+			android:layout_height="match_parent">
+			<FrameLayout
+				android:id="@+id/favorite_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:layout_gravity="center_vertical"
-				android:drawableStart="@drawable/ic_fluent_star_24_selector"
-				android:drawablePadding="8dp"
-				android:paddingHorizontal="8dp"
-				android:drawableTint="@color/favorite_icon"
-				android:textColor="@color/favorite_icon"
-				android:gravity="center_vertical"
-				android:textAppearance="@style/m3_label_large"
-				tools:text="123"/>
+				android:paddingHorizontal="16dp"
+				android:minWidth="56dp">
+				<TextView
+					android:id="@+id/favorite"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:drawableStart="@drawable/ic_fluent_star_24_selector"
+					android:drawablePadding="8dp"
+					android:drawableTint="@color/favorite_icon"
+					android:textColor="@color/favorite_icon"
+					android:gravity="center_vertical"
+					android:textAppearance="@style/m3_label_large"
+					android:maxLines="1"
+					android:ellipsize="end"
+					tools:text="123"/>
+			</FrameLayout>
 		</FrameLayout>
 
-		<Space
-			android:layout_width="0px"
-			android:layout_height="1px"
-			android:layout_weight="1"/>
-
 		<FrameLayout
-			android:id="@+id/bookmark_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:minWidth="56dp">
-			<TextView
-				android:id="@+id/bookmark"
+			android:layout_weight="1"
+			android:layout_width="0dp"
+			android:layout_height="match_parent">
+			<FrameLayout
+				android:id="@+id/bookmark_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
-				android:layout_gravity="center_vertical"
-				android:drawableStart="@drawable/ic_fluent_bookmark_24_selector"
-				android:paddingHorizontal="8dp"
-				android:drawableTint="@color/bookmark_icon"
-				android:gravity="center_vertical"
-				android:textAppearance="@style/m3_label_large" />
+				android:paddingHorizontal="16dp"
+				android:minWidth="56dp">
+				<ImageView
+					android:id="@+id/bookmark"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/ic_fluent_bookmark_24_selector"
+					android:tint="@color/bookmark_icon"
+					android:gravity="center_vertical"
+					android:textAppearance="@style/m3_label_large" />
+			</FrameLayout>
 		</FrameLayout>
 
-		<Space
-			android:layout_width="0px"
-			android:layout_height="1px"
-			android:layout_weight="1"/>
-
 		<FrameLayout
 			android:id="@+id/share_btn"
 			android:layout_width="wrap_content"
-			android:layout_height="match_parent">
+			android:layout_height="match_parent"
+			android:paddingHorizontal="16dp">
 			<ImageView
 				android:id="@+id/share"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:layout_gravity="center_vertical"
 				android:src="@drawable/ic_fluent_share_24_regular"
-				android:paddingHorizontal="8dp"
 				android:tint="?android:textColorSecondary"
 				android:gravity="center_vertical"/>
 		</FrameLayout>