diff --git a/app/src/main/res/layout/controller_server_selection.xml b/app/src/main/res/layout/controller_server_selection.xml
index 51d04221c..427b5132e 100644
--- a/app/src/main/res/layout/controller_server_selection.xml
+++ b/app/src/main/res/layout/controller_server_selection.xml
@@ -152,11 +152,11 @@
                 android:id="@+id/helper_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="58dp"
-                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="42dp"
                 android:lineSpacingMultiplier="1.2"
                 android:lines="2"
+                android:minHeight="@dimen/min_size_clickable_area"
+                android:padding="@dimen/standard_padding"
                 android:text="@string/nc_get_from_provider"
                 android:textAlignment="center"
                 android:textColor="@color/nc_login_text_color" />
@@ -165,11 +165,11 @@
                 android:id="@+id/cert_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/standard_margin"
                 android:lineSpacingMultiplier="1.2"
                 android:lines="2"
+                android:minHeight="@dimen/min_size_clickable_area"
+                android:padding="@dimen/standard_padding"
                 android:text="@string/nc_configure_cert_auth"
                 android:textAlignment="center"
                 android:textColor="@color/nc_login_text_color" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2da4690ac..84881fc10 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -25,6 +25,8 @@
     <dimen name="item_height">72dp</dimen>
     <dimen name="small_item_height">48dp</dimen>
 
+    <dimen name="min_size_clickable_area">48dp</dimen>
+
     <!-- Custom transition dimensions -->
     <dimen name="margin_between_elements">8dp</dimen>
     <dimen name="double_margin_between_elements">16dp</dimen>