diff --git a/mastodon/src/main/res/layout/display_item_text.xml b/mastodon/src/main/res/layout/display_item_text.xml
index 294f254f..90d06c6a 100644
--- a/mastodon/src/main/res/layout/display_item_text.xml
+++ b/mastodon/src/main/res/layout/display_item_text.xml
@@ -12,6 +12,7 @@
 		android:id="@+id/text"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:textSize="16sp"
 		android:textAppearance="@style/m3_body_large"/>
 
 	<LinearLayout
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index b76889a9..83aaee43 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -28,6 +28,7 @@
 				android:background="@drawable/bg_cw_edit"
 				android:padding="16dp"
 				android:minHeight="56dp"
+				android:textSize="16sp"
 				tools:visibility="visible"/>
 
 			<TextView
@@ -96,6 +97,7 @@
 					android:paddingRight="16dp"
 					android:paddingBottom="16dp"
 					android:textAppearance="@style/m3_body_large"
+					android:textSize="16sp"
 					android:gravity="top"
 					android:background="@null"
 					android:hint="@string/compose_hint"
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 4f86d3d6..9c1ca1ba 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -189,6 +189,7 @@
 						android:layout_marginTop="8dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"
+						android:textSize="16sp"
 						tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
 
 					<EditText
@@ -201,6 +202,7 @@
 						android:layout_marginTop="16dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
 						android:textAppearance="@style/m3_body_large"
+						android:textSize="16sp"
 						android:background="@drawable/edit_text_border"
 						android:inputType="textPersonName|textCapWords"
 						android:visibility="gone"
@@ -216,6 +218,7 @@
 						android:layout_marginTop="8dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"
+						android:textSize="16sp"
 						android:background="@drawable/edit_text_border"
 						android:inputType="textMultiLine|textCapSentences"
 						android:visibility="gone"
diff --git a/mastodon/src/main/res/layout/item_instance_catalog.xml b/mastodon/src/main/res/layout/item_instance_catalog.xml
index cc8cd528..3adc65d4 100644
--- a/mastodon/src/main/res/layout/item_instance_catalog.xml
+++ b/mastodon/src/main/res/layout/item_instance_catalog.xml
@@ -20,7 +20,7 @@
 	<TextView
 		android:id="@+id/title"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
+		android:layout_height="wrap_content"
 		android:layout_toEndOf="@id/radiobtn"
 		android:layout_alignParentTop="true"
 		android:layout_marginBottom="4dp"
@@ -28,6 +28,8 @@
 		android:singleLine="true"
 		android:ellipsize="end"
 		android:gravity="center_vertical"
+		android:textSize="16sp"
+		android:minHeight="24dp"
 		tools:text="mastodon.social"/>
 
 	<TextView
@@ -39,6 +41,7 @@
 		android:layout_marginBottom="8dp"
 		android:textAppearance="@style/m3_body_medium"
 		android:textColor="?android:textColorSecondary"
+		android:textSize="14sp"
 		tools:text="General-purpose server run by the lead developer of Mastodon"/>
 
 	<TextView
diff --git a/mastodon/src/main/res/layout/item_profile_about.xml b/mastodon/src/main/res/layout/item_profile_about.xml
index 75459e89..fc575968 100644
--- a/mastodon/src/main/res/layout/item_profile_about.xml
+++ b/mastodon/src/main/res/layout/item_profile_about.xml
@@ -16,6 +16,7 @@
 		android:textAppearance="@style/m3_label_medium"
 		android:minHeight="16dp"
 		android:textAllCaps="true"
+		android:textSize="12sp"
 		tools:text="Field title"/>
 
 	<org.joinmastodon.android.ui.views.LinkedTextView
@@ -23,6 +24,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:textAppearance="@style/m3_body_large"
+		android:textSize="16sp"
 		tools:text="Field value"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_report_choice.xml b/mastodon/src/main/res/layout/item_report_choice.xml
index 5241df17..27ecd758 100644
--- a/mastodon/src/main/res/layout/item_report_choice.xml
+++ b/mastodon/src/main/res/layout/item_report_choice.xml
@@ -21,6 +21,7 @@
 		android:layout_toEndOf="@id/checkbox"
 		android:layout_marginStart="16dp"
 		android:textAppearance="@style/m3_title_medium"
+		android:textSize="16sp"
 		tools:text="Title"/>
 
 	<TextView
@@ -32,6 +33,7 @@
 		android:layout_marginStart="16dp"
 		android:textAppearance="@style/m3_body_medium"
 		android:textColor="?android:textColorSecondary"
+		android:textSize="14sp"
 		tools:text="Subtitle"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_settings_footer.xml b/mastodon/src/main/res/layout/item_settings_footer.xml
index 1f39e51e..555cdb9e 100644
--- a/mastodon/src/main/res/layout/item_settings_footer.xml
+++ b/mastodon/src/main/res/layout/item_settings_footer.xml
@@ -2,8 +2,9 @@
 <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="24dp"
-	android:textSize="16dp"
+	android:layout_height="wrap_content"
+	android:textSize="16sp"
+	android:minHeight="24dp"
 	android:textColor="?android:textColorSecondary"
 	android:gravity="center"
 	tools:text="Visual appearance"/>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_settings_header.xml b/mastodon/src/main/res/layout/item_settings_header.xml
index f73ce0ba..d0cca775 100644
--- a/mastodon/src/main/res/layout/item_settings_header.xml
+++ b/mastodon/src/main/res/layout/item_settings_header.xml
@@ -3,7 +3,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:textSize="14dp"
+	android:textSize="14sp"
 	android:fontFamily="sans-serif-medium"
 	android:textColor="?android:colorAccent"
 	android:padding="16dp"
diff --git a/mastodon/src/main/res/layout/item_settings_switch.xml b/mastodon/src/main/res/layout/item_settings_switch.xml
index 6bec213c..d3fc123c 100644
--- a/mastodon/src/main/res/layout/item_settings_switch.xml
+++ b/mastodon/src/main/res/layout/item_settings_switch.xml
@@ -22,7 +22,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
-		android:textSize="16dp"
+		android:textSize="16sp"
 		android:textColor="?android:textColorPrimary"
 		android:singleLine="true"
 		android:ellipsize="end"
diff --git a/mastodon/src/main/res/layout/item_settings_text.xml b/mastodon/src/main/res/layout/item_settings_text.xml
index bfaac104..45d35542 100644
--- a/mastodon/src/main/res/layout/item_settings_text.xml
+++ b/mastodon/src/main/res/layout/item_settings_text.xml
@@ -6,7 +6,7 @@
 	android:paddingLeft="16dp"
 	android:paddingRight="16dp"
 	android:gravity="center_vertical"
-	android:textSize="16dp"
+	android:textSize="16sp"
 	android:textColor="?android:textColorPrimary"
 	android:singleLine="true"
 	android:ellipsize="end"
diff --git a/mastodon/src/main/res/layout/item_settings_theme_subitem.xml b/mastodon/src/main/res/layout/item_settings_theme_subitem.xml
index 9abc17ca..93d24295 100644
--- a/mastodon/src/main/res/layout/item_settings_theme_subitem.xml
+++ b/mastodon/src/main/res/layout/item_settings_theme_subitem.xml
@@ -17,9 +17,11 @@
 	<TextView
 		android:id="@+id/text"
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
+		android:layout_height="wrap_content"
 		android:layout_marginTop="8dp"
 		android:textAppearance="@style/m3_body_medium"
+		android:textSize="14sp"
+		android:minHeight="20dp"
 		android:gravity="center"
 		android:singleLine="true"
 		android:ellipsize="end"