diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 28eeee1549..977c694952 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -6,143 +6,123 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <ImageView style="@style/LoginLogo" />
 
-        <LinearLayout
-            style="@style/LoginContainer"
+    <LinearLayout
+        style="@style/LoginFormContainer"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/loginServerIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:src="@drawable/ic_logo_matrix_org" />
+
+        <TextView
+            android:id="@+id/loginTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            tools:text="@string/login_signin_to" />
+
+        <TextView
+            android:id="@+id/loginNotice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:gravity="start"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+            tools:text="@string/login_server_matrix_org_text" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/loginFieldTil"
+            style="@style/VectorTextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginTop="32dp"
+            android:hint="@string/login_signup_username_hint"
+            app:errorEnabled="true">
 
-            <ImageView
-                android:id="@+id/logoImageView"
-                style="@style/LoginTopIcon"
-                android:layout_gravity="center_horizontal"
-                android:importantForAccessibility="no" />
-
-            <Space
-                android:layout_width="wrap_content"
-                android:layout_height="84dp" />
-
-            <ImageView
-                android:id="@+id/loginServerIcon"
-                android:layout_width="wrap_content"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/loginField"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:src="@drawable/ic_logo_matrix_org" />
+                android:inputType="textEmailAddress"
+                android:maxLines="1" />
 
-            <TextView
-                android:id="@+id/loginTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                tools:text="@string/login_signin_to" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-            <TextView
-                android:id="@+id/loginNotice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                tools:text="@string/login_server_matrix_org_text" />
+        <FrameLayout
+            android:id="@+id/passwordContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
+                android:id="@+id/passwordFieldTil"
                 style="@style/VectorTextInputLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signup_username_hint"
-                app:errorEnabled="true">
+                android:hint="@string/login_signup_password_hint"
+                app:errorEnabled="true"
+                app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
+                    android:id="@+id/passwordField"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
+                    android:ems="10"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:paddingEnd="48dp"
+                    android:paddingRight="48dp"
+                    tools:ignore="RtlSymmetry" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <FrameLayout
-                android:id="@+id/passwordContainer"
-                android:layout_width="match_parent"
+            <ImageView
+                android:id="@+id/passwordReveal"
+                android:layout_width="@dimen/layout_touch_size"
+                android:layout_height="@dimen/layout_touch_size"
+                android:layout_gravity="end"
+                android:layout_marginTop="8dp"
+                android:background="?attr/selectableItemBackground"
+                android:scaleType="center"
+                android:src="@drawable/ic_eye_black"
+                android:tint="?attr/colorAccent"
+                tools:contentDescription="@string/a11y_show_password" />
+
+        </FrameLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="22dp"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/forgetPasswordButton"
+                style="@style/Style.Vector.Login.Button.Text"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
+                android:layout_gravity="start"
+                android:text="@string/auth_forgot_password" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/passwordFieldTil"
-                    style="@style/VectorTextInputLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_signup_password_hint"
-                    app:errorEnabled="true"
-                    app:errorIconDrawable="@null">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/passwordField"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ems="10"
-                        android:inputType="textPassword"
-                        android:maxLines="1"
-                        android:paddingEnd="48dp"
-                        android:paddingRight="48dp"
-                        tools:ignore="RtlSymmetry" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <ImageView
-                    android:id="@+id/passwordReveal"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="8dp"
-                    android:background="?attr/selectableItemBackground"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_eye_black"
-                    android:tint="?attr/colorAccent"
-                    tools:contentDescription="@string/a11y_show_password" />
-
-            </FrameLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginSubmit"
+                style="@style/Style.Vector.Login.Button"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="22dp"
-                android:orientation="horizontal">
+                android:layout_alignParentEnd="true"
+                android:layout_gravity="end"
+                android:text="@string/auth_login"
+                tools:enabled="false"
+                tools:ignore="RelativeOverlap" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:text="@string/auth_forgot_password" />
+        </RelativeLayout>
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_gravity="end"
-                    android:text="@string/auth_login"
-                    tools:enabled="false"
-                    tools:ignore="RelativeOverlap" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index 762b6af4c0..31e1e882b1 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -2,49 +2,47 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="16dp"
-    android:paddingTop="32dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="16dp">
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/logoImageView"
-        style="@style/LoginTopIcon"
-        android:layout_gravity="center_horizontal"
-        android:importantForAccessibility="no"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <ImageView style="@style/LoginLogo" />
 
-    <TextView
-        android:id="@+id/loginCaptchaNotice"
-        style="@style/TextAppearance.Vector.Login.Text.Small"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:gravity="center_horizontal"
-        android:text="@string/auth_recaptcha_message"
-        app:layout_constraintTop_toBottomOf="@+id/logoImageView" />
-
-    <!-- contentDescription does not work on WebView? -->
-    <WebView
-        android:id="@+id/loginCaptchaWevView"
-        android:layout_width="match_parent"
+    <LinearLayout
+        style="@style/LoginFormContainer"
         android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:contentDescription="@string/login_a11y_captcha_container"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginCaptchaNotice" />
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@+id/loginCaptchaNotice"
+            style="@style/TextAppearance.Vector.Login.Text.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/auth_recaptcha_message" />
+
+        <!-- contentDescription does not work on WebView? -->
+        <WebView
+            android:id="@+id/loginCaptchaWevView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:contentDescription="@string/login_a11y_captcha_container"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginCaptchaNotice" />
+
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/loginCaptchaProgress"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        app:layout_constraintBottom_toBottomOf="@+id/loginCaptchaWevView"
-        app:layout_constraintEnd_toEndOf="@+id/loginCaptchaWevView"
-        app:layout_constraintStart_toStartOf="@+id/loginCaptchaWevView"
-        app:layout_constraintTop_toTopOf="@+id/loginCaptchaWevView" />
+        app:layout_constraintBottom_toBottomOf="@id/loginFormContainer"
+        app:layout_constraintEnd_toEndOf="@id/loginFormContainer"
+        app:layout_constraintStart_toStartOf="@id/loginFormContainer"
+        app:layout_constraintTop_toTopOf="@id/loginFormContainer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index c61babea95..20e050fe9e 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -6,94 +6,77 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <ImageView style="@style/LoginLogo" />
 
-        <LinearLayout
-            style="@style/LoginContainer"
+    <LinearLayout
+        style="@style/LoginFormContainer"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/loginGenericTextInputFormTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            tools:text="@string/login_set_email_title" />
+
+        <TextView
+            android:id="@+id/loginGenericTextInputFormNotice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:gravity="start"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+            tools:text="@string/login_set_email_notice" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/loginGenericTextInputFormTil"
+            style="@style/VectorTextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginTop="26dp"
+            app:errorEnabled="true"
+            tools:hint="@string/login_set_email_optional_hint">
 
-            <ImageView
-                android:id="@+id/logoImageView"
-                style="@style/LoginTopIcon"
-                android:layout_gravity="center_horizontal"
-                android:importantForAccessibility="no" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="130dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                tools:text="@string/login_set_email_title" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormNotice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                tools:text="@string/login_set_email_notice" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginGenericTextInputFormTil"
-                style="@style/VectorTextInputLayout"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/loginGenericTextInputFormTextInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="26dp"
-                app:errorEnabled="true"
-                tools:hint="@string/login_set_email_optional_hint">
+                android:imeOptions="actionDone"
+                android:maxLines="1"
+                tools:inputType="textEmailAddress" />
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginGenericTextInputFormTextInput"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionDone"
-                    android:maxLines="1"
-                    tools:inputType="textEmailAddress" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-            </com.google.android.material.textfield.TextInputLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginGenericTextInputFormOtherButton"
+                style="@style/Style.Vector.Login.Button.Text"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="horizontal">
+                android:layout_gravity="start"
+                android:visibility="gone"
+                tools:text="@string/login_msisdn_confirm_send_again"
+                tools:visibility="visible" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Style.Vector.Login.Button.Text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:visibility="gone"
-                    tools:text="@string/login_msisdn_confirm_send_again"
-                    tools:visibility="visible" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginGenericTextInputFormSubmit"
+                style="@style/Style.Vector.Login.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_gravity="end"
+                android:enabled="false"
+                tools:ignore="RelativeOverlap"
+                tools:text="@string/login_set_email_submit" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Style.Vector.Login.Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_gravity="end"
-                    android:enabled="false"
-                    tools:ignore="RelativeOverlap"
-                    tools:text="@string/login_set_email_submit" />
+        </RelativeLayout>
 
-            </RelativeLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index 7f09f0444b..b1dd495417 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -5,115 +5,98 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <ImageView style="@style/LoginLogo" />
 
-        <LinearLayout
-            style="@style/LoginContainer"
+    <LinearLayout
+        style="@style/LoginFormContainer"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/resetPasswordTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            tools:text="@string/login_reset_password_on" />
+
+        <TextView
+            android:id="@+id/loginNotice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:gravity="start"
+            android:text="@string/login_reset_password_notice"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/resetPasswordEmailTil"
+            style="@style/VectorTextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginTop="32dp"
+            android:hint="@string/login_reset_password_email_hint"
+            app:errorEnabled="true">
 
-            <ImageView
-                android:id="@+id/logoImageView"
-                style="@style/LoginTopIcon"
-                android:layout_gravity="center_horizontal"
-                android:importantForAccessibility="no" />
-
-            <TextView
-                android:id="@+id/resetPasswordTitle"
-                android:layout_width="wrap_content"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/resetPasswordEmail"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="84dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                tools:text="@string/login_reset_password_on" />
+                android:inputType="textEmailAddress"
+                android:maxLines="1" />
 
-            <TextView
-                android:id="@+id/loginNotice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <FrameLayout
+            android:id="@+id/passwordContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/resetPasswordEmailTil"
+                android:id="@+id/passwordFieldTil"
                 style="@style/VectorTextInputLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_reset_password_email_hint"
-                app:errorEnabled="true">
+                android:hint="@string/login_reset_password_password_hint"
+                app:errorEnabled="true"
+                app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/resetPasswordEmail"
+                    android:id="@+id/passwordField"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
+                    android:ems="10"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:paddingEnd="48dp"
+                    android:paddingRight="48dp"
+                    tools:ignore="RtlSymmetry" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <FrameLayout
-                android:id="@+id/passwordContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/passwordFieldTil"
-                    style="@style/VectorTextInputLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_reset_password_password_hint"
-                    app:errorEnabled="true"
-                    app:errorIconDrawable="@null">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/passwordField"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ems="10"
-                        android:inputType="textPassword"
-                        android:maxLines="1"
-                        android:paddingEnd="48dp"
-                        android:paddingRight="48dp"
-                        tools:ignore="RtlSymmetry" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <ImageView
-                    android:id="@+id/passwordReveal"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="8dp"
-                    android:background="?attr/selectableItemBackground"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_eye_black"
-                    android:tint="?attr/colorAccent"
-                    tools:contentDescription="@string/a11y_show_password" />
-
-            </FrameLayout>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/resetPasswordSubmit"
-                style="@style/Style.Vector.Login.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            <ImageView
+                android:id="@+id/passwordReveal"
+                android:layout_width="@dimen/layout_touch_size"
+                android:layout_height="@dimen/layout_touch_size"
                 android:layout_gravity="end"
-                android:text="@string/login_reset_password_submit"
-                tools:ignore="RelativeOverlap" />
+                android:layout_marginTop="8dp"
+                android:background="?attr/selectableItemBackground"
+                android:scaleType="center"
+                android:src="@drawable/ic_eye_black"
+                android:tint="?attr/colorAccent"
+                tools:contentDescription="@string/a11y_show_password" />
 
-        </LinearLayout>
+        </FrameLayout>
 
-    </androidx.core.widget.NestedScrollView>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/resetPasswordSubmit"
+            style="@style/Style.Vector.Login.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/login_reset_password_submit"
+            tools:ignore="RelativeOverlap" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index aaa54937a2..bffb9c11ef 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -1,63 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <ImageView style="@style/LoginLogo" />
 
-        <LinearLayout
-            style="@style/LoginContainer"
-            android:layout_width="match_parent"
+    <LinearLayout
+        style="@style/LoginFormContainer"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:text="@string/login_reset_password_success_title"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
 
-            <ImageView
-                android:id="@+id/logoImageView"
-                style="@style/LoginTopIcon"
-                android:layout_gravity="center_horizontal"
-                android:importantForAccessibility="no" />
+        <TextView
+            android:id="@+id/resetPasswordSuccessNotice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+            tools:text="@string/login_reset_password_success_notice" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="84dp"
-                android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:text="@string/login_reset_password_success_notice_2"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
 
-            <TextView
-                android:id="@+id/resetPasswordSuccessNotice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                tools:text="@string/login_reset_password_success_notice" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/resetPasswordSuccessSubmit"
+            style="@style/Style.Vector.Login.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:text="@string/login_reset_password_success_submit" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Style.Vector.Login.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_submit" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
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 a5b2c32084..d120aa3a75 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -1,200 +1,188 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <ImageView
+        style="@style/LoginLogo"
+        android:transitionName="loginLogoTransition" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/LoginContainer"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        style="@style/LoginFormContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/loginServerTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/login_server_title"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/loginServerText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:gravity="start"
+            android:text="@string/login_server_text"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
+
+        <im.vector.riotx.core.platform.CheckableConstraintLayout
+            android:id="@+id/loginServerChoiceMatrixOrg"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/bg_login_server_selector"
+            android:contentDescription="@string/login_a11y_choose_matrix_org"
+            android:minHeight="80dp"
+            android:paddingStart="@dimen/layout_horizontal_margin"
+            android:paddingEnd="@dimen/layout_horizontal_margin"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginServerText">
 
             <ImageView
-                android:id="@+id/loginServerLogo"
-                style="@style/LoginTopIcon"
+                android:id="@+id/loginServerChoiceMatrixOrgIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
-                android:transitionName="loginLogoTransition"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:src="@drawable/ic_logo_matrix_org"
+                app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
 
             <TextView
-                android:id="@+id/loginServerTitle"
+                android:id="@+id/loginServerChoiceMatrixOrgText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="84dp"
-                android:text="@string/login_server_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerLogo" />
-
-            <TextView
-                android:id="@+id/loginServerText"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
+                android:layout_marginTop="5dp"
                 android:gravity="start"
-                android:text="@string/login_server_text"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
-
-            <im.vector.riotx.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceMatrixOrg"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_matrix_org"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerText">
-
-                <ImageView
-                    android:id="@+id/loginServerChoiceMatrixOrgIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_logo_matrix_org"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceMatrixOrgText"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="start"
-                    android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" />
-
-            </im.vector.riotx.core.platform.CheckableConstraintLayout>
-
-            <im.vector.riotx.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceModular"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_modular"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="0dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
-
-                <ImageView
-                    android:id="@+id/loginServerChoiceModularIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_logo_modular"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceModularText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceModularText"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="7dp"
-                    android:gravity="start"
-                    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"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceModularIcon" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceModularLearnMore"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:padding="16dp"
-                    android:text="@string/login_server_modular_learn_more"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                    android:textColor="@color/riotx_accent"
-                    app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceModularText"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/loginServerChoiceModularText" />
-
-            </im.vector.riotx.core.platform.CheckableConstraintLayout>
-
-            <im.vector.riotx.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceOther"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_other"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceModular">
-
-                <TextView
-                    android:id="@+id/loginServerChoiceOtherTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:text="@string/login_server_other_title"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                    android:textColor="?riotx_text_primary"
-                    android:textSize="16sp"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceOtherText"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="start"
-                    android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" />
-
-            </im.vector.riotx.core.platform.CheckableConstraintLayout>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginServerSubmit"
-                style="@style/Style.Vector.Login.Button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:text="@string/login_continue"
+                android:text="@string/login_server_matrix_org_text"
+                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" />
+                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </im.vector.riotx.core.platform.CheckableConstraintLayout>
 
-    </androidx.core.widget.NestedScrollView>
+        <im.vector.riotx.core.platform.CheckableConstraintLayout
+            android:id="@+id/loginServerChoiceModular"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:background="@drawable/bg_login_server_selector"
+            android:contentDescription="@string/login_a11y_choose_modular"
+            android:minHeight="80dp"
+            android:paddingStart="@dimen/layout_horizontal_margin"
+            android:paddingEnd="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+            <ImageView
+                android:id="@+id/loginServerChoiceModularIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_logo_modular"
+                app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceModularText"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/loginServerChoiceModularText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="7dp"
+                android:gravity="start"
+                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"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceModularIcon" />
+
+            <TextView
+                android:id="@+id/loginServerChoiceModularLearnMore"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:text="@string/login_server_modular_learn_more"
+                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textColor="@color/riotx_accent"
+                app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceModularText"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/loginServerChoiceModularText" />
+
+        </im.vector.riotx.core.platform.CheckableConstraintLayout>
+
+        <im.vector.riotx.core.platform.CheckableConstraintLayout
+            android:id="@+id/loginServerChoiceOther"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:background="@drawable/bg_login_server_selector"
+            android:contentDescription="@string/login_a11y_choose_other"
+            android:minHeight="80dp"
+            android:paddingStart="@dimen/layout_horizontal_margin"
+            android:paddingEnd="@dimen/layout_horizontal_margin"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceModular">
+
+            <TextView
+                android:id="@+id/loginServerChoiceOtherTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:text="@string/login_server_other_title"
+                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textColor="?riotx_text_primary"
+                android:textSize="16sp"
+                app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/loginServerChoiceOtherText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:gravity="start"
+                android:text="@string/login_server_other_text"
+                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" />
+
+        </im.vector.riotx.core.platform.CheckableConstraintLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginServerSubmit"
+            style="@style/Style.Vector.Login.Button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/login_continue"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index a6bf98bbe4..a0476673e3 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -6,99 +6,82 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <ImageView style="@style/LoginLogo" />
 
-        <LinearLayout
-            style="@style/LoginContainer"
+    <LinearLayout
+        style="@style/LoginFormContainer"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/loginServerUrlFormIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_logo_modular" />
+
+        <TextView
+            android:id="@+id/loginServerUrlFormTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="27dp"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            tools:text="@string/login_connect_to_modular" />
+
+        <TextView
+            android:id="@+id/loginServerUrlFormText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:gravity="start"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            tools:text="@string/login_server_url_form_modular_text" />
+
+        <TextView
+            android:id="@+id/loginServerUrlFormLearnMore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/login_server_modular_learn_more"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textColor="@color/riotx_accent" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/loginServerUrlFormHomeServerUrlTil"
+            style="@style/VectorTextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginTop="26dp"
+            app:errorEnabled="true"
+            tools:hint="@string/login_server_url_form_modular_hint">
 
-            <ImageView
-                android:id="@+id/logoImageView"
-                style="@style/LoginTopIcon"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="130dp"
-                android:importantForAccessibility="no" />
-
-            <ImageView
-                android:id="@+id/loginServerUrlFormIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_logo_modular" />
-
-            <TextView
-                android:id="@+id/loginServerUrlFormTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="27dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                tools:text="@string/login_connect_to_modular" />
-
-            <TextView
-                android:id="@+id/loginServerUrlFormText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                tools:text="@string/login_server_url_form_modular_text" />
-
-            <TextView
-                android:id="@+id/loginServerUrlFormLearnMore"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:text="@string/login_server_modular_learn_more"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                android:textColor="@color/riotx_accent" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginServerUrlFormHomeServerUrlTil"
-                style="@style/VectorTextInputLayout"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/loginServerUrlFormHomeServerUrl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="26dp"
-                app:errorEnabled="true"
-                tools:hint="@string/login_server_url_form_modular_hint">
+                android:imeOptions="actionDone"
+                android:inputType="textUri"
+                android:maxLines="1" />
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginServerUrlFormHomeServerUrl"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionDone"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-            </com.google.android.material.textfield.TextInputLayout>
+        <TextView
+            android:id="@+id/loginServerUrlFormNotice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:gravity="start"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+            tools:text="@string/login_server_url_form_modular_notice" />
 
-            <TextView
-                android:id="@+id/loginServerUrlFormNotice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                tools:text="@string/login_server_url_form_modular_notice" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Style.Vector.Login.Button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="22dp"
-                android:text="@string/login_continue" />
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginServerUrlFormSubmit"
+            style="@style/Style.Vector.Login.Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginTop="22dp"
+            android:text="@string/login_continue" />
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index de9a7e403c..32bc445884 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -1,91 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <ImageView style="@style/LoginLogo" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/LoginContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        style="@style/LoginFormContainer"
+        android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/loginSignupSigninLogo"
-                style="@style/LoginTopIcon"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <ImageView
+            android:id="@+id/loginSignupSigninServerIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/ic_logo_matrix_org"
+            tools:visibility="visible" />
 
-            <ImageView
-                android:id="@+id/loginSignupSigninServerIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="172dp"
-                android:importantForAccessibility="no"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninLogo"
-                tools:src="@drawable/ic_logo_matrix_org"
-                tools:visibility="visible" />
+        <TextView
+            android:id="@+id/loginSignupSigninTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="27dp"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
+            app:layout_goneMarginTop="172dp"
+            tools:text="@string/login_connect_to" />
 
-            <TextView
-                android:id="@+id/loginSignupSigninTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="27dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
-                app:layout_goneMarginTop="172dp"
-                tools:text="@string/login_connect_to" />
+        <TextView
+            android:id="@+id/loginSignupSigninText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="27dp"
+            android:gravity="start"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle"
+            tools:text="@string/login_server_matrix_org_text" />
 
-            <TextView
-                android:id="@+id/loginSignupSigninText"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="27dp"
-                android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle"
-                tools:text="@string/login_server_matrix_org_text" />
+        <!-- Sign up or sign in SSO -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginSignupSigninSubmit"
+            style="@style/Style.Vector.Login.Button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="38dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninText"
+            tools:text="@string/login_signup" />
 
-            <!-- Sign up or sign in SSO -->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Style.Vector.Login.Button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="38dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninText"
-                tools:text="@string/login_signup" />
+        <!-- Sign in or gone -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginSignupSigninSignIn"
+            style="@style/Style.Vector.Login.Button.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="14dp"
+            android:text="@string/login_signin"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninSubmit"
+            tools:visibility="visible" />
 
-            <!-- Sign in or gone -->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginSignupSigninSignIn"
-                style="@style/Style.Vector.Login.Button.Outlined"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
-                android:text="@string/login_signin"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninSubmit"
-                tools:visibility="visible" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index e44139e18b..ecad15079c 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -2,52 +2,49 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/LoginContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/logoImageView"
-        style="@style/LoginTopIcon"
-        android:importantForAccessibility="no"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <ImageView style="@style/LoginLogo" />
 
-    <TextView
-        android:id="@+id/loginTermsTitle"
-        style="@style/TextAppearance.Vector.Login.Title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="27dp"
-        android:text="@string/login_terms_title"
-        app:layout_constraintTop_toBottomOf="@+id/logoImageView" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        style="@style/LoginFormContainer"
+        android:layout_height="0dp">
 
-    <TextView
-        android:id="@+id/loginTermsNotice"
-        style="@style/TextAppearance.Vector.Login.Text.Small"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:text="@string/auth_accept_policies"
-        app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
+        <TextView
+            android:id="@+id/loginTermsTitle"
+            style="@style/TextAppearance.Vector.Login.Title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/login_terms_title"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/loginTermsPolicyList"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginTermsSubmit"
-        app:layout_constraintTop_toBottomOf="@+id/loginTermsNotice"
-        tools:listitem="@layout/item_policy" />
+        <TextView
+            android:id="@+id/loginTermsNotice"
+            style="@style/TextAppearance.Vector.Login.Text.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/auth_accept_policies"
+            app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/loginTermsSubmit"
-        style="@style/Style.Vector.Login.Button"
-        android:text="@string/accept"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <com.airbnb.epoxy.EpoxyRecyclerView
+            android:id="@+id/loginTermsPolicyList"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toTopOf="@+id/loginTermsSubmit"
+            app:layout_constraintTop_toBottomOf="@+id/loginTermsNotice"
+            tools:listitem="@layout/item_policy" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginTermsSubmit"
+            style="@style/Style.Vector.Login.Button"
+            android:text="@string/accept"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/values-land/styles_login.xml b/vector/src/main/res/values-land/styles_login.xml
new file mode 100644
index 0000000000..29ddebedd2
--- /dev/null
+++ b/vector/src/main/res/values-land/styles_login.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- We will improve this later
+    <style name="LoginLogo" parent="LoginLogoBase">
+        <item name="layout_constraintEnd_toStartOf">@id/loginFormContainer</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="layout_constraintHorizontal_chainStyle">packed</item>
+    </style>
+
+    <style name="LoginFormContainer" parent="LoginFormContainerBase">
+        <item name="layout_constraintWidth_percent">0.6</item>
+        <item name="layout_constraintStart_toEndOf">@id/loginLogo</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+    </style>
+    -->
+
+</resources>
diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml
index 9e74e8abec..989b1615d9 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -8,10 +8,39 @@
         <item name="android:paddingEnd">36dp</item>
     </style>
 
-    <style name="LoginTopIcon">
+    <item name="loginLogo" type="id" />
+    <item name="loginFormContainer" type="id" />
+
+    <style name="LoginLogoBase">
+        <item name="android:id">@id/loginLogo</item>
         <item name="android:layout_width">60dp</item>
         <item name="android:layout_height">60dp</item>
         <item name="android:src">@drawable/riotx_logo</item>
+        <item name="android:importantForAccessibility">no</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+        <item name="layout_constraintStart_toStartOf">parent</item>
+    </style>
+
+    <style name="LoginLogo" parent="LoginLogoBase">
+        <item name="layout_constraintEnd_toEndOf">parent</item>
+        <item name="android:layout_marginTop">32dp</item>
+    </style>
+
+    <style name="LoginFormContainerBase">
+        <item name="android:id">@id/loginFormContainer</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+        <item name="android:paddingTop">32dp</item>
+        <item name="android:paddingBottom">32dp</item>
+        <item name="android:paddingStart">36dp</item>
+        <item name="android:paddingEnd">36dp</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="LoginFormContainer" parent="LoginFormContainerBase">
+        <item name="layout_constraintTop_toBottomOf">@id/loginLogo</item>
+        <item name="layout_constraintStart_toStartOf">parent</item>
     </style>
 
     <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">