diff --git a/src/main/res/layout-land/account_setup.xml b/src/main/res/layout-land/account_setup.xml
index ea7153128709..a98e272dd134 100644
--- a/src/main/res/layout-land/account_setup.xml
+++ b/src/main/res/layout-land/account_setup.xml
@@ -93,7 +93,11 @@
                 android:id="@+id/host_url_input_helper_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/standard_eight_padding"
+                android:lineSpacingMultiplier="1.2"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_eight_padding"
+                android:paddingEnd="@dimen/standard_half_padding"
+                android:paddingBottom="@dimen/standard_eight_padding"
                 android:text="@string/login_url_helper_text"
                 android:textColor="@color/white_helper_text" />
 
@@ -105,7 +109,10 @@
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/display_text_min_height"
-                android:padding="@dimen/standard_eight_padding"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_eight_padding"
+                android:paddingEnd="@dimen/standard_eight_padding"
+                android:paddingBottom="@dimen/standard_eight_padding"
                 android:text="@string/auth_testing_connection"
                 android:textColor="@color/login_text_color"
                 android:visibility="invisible"
@@ -118,7 +125,10 @@
                 android:contentDescription="@string/auth_unauthorized"
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
-                android:padding="@dimen/standard_eight_padding"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_eight_padding"
+                android:paddingEnd="@dimen/standard_eight_padding"
+                android:paddingBottom="@dimen/standard_eight_padding"
                 android:text="@string/auth_unauthorized"
                 android:textColor="@color/login_text_color"
                 app:drawableStartCompat="@android:drawable/stat_notify_sync" />
diff --git a/src/main/res/layout/account_setup.xml b/src/main/res/layout/account_setup.xml
index 4007bf8eb1da..e9aa655e8d2c 100644
--- a/src/main/res/layout/account_setup.xml
+++ b/src/main/res/layout/account_setup.xml
@@ -92,7 +92,11 @@
                 android:id="@+id/host_url_input_helper_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/standard_eight_padding"
+                android:lineSpacingMultiplier="1.2"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_eight_padding"
+                android:paddingEnd="@dimen/standard_half_padding"
+                android:paddingBottom="@dimen/standard_eight_padding"
                 android:text="@string/login_url_helper_text"
                 android:textColor="@color/white_helper_text" />
 
@@ -104,7 +108,10 @@
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/display_text_min_height"
-                android:padding="@dimen/standard_eight_padding"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_eight_padding"
+                android:paddingEnd="@dimen/standard_eight_padding"
+                android:paddingBottom="@dimen/standard_eight_padding"
                 android:text="@string/auth_testing_connection"
                 android:textColor="@color/login_text_color"
                 android:visibility="invisible"
@@ -117,7 +124,10 @@
                 android:contentDescription="@string/auth_unauthorized"
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
-                android:padding="@dimen/standard_eight_padding"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_eight_padding"
+                android:paddingEnd="@dimen/standard_eight_padding"
+                android:paddingBottom="@dimen/standard_eight_padding"
                 android:text="@string/auth_unauthorized"
                 android:textColor="@color/login_text_color"
                 app:drawableStartCompat="@android:drawable/stat_notify_sync" />