diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index 70472f60b..cf666a43b 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -101,7 +101,7 @@
 			<TextView
 				android:id="@+id/state_title"
 				android:layout_width="match_parent"
-				android:layout_height="16dp"
+				android:layout_height="wrap_content"
 				android:layout_below="@id/retry_or_cancel_upload"
 				android:layout_marginTop="16dp"
 				android:textColor="?colorGray200"
@@ -116,7 +116,7 @@
 			<TextView
 				android:id="@+id/state_text"
 				android:layout_width="match_parent"
-				android:layout_height="32dp"
+				android:layout_height="wrap_content"
 				android:layout_below="@id/state_title"
 				android:includeFontPadding="false"
 				android:textColor="?colorGray200"
diff --git a/mastodon/src/main/res/layout/item_recent_searches_header.xml b/mastodon/src/main/res/layout/item_recent_searches_header.xml
index 29352a7b3..0452d7baa 100644
--- a/mastodon/src/main/res/layout/item_recent_searches_header.xml
+++ b/mastodon/src/main/res/layout/item_recent_searches_header.xml
@@ -6,7 +6,7 @@
 
 	<TextView
 		android:layout_width="0dp"
-		android:layout_height="28dp"
+		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:layout_marginTop="12dp"
 		android:layout_marginStart="16dp"
@@ -22,6 +22,7 @@
 		android:layout_height="44dp"
 		android:layout_marginTop="4dp"
 		android:layout_marginEnd="6dp"
+		android:layout_gravity="center_vertical"
 		android:tint="?android:textColorSecondary"
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:contentDescription="@string/clear"