diff --git a/mastodon/src/main/res/layout/item_account_switcher.xml b/mastodon/src/main/res/layout/item_account_switcher.xml
index 26e8806f..f0addb96 100644
--- a/mastodon/src/main/res/layout/item_account_switcher.xml
+++ b/mastodon/src/main/res/layout/item_account_switcher.xml
@@ -2,7 +2,7 @@
 <org.joinmastodon.android.ui.views.CheckableRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
-	android:layout_height="72dp"
+	android:layout_height="wrap_content"
 	android:gravity="center_vertical">
 	
 	<ImageView
@@ -11,6 +11,7 @@
 		android:layout_height="40dp"
 		android:layout_margin="16dp"
 		android:layout_alignParentStart="true"
+		android:layout_centerInParent="true"
 		android:importantForAccessibility="no"/>
 
 	<View
@@ -26,11 +27,13 @@
 	<TextView
 		android:id="@+id/name"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
+		android:layout_height="wrap_content"
+		android:minHeight="24dp"
 		android:layout_marginTop="14dp"
 		android:layout_toEndOf="@id/avatar"
 		android:layout_toStartOf="@id/radiobtn"
 		android:textAppearance="@style/m3_body_large"
+		android:textSize="16sp"
 		android:textColor="?colorM3OnSurface"
 		android:gravity="center_vertical|start"
 		android:textAlignment="viewStart"
@@ -40,12 +43,15 @@
 	<TextView
 		android:id="@+id/username"
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
+		android:layout_height="wrap_content"
+		android:minHeight="20dp"
+		android:layout_marginBottom="14dp"
 		android:layout_below="@id/name"
 		android:layout_toEndOf="@id/avatar"
 		android:layout_toStartOf="@id/radiobtn"
 		android:textColor="?colorM3OnSurfaceVariant"
 		android:textAppearance="@style/m3_body_medium"
+		android:textSize="14sp"
 		android:singleLine="true"
 		android:gravity="center_vertical|start"
 		android:textAlignment="viewStart"
diff --git a/mastodon/src/main/res/layout/item_generic_list_content.xml b/mastodon/src/main/res/layout/item_generic_list_content.xml
index a504b08f..5f7351b5 100644
--- a/mastodon/src/main/res/layout/item_generic_list_content.xml
+++ b/mastodon/src/main/res/layout/item_generic_list_content.xml
@@ -24,6 +24,7 @@
 			android:minHeight="24dp"
 			android:gravity="center_vertical|start"
 			android:textAppearance="@style/m3_body_large"
+			android:textSize="16sp"
 			android:textColor="?colorM3OnSurface"
 			android:textAlignment="viewStart"
 			tools:text="Title"/>
@@ -35,6 +36,7 @@
 			android:minHeight="20dp"
 			android:gravity="center_vertical|start"
 			android:textAppearance="@style/m3_body_medium"
+			android:textSize="14sp"
 			android:textColor="?colorM3OnSurfaceVariant"
 			android:textAlignment="viewStart"
 			tools:text="Subtitle"/>
diff --git a/mastodon/src/main/res/layout/item_server_rule.xml b/mastodon/src/main/res/layout/item_server_rule.xml
index 2d52a60d..fc80bf93 100644
--- a/mastodon/src/main/res/layout/item_server_rule.xml
+++ b/mastodon/src/main/res/layout/item_server_rule.xml
@@ -29,6 +29,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="top"
 		android:textAppearance="@style/m3_body_large"
+		android:textSize="16sp"
 		android:textColor="?colorM3OnSurface"
 		tools:text="No discrimination, including (but not limited to) racism, sexism, homophobia or transphobia."/>
 
diff --git a/mastodon/src/main/res/layout/item_text_with_icon.xml b/mastodon/src/main/res/layout/item_text_with_icon.xml
index c3453d8b..17694146 100644
--- a/mastodon/src/main/res/layout/item_text_with_icon.xml
+++ b/mastodon/src/main/res/layout/item_text_with_icon.xml
@@ -2,11 +2,14 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="56dp"
+	android:layout_height="wrap_content"
+	android:minHeight="56dp"
 	android:gravity="center_vertical|start"
 	android:textAlignment="viewStart"
 	android:textColor="?colorM3OnSurface"
 	android:textAppearance="@style/m3_body_large"
+	android:textSize="16sp"
+	android:paddingVertical="14dp"
 	android:singleLine="true"
 	android:ellipsize="end"
 	android:paddingLeft="24dp"