diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index 8ac268780e..56ca2e2587 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -1,187 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.MaxWidthFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:maxWidth="600sp"
-	app:defaultWidth="450sp"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
-	<GridLayout
+	<org.joinmastodon.android.ui.views.MaxWidthFrameLayout
+		android:maxWidth="600sp"
+		app:defaultWidth="450sp"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:rowCount="2"
-		android:columnCount="1">
+		android:layout_height="wrap_content">
 
-		<LinearLayout
-			android:orientation="horizontal"
+		<GridLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingHorizontal="4dp">
-			<!-- avatar width (46sp) / 2 - button width (24dp) / 2 -->
+			android:rowCount="2"
+			android:columnCount="1">
 
-			<FrameLayout
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="match_parent">
-				<LinearLayout
-					android:id="@+id/reply_btn"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:transformPivotX="24dp"
-					android:transformPivotY="24dp">
-					<ImageView
-						android:layout_width="24dp"
-						android:layout_height="24dp"
-						android:layout_gravity="center_vertical"
-						android:layout_marginVertical="12dp"
-						android:layout_marginStart="12dp"
-						android:duplicateParentState="true"
-						android:src="@drawable/ic_fluent_chat_multiple_24_selector_text"
-						android:tint="?colorM3OnSurfaceVariant"
-						android:gravity="center_vertical" />
-					<TextView
-						android:id="@+id/reply"
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingHorizontal="4dp">
+				<!-- avatar width (46sp) / 2 - button width (24dp) / 2 -->
+
+				<FrameLayout
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent">
+					<LinearLayout
+						android:id="@+id/reply_btn"
 						android:layout_width="wrap_content"
 						android:layout_height="match_parent"
-						android:layout_gravity="center_vertical"
-						android:paddingStart="8dp"
-						android:minWidth="12dp"
-						android:gravity="center_vertical"
-						android:textAppearance="@style/m3_label_large"
-						android:textColor="?colorM3OnSurfaceVariant"
-						android:maxLines="1"
-						android:ellipsize="end"
-						tools:text="123"
-						tools:ignore="RtlSymmetry" />
-				</LinearLayout>
-			</FrameLayout>
+						android:transformPivotX="24dp"
+						android:transformPivotY="24dp">
+						<ImageView
+							android:layout_width="24dp"
+							android:layout_height="24dp"
+							android:layout_gravity="center_vertical"
+							android:layout_marginVertical="12dp"
+							android:layout_marginStart="12dp"
+							android:duplicateParentState="true"
+							android:src="@drawable/ic_fluent_chat_multiple_24_selector_text"
+							android:tint="?colorM3OnSurfaceVariant"
+							android:gravity="center_vertical" />
+						<TextView
+							android:id="@+id/reply"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_gravity="center_vertical"
+							android:paddingStart="8dp"
+							android:minWidth="12dp"
+							android:gravity="center_vertical"
+							android:textAppearance="@style/m3_label_large"
+							android:textColor="?colorM3OnSurfaceVariant"
+							android:maxLines="1"
+							android:ellipsize="end"
+							tools:text="123"
+							tools:ignore="RtlSymmetry" />
+					</LinearLayout>
+				</FrameLayout>
 
-			<FrameLayout
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="match_parent">
-				<LinearLayout
-					android:id="@+id/boost_btn"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:transformPivotX="24dp"
-					android:transformPivotY="24dp">
-					<ImageView
-						android:layout_width="24dp"
-						android:layout_height="24dp"
-						android:layout_gravity="center_vertical"
-						android:layout_marginVertical="12dp"
-						android:layout_marginStart="12dp"
-						android:duplicateParentState="true"
-						android:src="@drawable/ic_boost"
-						android:tint="@color/boost_icon"
-						android:gravity="center_vertical" />
-					<TextView
-						android:id="@+id/boost"
+				<FrameLayout
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent">
+					<LinearLayout
+						android:id="@+id/boost_btn"
 						android:layout_width="wrap_content"
 						android:layout_height="match_parent"
-						android:layout_gravity="center_vertical"
-						android:paddingStart="8dp"
-						android:minWidth="12dp"
-						android:duplicateParentState="true"
-						android:textColor="@color/boost_icon"
-						android:gravity="center_vertical"
-						android:textAppearance="@style/m3_label_large"
-						android:maxLines="1"
-						android:ellipsize="end"
-						tools:text="123"
-						tools:ignore="RtlSymmetry" />
-				</LinearLayout>
-			</FrameLayout>
+						android:transformPivotX="24dp"
+						android:transformPivotY="24dp">
+						<ImageView
+							android:layout_width="24dp"
+							android:layout_height="24dp"
+							android:layout_gravity="center_vertical"
+							android:layout_marginVertical="12dp"
+							android:layout_marginStart="12dp"
+							android:duplicateParentState="true"
+							android:src="@drawable/ic_boost"
+							android:tint="@color/boost_icon"
+							android:gravity="center_vertical" />
+						<TextView
+							android:id="@+id/boost"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_gravity="center_vertical"
+							android:paddingStart="8dp"
+							android:minWidth="12dp"
+							android:duplicateParentState="true"
+							android:textColor="@color/boost_icon"
+							android:gravity="center_vertical"
+							android:textAppearance="@style/m3_label_large"
+							android:maxLines="1"
+							android:ellipsize="end"
+							tools:text="123"
+							tools:ignore="RtlSymmetry" />
+					</LinearLayout>
+				</FrameLayout>
 
-			<FrameLayout
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="match_parent">
-				<LinearLayout
-					android:id="@+id/favorite_btn"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:transformPivotX="24dp"
-					android:transformPivotY="24dp">
-					<ImageView
-						android:id="@+id/favorite_icon"
-						android:layout_width="24dp"
-						android:layout_height="24dp"
-						android:layout_gravity="center_vertical"
-						android:layout_marginVertical="12dp"
-						android:layout_marginStart="12dp"
-						android:duplicateParentState="true"
-						android:src="@drawable/ic_fluent_star_24_selector"
-						android:tint="@color/favorite_icon"
-						android:gravity="center_vertical" />
-					<TextView
-						android:id="@+id/favorite"
+				<FrameLayout
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent">
+					<LinearLayout
+						android:id="@+id/favorite_btn"
 						android:layout_width="wrap_content"
 						android:layout_height="match_parent"
-						android:layout_gravity="center_vertical"
-						android:paddingStart="8dp"
-						android:minWidth="12dp"
-						android:textColor="@color/favorite_icon"
-						android:gravity="center_vertical"
-						android:textAppearance="@style/m3_label_large"
-						android:maxLines="1"
-						android:ellipsize="end"
-						tools:text="123"
-						tools:ignore="RtlSymmetry" />
-				</LinearLayout>
-			</FrameLayout>
+						android:transformPivotX="24dp"
+						android:transformPivotY="24dp">
+						<ImageView
+							android:id="@+id/favorite_icon"
+							android:layout_width="24dp"
+							android:layout_height="24dp"
+							android:layout_gravity="center_vertical"
+							android:layout_marginVertical="12dp"
+							android:layout_marginStart="12dp"
+							android:duplicateParentState="true"
+							android:src="@drawable/ic_fluent_star_24_selector"
+							android:tint="@color/favorite_icon"
+							android:gravity="center_vertical" />
+						<TextView
+							android:id="@+id/favorite"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_gravity="center_vertical"
+							android:paddingStart="8dp"
+							android:minWidth="12dp"
+							android:textColor="@color/favorite_icon"
+							android:gravity="center_vertical"
+							android:textAppearance="@style/m3_label_large"
+							android:maxLines="1"
+							android:ellipsize="end"
+							tools:text="123"
+							tools:ignore="RtlSymmetry" />
+					</LinearLayout>
+				</FrameLayout>
 
-			<FrameLayout
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="match_parent">
 				<FrameLayout
-					android:id="@+id/bookmark_btn"
+					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:transformPivotX="24dp"
+						android:transformPivotY="24dp">
+						<ImageView
+							android:id="@+id/bookmark"
+							android:layout_width="24dp"
+							android:layout_height="24dp"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="12dp"
+							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>
+
+				<FrameLayout
+					android:id="@+id/share_btn"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:transformPivotX="24dp"
 					android:transformPivotY="24dp">
 					<ImageView
-						android:id="@+id/bookmark"
+						android:id="@+id/share"
 						android:layout_width="24dp"
 						android:layout_height="24dp"
 						android:layout_gravity="center_vertical"
-						android:layout_margin="12dp"
-						android:src="@drawable/ic_fluent_bookmark_24_selector"
-						android:tint="@color/bookmark_icon"
-						android:gravity="center_vertical"
-						android:textAppearance="@style/m3_label_large" />
+						android:layout_marginVertical="12dp"
+						android:layout_marginHorizontal="12dp"
+						android:src="@drawable/ic_fluent_share_24_regular"
+						android:tint="?colorM3OnSurfaceVariant"
+						android:gravity="center_vertical"/>
 				</FrameLayout>
-			</FrameLayout>
 
-			<FrameLayout
-				android:id="@+id/share_btn"
+			</LinearLayout>
+
+			<LinearLayout
 				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:transformPivotX="24dp"
-				android:transformPivotY="24dp">
-				<ImageView
-					android:id="@+id/share"
-					android:layout_width="24dp"
-					android:layout_height="24dp"
-					android:layout_gravity="center_vertical"
-					android:layout_marginVertical="12dp"
-					android:layout_marginHorizontal="12dp"
-					android:src="@drawable/ic_fluent_share_24_regular"
-					android:tint="?colorM3OnSurfaceVariant"
-					android:gravity="center_vertical"/>
-			</FrameLayout>
+				android:layout_height="wrap_content"
+				android:id="@+id/footer_emoji_keyboard_container"
+				android:orientation="vertical">
+			</LinearLayout>
 
-		</LinearLayout>
+		</GridLayout>
 
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/footer_emoji_keyboard_container"
-			android:orientation="vertical">
-		</LinearLayout>
-	</GridLayout>
+	</org.joinmastodon.android.ui.views.MaxWidthFrameLayout>
 
-</org.joinmastodon.android.ui.views.MaxWidthFrameLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file