diff --git a/CHANGES.md b/CHANGES.md
index 64d041a14c..a4d1976a04 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - Add a setting to show timestamp for all messages (#2123)
  - Use cache for user color
  - Allow using an outdated homeserver, at user's risk (#1972)
+ - Restore small logo on login screens and fix scrolling issue on those screens
 
 Bugfix 🐛:
  - Long message cannot be sent/takes infinite time & blocks other messages #1397
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index cfe9316677..cc02625431 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/signedOut"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
-
-    <!-- Missing attributes are in the style -->
     <androidx.core.widget.NestedScrollView
         style="@style/LoginFormScrollView"
         tools:ignore="MissingConstraints">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+        <LinearLayout style="@style/LoginFormContainer">
+
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -47,5 +43,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index e79f1fac34..21b9b2c4a4 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:id="@+id/login_fragment"
@@ -7,19 +7,13 @@
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/loginServerIcon"
@@ -145,5 +139,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index 2f8a4f9b0d..f106660dde 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -1,27 +1,24 @@
 <?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"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
-
-    <!-- Missing attributes are in the style -->
     <!-- No scroll view in the screen, but use the style -->
     <LinearLayout
         style="@style/LoginFormScrollView"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         android:orientation="vertical"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
         android:paddingEnd="16dp"
-        android:paddingBottom="16dp"
-        tools:ignore="MissingConstraints">
+        android:paddingBottom="16dp">
+
+        <ImageView
+            style="@style/LoginLogo"
+            android:layout_marginBottom="8dp"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
@@ -41,16 +38,12 @@
 
     </LinearLayout>
 
-    <!-- Id is defined in the style -->
     <ProgressBar
         android:id="@+id/loginCaptchaProgress"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        app:layout_constraintBottom_toBottomOf="@id/loginFormScrollView"
-        app:layout_constraintEnd_toEndOf="@id/loginFormScrollView"
-        app:layout_constraintStart_toStartOf="@id/loginFormScrollView"
-        app:layout_constraintTop_toTopOf="@id/loginFormScrollView"
+        android:layout_gravity="center"
         tools:ignore="UnknownId,NotSibling" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
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 5421d5eac8..93b73b7063 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:id="@+id/login_fragment"
@@ -7,19 +7,13 @@
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
@@ -99,5 +93,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
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 1889701ddb..341435bdc4 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
@@ -108,5 +102,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index ec2ae5cda3..ef799c134b 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -53,5 +47,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
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 fc5aea3394..805f1c2c2c 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,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -53,5 +47,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
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 98725419bf..00fcfa9183 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints,UnusedAttribute" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/LoginFormContainer">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/LoginFormContainer"
-            android:paddingBottom="@dimen/layout_vertical_margin">
+            <ImageView
+                style="@style/LoginLogo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/loginServerTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="36dp"
                 android:text="@string/login_server_title"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Title"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toBottomOf="@id/loginLogo" />
 
             <TextView
                 android:id="@+id/loginServerText"
@@ -198,5 +196,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
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 0b84c33011..94f724b12a 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:id="@+id/login_fragment"
@@ -7,19 +7,13 @@
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <!-- Displayed only for EMS -->
             <ImageView
@@ -97,5 +91,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
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 00c77078b9..c0efe15074 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,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
-
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/LoginFormContainer">
 
+            <ImageView
+                style="@style/LoginLogo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="ContentDescription" />
+
             <ImageView
                 android:id="@+id/loginSignupSigninServerIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="36dp"
                 android:importantForAccessibility="no"
                 android:tint="?riotx_text_primary"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginLogo"
                 tools:src="@drawable/ic_logo_matrix_org"
                 tools:visibility="visible" />
 
@@ -84,5 +84,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index d32110ba8f..d093709d6d 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
-
-    <!-- Missing attributes are in the style -->
     <androidx.constraintlayout.widget.ConstraintLayout
         style="@style/LoginFormScrollView"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         tools:ignore="MissingConstraints">
 
+        <ImageView
+            style="@style/LoginLogo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/loginTermsTitle"
             style="@style/TextAppearance.Vector.Login.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="36dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/login_terms_title"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/loginLogo" />
 
         <TextView
             android:id="@+id/loginTermsNotice"
@@ -58,5 +59,5 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index 511e19ca43..1d904a93da 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/login_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background">
 
-    <!-- Missing attributes are in the style -->
-    <ImageView
-        style="@style/LoginLogo"
-        tools:ignore="ContentDescription,MissingConstraints" />
+    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
 
-    <!-- Missing attributes are in the style -->
-    <androidx.core.widget.NestedScrollView
-        style="@style/LoginFormScrollView"
-        tools:ignore="MissingConstraints">
+        <LinearLayout style="@style/LoginFormContainer">
 
-        <LinearLayout
-            style="@style/LoginFormContainer"
-            android:orientation="vertical">
+            <ImageView
+                style="@style/LoginLogo"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
@@ -48,5 +42,5 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 
diff --git a/vector/src/main/res/values-land/styles_login.xml b/vector/src/main/res/values-land/styles_login.xml
deleted file mode 100644
index 29ddebedd2..0000000000
--- a/vector/src/main/res/values-land/styles_login.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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 d31503759a..6dab3fac51 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -12,48 +12,36 @@
     <item name="loginFormScrollView" type="id" />
     <item name="loginFormContainer" type="id" />
 
-    <style name="LoginLogoBase">
+    <style name="LoginLogo">
         <item name="android:id">@id/loginLogo</item>
         <item name="android:layout_width">60dp</item>
         <item name="android:layout_height">60dp</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_marginBottom">36dp</item>
         <item name="android:src">@drawable/element_logo_green</item>
         <item name="android:transitionName">loginLogoTransition</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">48dp</item>
     </style>
 
     <style name="LoginFormContainer">
         <item name="android:id">@id/loginFormContainer</item>
+        <item name="android:paddingTop">36dp</item>
         <item name="android:paddingStart">36dp</item>
         <item name="android:paddingEnd">36dp</item>
+        <item name="android:orientation">vertical</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="LoginFormScrollViewBase">
+    <style name="LoginFormScrollView">
         <item name="android:id">@id/loginFormScrollView</item>
-        <item name="layout_constraintEnd_toEndOf">parent</item>
-        <item name="layout_constraintBottom_toBottomOf">parent</item>
-        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:paddingTop">32dp</item>
         <item name="android:paddingBottom">32dp</item>
     </style>
 
-    <style name="LoginFormScrollView" parent="LoginFormScrollViewBase">
-        <item name="layout_constraintTop_toBottomOf">@id/loginLogo</item>
-        <item name="layout_constraintStart_toStartOf">parent</item>
-        <item name="android:layout_height">0dp</item>
-        <item name="android:layout_marginTop">24dp</item>
-    </style>
-
     <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>