diff --git a/mastodon/src/main/res/layout/item_discover_account.xml b/mastodon/src/main/res/layout/item_discover_account.xml
index 14d68f5ed..5eb868c61 100644
--- a/mastodon/src/main/res/layout/item_discover_account.xml
+++ b/mastodon/src/main/res/layout/item_discover_account.xml
@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:background="?colorBackgroundLight"
 	android:elevation="2dp"
-	android:paddingBottom="16dp">
+	android:paddingBottom="0dp">
 
 	<ImageView
 		android:id="@+id/cover"
@@ -81,92 +81,107 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/bio"
-		android:paddingRight="8dp"
 		android:orientation="horizontal">
 
-		<LinearLayout
-			android:id="@+id/posts_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="48dp"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:gravity="center_horizontal"
-			android:orientation="vertical">
+		<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:paddingBottom="16dp"
+			android:layout_marginStart="16dp">
 
-			<TextView
-				android:id="@+id/posts_count"
+			<LinearLayout
+				android:id="@+id/posts_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_title_large"
-				tools:text="123" />
+				android:layout_marginTop="8dp"
+				android:layout_marginEnd="8dp"
+				android:gravity="center_vertical"
+				android:orientation="horizontal">
+				<TextView
+					android:id="@+id/posts_count"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textAppearance="@style/m3_title_medium"
+					android:singleLine="true"
+					android:ellipsize="end"
+					tools:text="123" />
+				<TextView
+					android:id="@+id/posts_label"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="4sp"
+					android:textAppearance="@style/m3_body_large"
+					android:singleLine="true"
+					android:ellipsize="middle"
+					tools:text="posts" />
+			</LinearLayout>
 
-			<TextView
-				android:id="@+id/posts_label"
+			<LinearLayout
+				android:id="@+id/following_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_title_small"
-				tools:text="following" />
-		</LinearLayout>
+				android:layout_marginTop="8dp"
+				android:layout_marginEnd="8dp"
+				android:orientation="horizontal"
+				android:gravity="center_vertical">
+				<TextView
+					android:id="@+id/following_count"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textAppearance="@style/m3_title_medium"
+					android:singleLine="true"
+					android:ellipsize="end"
+					tools:text="123"/>
+				<TextView
+					android:id="@+id/following_label"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="4sp"
+					android:textAppearance="@style/m3_body_large"
+					android:singleLine="true"
+					android:ellipsize="middle"
+					tools:text="following"/>
+			</LinearLayout>
 
-		<LinearLayout
-			android:id="@+id/followers_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="48dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginStart="12dp"
-			android:orientation="vertical"
-			android:gravity="center_horizontal">
-			<TextView
-				android:id="@+id/followers_count"
+			<LinearLayout
+				android:id="@+id/followers_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_title_large"
-				tools:text="123"/>
-
-			<TextView
-				android:id="@+id/followers_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_title_small"
-				tools:text="following"/>
-		</LinearLayout>
-
-		<LinearLayout
-			android:id="@+id/following_btn"
-			android:layout_width="wrap_content"
-			android:layout_height="48dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginStart="12dp"
-			android:orientation="vertical"
-			android:gravity="center_horizontal">
-			<TextView
-				android:id="@+id/following_count"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_title_large"
-				tools:text="123"/>
-
-			<TextView
-				android:id="@+id/following_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_title_small"
-				tools:text="following"/>
-		</LinearLayout>
-
-		<Space
-			android:layout_width="0px"
-			android:layout_height="1px"
-			android:layout_weight="1"/>
+				android:layout_marginTop="8dp"
+				android:orientation="horizontal"
+				android:gravity="center_vertical">
+				<TextView
+					android:id="@+id/followers_count"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textAppearance="@style/m3_title_medium"
+					android:singleLine="true"
+					android:ellipsize="end"
+					tools:text="123"/>
+				<TextView
+					android:id="@+id/followers_label"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="4sp"
+					android:textAppearance="@style/m3_body_large"
+					android:singleLine="true"
+					android:ellipsize="middle"
+					tools:text="followers"/>
+			</LinearLayout>
+		</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 
 		<FrameLayout
 			android:id="@+id/reject_btn_wrap"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
+			android:layout_gravity="bottom"
+			android:paddingStart="8dp"
+			android:paddingEnd="4dp"
 			android:clipToPadding="false"
-			android:paddingHorizontal="4dp"
-			android:paddingVertical="8dp"
+			android:paddingTop="8dp"
+			android:paddingBottom="16dp"
 			android:visibility="gone">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
@@ -194,10 +209,12 @@
 			android:id="@+id/accept_btn_wrap"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
+			android:layout_gravity="bottom"
+			android:paddingStart="4dp"
+			android:paddingEnd="16dp"
 			android:clipToPadding="false"
-			android:paddingHorizontal="4dp"
-			android:paddingVertical="8dp"
+			android:paddingTop="8dp"
+			android:paddingBottom="16dp"
 			android:visibility="gone">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
@@ -224,8 +241,11 @@
 			android:id="@+id/action_btn_wrap"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:padding="8dp"
+			android:layout_gravity="bottom"
+			android:paddingStart="8dp"
+			android:paddingEnd="16dp"
+			android:paddingTop="8dp"
+			android:paddingBottom="16dp"
 			android:clipToPadding="false">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton