diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 7eef66272f..4c92a94b88 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -15,10 +15,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            style="@style/LoginContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp">
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/logoImageView"
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 8662b5b077..2fd9c21897 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -14,10 +14,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            style="@style/LoginContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp">
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/logoImageView"
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 b777250f8d..de55615296 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
@@ -14,10 +14,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            style="@style/LoginContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp">
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/logoImageView"
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 2d389e0a25..6fdac002df 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -9,12 +9,9 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            style="@style/LoginContainer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="36dp"
-            android:layout_marginBottom="32dp">
+            android:layout_height="match_parent">
 
             <ImageView
                 android:id="@+id/loginServerLogo"
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 5f6cc80072..abf6c8b30d 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
@@ -15,10 +15,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            style="@style/LoginContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp">
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/logoImageView"
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 3182818ca5..74f9c5e475 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
@@ -10,12 +10,9 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            style="@style/LoginContainer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="36dp"
-            android:layout_marginBottom="32dp">
+            android:layout_height="match_parent">
 
             <ImageView
                 android:id="@+id/loginSignupSigninLogo"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index b77493f6d1..f19e2e6603 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -5,9 +5,9 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        style="@style/LoginContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="36dp">
+        android:layout_height="match_parent">
 
         <ImageView
             android:id="@+id/loginSplashLogo"
diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml
index 81964377bd..1fe53de595 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <style name="LoginContainer">
+        <item name="android:paddingTop">32dp</item>
+        <item name="android:paddingBottom">32dp</item>
+        <item name="android:paddingStart">36dp</item>
+        <item name="android:paddingEnd">36dp</item>
+    </style>
+
     <style name="LoginTopIcon">
         <item name="android:layout_width">60dp</item>
         <item name="android:layout_height">60dp</item>
@@ -17,4 +24,4 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>