diff --git a/app/src/main/res/layout/fragment_add_login.xml b/app/src/main/res/layout/fragment_add_login.xml
index 773f95e746..c4dc213f83 100644
--- a/app/src/main/res/layout/fragment_add_login.xml
+++ b/app/src/main/res/layout/fragment_add_login.xml
@@ -89,7 +89,7 @@
         android:id="@+id/usernameHeader"
         style="@style/CaptionTextStyle"
         android:layout_width="0dp"
-        android:layout_height="16dp"
+        android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:paddingStart="3dp"
         android:paddingEnd="0dp"
diff --git a/app/src/main/res/layout/fragment_address_editor.xml b/app/src/main/res/layout/fragment_address_editor.xml
index a77d8cbf54..26445ee4c6 100644
--- a/app/src/main/res/layout/fragment_address_editor.xml
+++ b/app/src/main/res/layout/fragment_address_editor.xml
@@ -19,7 +19,7 @@
             android:id="@+id/first_name_title"
             style="@style/CaptionTextStyle"
             android:layout_width="wrap_content"
-            android:layout_height="16dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:labelFor="@id/first_name_input"
             android:letterSpacing="0.05"
@@ -62,7 +62,7 @@
             android:id="@+id/middle_name_title"
             style="@style/CaptionTextStyle"
             android:layout_width="wrap_content"
-            android:layout_height="16dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:labelFor="@id/middle_name_input"
             android:letterSpacing="0.05"
@@ -105,7 +105,7 @@
             android:id="@+id/last_name_title"
             style="@style/CaptionTextStyle"
             android:layout_width="wrap_content"
-            android:layout_height="16dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:labelFor="@id/last_name_input"
             android:letterSpacing="0.05"
diff --git a/app/src/main/res/layout/fragment_credit_card_editor.xml b/app/src/main/res/layout/fragment_credit_card_editor.xml
index 4fa89ea8cc..c5b94bb7be 100644
--- a/app/src/main/res/layout/fragment_credit_card_editor.xml
+++ b/app/src/main/res/layout/fragment_credit_card_editor.xml
@@ -19,7 +19,7 @@
             android:id="@+id/card_number_title"
             style="@style/CaptionTextStyle"
             android:layout_width="wrap_content"
-            android:layout_height="16dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:letterSpacing="0.05"
             android:paddingStart="3dp"
diff --git a/app/src/main/res/layout/fragment_edit_login.xml b/app/src/main/res/layout/fragment_edit_login.xml
index a595aa4d59..405d277bbd 100644
--- a/app/src/main/res/layout/fragment_edit_login.xml
+++ b/app/src/main/res/layout/fragment_edit_login.xml
@@ -76,7 +76,7 @@
         android:id="@+id/usernameHeader"
         style="@style/CaptionTextStyle"
         android:layout_width="0dp"
-        android:layout_height="16dp"
+        android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:paddingStart="3dp"
         android:paddingEnd="0dp"