diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index 38f5887dc..70472f60b 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -105,7 +105,7 @@
 				android:layout_below="@id/retry_or_cancel_upload"
 				android:layout_marginTop="16dp"
 				android:textColor="?colorGray200"
-				android:textSize="14dp"
+				android:textSize="14sp"
 				android:gravity="center_horizontal"
 				android:singleLine="true"
 				android:ellipsize="end"
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 4adb201c0..b022139f2 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -49,8 +49,8 @@
 
 	<ImageView
 		android:id="@+id/avatar"
-		android:layout_width="46dp"
-		android:layout_height="46dp"
+		android:layout_width="46sp"
+		android:layout_height="46sp"
 		android:layout_alignParentStart="true"
 		android:layout_alignParentTop="true"
 		android:layout_marginEnd="12dp" />
@@ -58,15 +58,16 @@
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
+		android:layout_height="wrap_content"
 		android:layout_marginEnd="12dp"
 		android:layout_toStartOf="@id/visibility"
-		android:layout_toEndOf="@id/avatar">
+		android:layout_toEndOf="@id/avatar"
+		android:minHeight="24sp">
 
 		<TextView
 			android:id="@+id/name"
 			android:layout_width="wrap_content"
-			android:layout_height="24dp"
+			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textAlignment="viewStart"
@@ -76,7 +77,7 @@
 		<TextView
 			android:id="@+id/extra_text"
 			android:layout_width="wrap_content"
-			android:layout_height="24dp"
+			android:layout_height="wrap_content"
 			android:layout_marginStart="8dp"
 			android:ellipsize="end"
 			android:fontFamily="sans-serif"
@@ -89,18 +90,19 @@
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
+		android:layout_height="wrap_content"
 		android:layout_below="@id/name_wrap"
 		android:layout_marginEnd="8dp"
 		android:layout_toStartOf="@id/visibility"
 		android:layout_toEndOf="@id/avatar"
 		android:layoutDirection="locale"
+		android:minHeight="20sp"
 		android:orientation="horizontal">
 
 		<TextView
 			android:id="@+id/username"
 			android:layout_width="wrap_content"
-			android:layout_height="20dp"
+			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textAppearance="@style/m3_title_small"
@@ -109,9 +111,9 @@
 		<TextView
 			android:id="@+id/separator"
 			android:layout_width="wrap_content"
-			android:layout_height="20dp"
-			android:layout_marginLeft="4dp"
-			android:layout_marginRight="4dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4sp"
+			android:layout_marginRight="4sp"
 			android:importantForAccessibility="no"
 			android:text="·"
 			android:textAppearance="@style/m3_title_small" />
@@ -119,7 +121,7 @@
 		<TextView
 			android:id="@+id/timestamp"
 			android:layout_width="wrap_content"
-			android:layout_height="20dp"
+			android:layout_height="wrap_content"
 			android:singleLine="true"
 			android:textAppearance="@style/m3_title_small"
 			tools:text="3h" />
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index d2e87358e..f0eb8cfd8 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -79,8 +79,8 @@
 
 					<ImageView
 						android:id="@+id/self_avatar"
-						android:layout_width="46dp"
-						android:layout_height="46dp"
+						android:layout_width="46sp"
+						android:layout_height="46sp"
 						android:layout_alignParentStart="true"
 						android:layout_alignParentTop="true"
 						android:layout_marginEnd="12dp" />
@@ -88,8 +88,9 @@
 					<TextView
 						android:id="@+id/self_name"
 						android:layout_width="match_parent"
-						android:layout_height="24dp"
+						android:layout_height="wrap_content"
 						android:layout_toEndOf="@id/self_avatar"
+						android:minHeight="24sp"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_medium"
@@ -98,9 +99,10 @@
 					<TextView
 						android:id="@+id/self_username"
 						android:layout_width="match_parent"
-						android:layout_height="20dp"
+						android:layout_height="wrap_content"
 						android:layout_below="@id/self_name"
 						android:layout_toEndOf="@id/self_avatar"
+						android:minHeight="20sp"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_small"
diff --git a/mastodon/src/main/res/layout/fragment_discover.xml b/mastodon/src/main/res/layout/fragment_discover.xml
index 7ea500d7d..d797ee7cb 100644
--- a/mastodon/src/main/res/layout/fragment_discover.xml
+++ b/mastodon/src/main/res/layout/fragment_discover.xml
@@ -36,7 +36,7 @@
 				android:hint="@string/search_hint"
 				android:textColorHint="?colorSearchHint"
 				android:textColor="?android:textColorPrimary"
-				android:textSize="16dp"
+				android:textSize="16sp"
 				android:singleLine="true"
 				android:inputType="textFilter"
 				android:imeOptions="actionSearch"
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 22636c12c..73b6921bd 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -45,7 +45,7 @@
 						android:textColor="?colorGray50t"
 						android:textAllCaps="true"
 						android:fontFamily="sans-serif-medium"
-						android:textSize="14dp"
+						android:textSize="14sp"
 						android:gravity="center"
 						android:background="@drawable/bg_profile_follows_you"
 						android:visibility="gone"
diff --git a/mastodon/src/main/res/layout/item_account_switcher.xml b/mastodon/src/main/res/layout/item_account_switcher.xml
index f171661ce..1cffbf7af 100644
--- a/mastodon/src/main/res/layout/item_account_switcher.xml
+++ b/mastodon/src/main/res/layout/item_account_switcher.xml
@@ -19,7 +19,7 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:layout_marginStart="24dp"
-		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_emoji_section.xml b/mastodon/src/main/res/layout/item_emoji_section.xml
index c99999753..c4341c48e 100644
--- a/mastodon/src/main/res/layout/item_emoji_section.xml
+++ b/mastodon/src/main/res/layout/item_emoji_section.xml
@@ -6,7 +6,7 @@
 	android:singleLine="true"
 	android:ellipsize="end"
 	android:fontFamily="sans-serif-medium"
-	android:textSize="12dp"
+	android:textSize="12sp"
 	android:textColor="?android:textColorSecondary"
 	android:textAllCaps="true"
 	android:paddingTop="24dp"
diff --git a/mastodon/src/main/res/layout/item_instance_category.xml b/mastodon/src/main/res/layout/item_instance_category.xml
index c42cfe844..e9f1abded 100644
--- a/mastodon/src/main/res/layout/item_instance_category.xml
+++ b/mastodon/src/main/res/layout/item_instance_category.xml
@@ -22,7 +22,7 @@
 		android:textAllCaps="true"
 		android:textColor="?android:textColorPrimary"
 		android:fontFamily="sans-serif-medium"
-		android:textSize="14dp"
+		android:textSize="14sp"
 		android:gravity="center_vertical"
 		android:singleLine="true"
 		android:ellipsize="end"
diff --git a/mastodon/src/main/res/layout/item_server_rule.xml b/mastodon/src/main/res/layout/item_server_rule.xml
index 9930af222..65bd75b4b 100644
--- a/mastodon/src/main/res/layout/item_server_rule.xml
+++ b/mastodon/src/main/res/layout/item_server_rule.xml
@@ -12,13 +12,13 @@
 	
 	<TextView
 		android:id="@+id/number"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
+		android:layout_width="24sp"
+		android:layout_height="wrap_content"
 		android:layout_marginEnd="16dp"
 		android:textColor="?android:colorAccent"
 		android:fontFamily="sans-serif-condensed"
 		android:textStyle="bold"
-		android:textSize="22dp"
+		android:textSize="22sp"
 		android:gravity="center"
 		android:includeFontPadding="false"
 		tools:text="1"/>
diff --git a/mastodon/src/main/res/layout/item_settings_notification_policy.xml b/mastodon/src/main/res/layout/item_settings_notification_policy.xml
index a9f4d8645..eece7d1a7 100644
--- a/mastodon/src/main/res/layout/item_settings_notification_policy.xml
+++ b/mastodon/src/main/res/layout/item_settings_notification_policy.xml
@@ -14,7 +14,7 @@
 		android:layout_marginEnd="8dp"
 		android:gravity="center_vertical"
 		android:textColor="?android:textColorPrimary"
-		android:textSize="20dp"
+		android:textSize="20sp"
 		android:fontFamily="sans-serif-medium"
 		android:singleLine="true"
 		android:ellipsize="end"
@@ -26,7 +26,7 @@
 		android:layout_height="32dp"
 		android:background="@drawable/bg_inline_button"
 		android:textColor="?android:textColorPrimary"
-		android:textSize="20dp"
+		android:textSize="20sp"
 		android:fontFamily="sans-serif-medium"
 		android:paddingLeft="4dp"
 		android:paddingRight="4dp"
diff --git a/mastodon/src/main/res/layout/item_settings_update.xml b/mastodon/src/main/res/layout/item_settings_update.xml
index 263c8f1c1..5ebf8c7c9 100644
--- a/mastodon/src/main/res/layout/item_settings_update.xml
+++ b/mastodon/src/main/res/layout/item_settings_update.xml
@@ -37,7 +37,7 @@
 				android:background="?android:selectableItemBackground"
 				android:textColor="?android:textColorPrimary"
 				android:textAllCaps="true"
-				android:textSize="14dp"
+				android:textSize="14sp"
 				android:paddingLeft="16dp"
 				android:paddingRight="16dp"
 				android:stateListAnimator="@null"
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 5a152871a..760217e88 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -381,7 +381,7 @@
 
 	<style name="Widget.Mastodon.M3.Button" parent="android:Widget.Material.Button">
 		<item name="android:textAllCaps">false</item>
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 		<item name="android:minHeight">40dp</item>
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:stateListAnimator">@null</item>
@@ -403,45 +403,45 @@
 
 	<style name="alert_title">
 		<item name="android:textColor">?android:textColorPrimary</item>
-		<item name="android:textSize">24dp</item>
+		<item name="android:textSize">24sp</item>
 		<item name="android:minHeight">38dp</item>
 		<item name="android:gravity">center_vertical</item>
 	</style>
 
 	<style name="m3_body_large">
-		<item name="android:textSize">16dp</item>
+		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">5dp</item>
 	</style>
 
 	<style name="m3_body_medium">
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">4dp</item>
 	</style>
 
 	<style name="m3_body_small">
-		<item name="android:textSize">12dp</item>
+		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">?android:textColorSecondary</item>
 		<item name="android:lineSpacingExtra">2dp</item>
 	</style>
 
 	<style name="m3_title_medium">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">16dp</item>
+		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">5dp</item>
 	</style>
 
 	<style name="m3_title_small">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 		<item name="android:textColor">?android:textColorSecondary</item>
 	</style>
 
 	<style name="m3_label_medium">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">12dp</item>
+		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingMultiplier">1.14</item>
 	</style>
@@ -449,12 +449,12 @@
 	<style name="m3_label_large">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textColor">?android:textColorSecondary</item>
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 	</style>
 
 	<style name="m3_title_large">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">22dp</item>
+		<item name="android:textSize">22sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 	</style>
 
@@ -465,12 +465,12 @@
 	</style>
 
 	<style name="m3_headline_small">
-		<item name="android:textSize">24dp</item>
+		<item name="android:textSize">24sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 	</style>
 
 	<style name="m3_headline_medium">
-		<item name="android:textSize">28dp</item>
+		<item name="android:textSize">28sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">3dp</item>
 	</style>