diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 6fdac002df..570272e392 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -88,7 +88,7 @@
                 android:background="@drawable/bg_login_server_selector"
                 android:minHeight="80dp"
                 android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin"
+                android:paddingEnd="0dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
@@ -108,9 +108,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
-                    android:layout_marginEnd="12dp"
                     android:gravity="start"
-                    android:text="@string/login_server_matrix_org_text"
+                    android:text="@string/login_server_modular_text"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceModularLearnMore"
@@ -121,7 +120,7 @@
                     android:id="@+id/loginServerChoiceModularLearnMore"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
+                    android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     android:textColor="@color/riotx_accent"