diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index 9ecaf9855..a87084f66 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -13,12 +13,12 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/large_gap"
             android:layout_marginBottom="@dimen/standard_gap"
             android:layout_marginEnd="@dimen/standard_gap"
             android:layout_marginLeft="@dimen/standard_gap"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginStart="@dimen/standard_gap"
+            android:layout_marginTop="@dimen/large_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -40,11 +40,26 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/heading_text_size" />
 
+                <TextView
+                    android:id="@+id/login_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:paddingBottom="@dimen/standard_gap"
+                    android:paddingTop="@dimen/small_gap"
+                    android:textAlignment="center"
+                    android:textColor="@color/secondaryDarkColor"
+                    tools:text="@string/login_credential" />
+
                 <FrameLayout
                     android:id="@+id/error_message_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/title"
+                    android:layout_below="@id/login_credentials"
                     android:visibility="gone"
                     tools:visibility="visible">
 
@@ -56,6 +71,7 @@
                         android:layout_marginLeft="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:layout_marginStart="@dimen/standard_gap"
+                        android:gravity="center"
                         android:paddingBottom="@dimen/small_gap"
                         android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
@@ -149,8 +165,8 @@
 
                     <Button
                         android:id="@+id/signupButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginEnd="@dimen/small_gap"
@@ -160,8 +176,8 @@
 
                     <Button
                         android:id="@+id/loginButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/small_gap"
                         android:layout_marginStart="@dimen/small_gap"
@@ -174,13 +190,13 @@
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
-                    android:layout_below="@id/buttonFrame"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/about_privacy_policy"
-                    android:layout_centerHorizontal="true"/>
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/about_privacy_policy" />
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
@@ -188,19 +204,19 @@
         <android.support.v7.widget.AppCompatImageView
             android:layout_width="64dp"
             android:layout_height="64dp"
-            android:elevation="8dp"
-            tools:ignore="UnusedAttribute"
             android:layout_gravity="center_horizontal"
-            app:srcCompat="@drawable/blue_rinse_circle" />
+            android:elevation="8dp"
+            app:srcCompat="@drawable/blue_rinse_circle"
+            tools:ignore="UnusedAttribute" />
 
         <android.support.v7.widget.AppCompatImageView
             android:layout_width="42dp"
-            tools:ignore="UnusedAttribute"
             android:layout_height="42dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="8dp"
             android:elevation="8dp"
-            app:srcCompat="@drawable/commons_logo_large" />
+            app:srcCompat="@drawable/commons_logo_large"
+            tools:ignore="UnusedAttribute" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index 32cd47451..475963b44 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -13,12 +13,12 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/large_gap"
             android:layout_marginBottom="@dimen/standard_gap"
             android:layout_marginEnd="@dimen/standard_gap"
             android:layout_marginLeft="@dimen/standard_gap"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginStart="@dimen/standard_gap"
+            android:layout_marginTop="@dimen/large_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -40,6 +40,21 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/heading_text_size" />
 
+                <TextView
+                    android:id="@+id/login_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:paddingBottom="@dimen/small_gap"
+                    android:paddingTop="@dimen/small_gap"
+                    android:textAlignment="center"
+                    android:textColor="@color/secondaryDarkColor"
+                    tools:text="@string/login_credential" />
+
                 <FrameLayout
                     android:id="@+id/error_message_container"
                     android:layout_width="match_parent"
@@ -56,6 +71,7 @@
                         android:layout_marginLeft="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:layout_marginStart="@dimen/standard_gap"
+                        android:gravity="center"
                         android:paddingBottom="@dimen/small_gap"
                         android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
@@ -149,8 +165,8 @@
 
                     <Button
                         android:id="@+id/signupButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginEnd="@dimen/small_gap"
@@ -160,8 +176,8 @@
 
                     <Button
                         android:id="@+id/loginButton"
-                        android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/small_gap"
                         android:layout_marginStart="@dimen/small_gap"
@@ -174,13 +190,13 @@
                 <fr.free.nrw.commons.ui.widget.HtmlTextView
                     android:id="@+id/about_privacy_policy"
                     style="?android:textAppearanceSmall"
-                    android:layout_below="@id/buttonFrame"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/about_privacy_policy"
-                    android:layout_centerHorizontal="true"/>
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/about_privacy_policy" />
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
@@ -188,8 +204,8 @@
         <android.support.v7.widget.AppCompatImageView
             android:layout_width="64dp"
             android:layout_height="64dp"
-            android:elevation="8dp"
             android:layout_gravity="center_horizontal"
+            android:elevation="8dp"
             app:srcCompat="@drawable/blue_rinse_circle"
             tools:ignore="UnusedAttribute" />
 
@@ -198,9 +214,9 @@
             android:layout_height="42dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="8dp"
-            tools:ignore="UnusedAttribute"
             android:elevation="8dp"
-            app:srcCompat="@drawable/commons_logo_large" />
+            app:srcCompat="@drawable/commons_logo_large"
+            tools:ignore="UnusedAttribute" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1681d89f7..c9ac545cb 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -44,20 +44,20 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/heading_text_size" />
 
-                    <TextView
-                        android:id="@+id/login_credentials"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/title"
-                        android:layout_marginEnd="@dimen/standard_gap"
-                        android:layout_marginLeft="@dimen/standard_gap"
-                        android:layout_marginRight="@dimen/standard_gap"
-                        android:layout_marginStart="@dimen/standard_gap"
-                        android:paddingBottom="@dimen/small_gap"
-                        android:paddingTop="@dimen/small_gap"
-                        android:textAlignment="center"
-                        android:textColor="@color/secondaryDarkColor"
-                        tools:text="@string/login_credential"/>
+                <TextView
+                    android:id="@+id/login_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:paddingBottom="@dimen/small_gap"
+                    android:paddingTop="@dimen/small_gap"
+                    android:textAlignment="center"
+                    android:textColor="@color/secondaryDarkColor"
+                    tools:text="@string/login_credential" />
 
 
                 <FrameLayout
@@ -67,6 +67,7 @@
                     android:layout_below="@id/login_credentials"
                     android:visibility="gone"
                     tools:visibility="visible">
+
                     <TextView
                         android:id="@+id/error_message"
                         android:layout_width="match_parent"
@@ -75,6 +76,7 @@
                         android:layout_marginLeft="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:layout_marginStart="@dimen/standard_gap"
+                        android:gravity="center"
                         android:paddingBottom="@dimen/small_gap"
                         android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"