diff --git a/android/res/drawable/ic_openstreetmap_color.webp b/android/res/drawable/ic_openstreetmap_color.webp
new file mode 100644
index 0000000000..4ad65765a6
Binary files /dev/null and b/android/res/drawable/ic_openstreetmap_color.webp differ
diff --git a/android/res/layout-land/fragment_osm_login.xml b/android/res/layout-land/fragment_osm_login.xml
new file mode 100644
index 0000000000..84ea06ba57
--- /dev/null
+++ b/android/res/layout-land/fragment_osm_login.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  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:orientation="vertical">
+  <include
+    android:id="@+id/toolbar"
+    layout="@layout/toolbar_default" />
+  <ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?cardBackground"
+    android:fadeScrollbars="false"
+    android:fillViewport="true"
+    tools:ignore="DuplicateIds">
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:clipChildren="false"
+      android:clipToPadding="false"
+      android:orientation="vertical"
+      android:padding="@dimen/margin_base"
+      tools:ignore="ScrollViewSize">
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+          android:id="@+id/imageView"
+          android:layout_width="@dimen/login_osm_logo"
+          android:layout_height="@dimen/login_osm_logo"
+          android:layout_gravity="center"
+          android:src="@drawable/ic_openstreetmap_color"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+          android:id="@+id/textView"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/margin_base"
+          android:fontFamily="@string/robotoRegular"
+          android:text="@string/osm_presentation"
+          android:textAppearance="@style/MwmTextAppearance.Body2"
+          android:textColor="?android:textColorPrimary"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toEndOf="@+id/imageView"
+          app:layout_constraintTop_toTopOf="parent" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+      <TextView
+        android:id="@+id/textView2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_half"
+        android:autoLink="web"
+        android:fontFamily="@string/robotoMedium"
+        android:text="@string/login_to_make_edits_visible"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        android:textColor="?android:textColorPrimary" />
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_half">
+        <com.mapswithme.maps.widget.CustomTextInputLayout
+          android:id="@+id/osm_username_container"
+          style="@style/MwmWidget.Editor.CustomTextInput"
+          android:layout_width="0dp"
+          android:layout_marginEnd="@dimen/margin_half"
+          android:textColorHint="?android:textColorSecondary"
+          app:layout_constraintLeft_toLeftOf="parent"
+          app:layout_constraintRight_toLeftOf="@id/osm_password_container"
+          app:layout_constraintTop_toTopOf="parent">
+          <EditText
+            android:id="@+id/osm_username"
+            style="@style/MwmWidget.Editor.FieldLayout.EditText"
+            android:autofillHints="emailAddress"
+            android:hint="@string/email_or_username" />
+        </com.mapswithme.maps.widget.CustomTextInputLayout>
+        <com.mapswithme.maps.widget.CustomTextInputLayout
+          android:id="@+id/osm_password_container"
+          style="@style/MwmWidget.Editor.CustomTextInput"
+          android:layout_width="0dp"
+          android:textColorHint="?android:textColorSecondary"
+          app:layout_constraintLeft_toRightOf="@id/osm_username_container"
+          app:layout_constraintRight_toRightOf="parent"
+          app:layout_constraintTop_toTopOf="parent">
+          <EditText
+            android:id="@+id/osm_password"
+            style="@style/MwmWidget.Editor.FieldLayout.EditText"
+            android:autofillHints="password"
+            android:hint="@string/password"
+            android:inputType="textPassword" />
+        </com.mapswithme.maps.widget.CustomTextInputLayout>
+      </androidx.constraintlayout.widget.ConstraintLayout>
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_base">
+        <FrameLayout
+          android:id="@+id/login_container"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toEndOf="@id/lost_password"
+          app:layout_constraintTop_toTopOf="parent">
+          <Button
+            android:id="@+id/login"
+            style="@style/MwmWidget.Button.Accent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/login_osm"
+            android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
+          <ProgressBar
+            android:id="@+id/osm_login_progress"
+            android:layout_width="@dimen/editor_auth_btn_height"
+            android:layout_height="@dimen/editor_auth_btn_height"
+            android:layout_gravity="center"
+            android:elevation="@dimen/design_fab_elevation"
+            android:visibility="gone" />
+        </FrameLayout>
+        <Button
+          android:id="@+id/lost_password"
+          style="@style/MwmWidget.Button"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:background="?clickableBackground"
+          android:gravity="start|center_vertical"
+          android:padding="@dimen/margin_half"
+          android:text="@string/forgot_password"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toStartOf="@id/login_container"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+      <com.google.android.material.divider.MaterialDivider
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_base"
+        android:layout_marginBottom="@dimen/margin_base" />
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+          android:id="@+id/register_text"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoRegular"
+          android:gravity="start|center_vertical"
+          android:text="@string/no_osm_account"
+          android:textAppearance="@style/MwmTextAppearance.Body2"
+          android:textColor="?android:textColorPrimary"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toStartOf="@id/register"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+        <Button
+          android:id="@+id/register"
+          style="@style/MwmWidget.Button.Accent"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:background="@drawable/button_editor_light"
+          android:fontFamily="@string/robotoMedium"
+          android:padding="@dimen/margin_quarter"
+          android:text="@string/register_at_openstreetmap"
+          android:textAppearance="@style/MwmTextAppearance.Body2"
+          android:textColor="@color/text_dark"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toEndOf="@id/register_text"
+          app:layout_constraintTop_toTopOf="parent" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+  </ScrollView>
+</LinearLayout>
diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
index 89a337f6d5..819d3867eb 100644
--- a/android/res/layout/fragment_osm_login.xml
+++ b/android/res/layout/fragment_osm_login.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   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:orientation="vertical">
   <include
     android:id="@+id/toolbar"
-    layout="@layout/toolbar_default"/>
+    layout="@layout/toolbar_default" />
   <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?cardBackground"
+    android:fadeScrollbars="false"
     android:fillViewport="true"
     tools:ignore="DuplicateIds">
     <LinearLayout
@@ -22,24 +24,51 @@
       android:orientation="vertical"
       android:padding="@dimen/margin_base"
       tools:ignore="ScrollViewSize">
-
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+          android:id="@+id/imageView"
+          android:layout_width="@dimen/login_osm_logo"
+          android:layout_height="@dimen/login_osm_logo"
+          android:layout_gravity="center"
+          android:src="@drawable/ic_openstreetmap_color"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+          android:id="@+id/textView"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/margin_base"
+          android:fontFamily="@string/robotoRegular"
+          android:text="@string/osm_presentation"
+          android:textAppearance="@style/MwmTextAppearance.Body2"
+          android:textColor="?android:textColorPrimary"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toEndOf="@+id/imageView"
+          app:layout_constraintTop_toTopOf="parent" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
       <TextView
-        android:id="@+id/first_osm_edit"
+        android:id="@+id/textView2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_half"
+        android:autoLink="web"
         android:fontFamily="@string/robotoMedium"
         android:text="@string/login_to_make_edits_visible"
-        android:textColor="?android:textColorPrimary"
-        android:textAppearance="@style/MwmTextAppearance.Body2"/>
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        android:textColor="?android:textColorPrimary" />
       <com.mapswithme.maps.widget.CustomTextInputLayout
         style="@style/MwmWidget.Editor.CustomTextInput"
-        android:layout_marginTop="@dimen/margin_base"
+        android:layout_marginTop="@dimen/margin_half"
         android:textColorHint="?android:textColorSecondary">
         <EditText
           android:id="@+id/osm_username"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:hint="@string/email_or_username"
-          android:autofillHints="emailAddress" />
+          android:autofillHints="emailAddress"
+          android:hint="@string/email_or_username" />
       </com.mapswithme.maps.widget.CustomTextInputLayout>
       <com.mapswithme.maps.widget.CustomTextInputLayout
         style="@style/MwmWidget.Editor.CustomTextInput"
@@ -48,9 +77,9 @@
         <EditText
           android:id="@+id/osm_password"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
+          android:autofillHints="password"
           android:hint="@string/password"
-          android:inputType="textPassword"
-          android:autofillHints="password" />
+          android:inputType="textPassword" />
       </com.mapswithme.maps.widget.CustomTextInputLayout>
       <FrameLayout
         android:layout_width="match_parent"
@@ -61,7 +90,7 @@
           style="@style/MwmWidget.Button.Accent"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="@string/login"
+          android:text="@string/login_osm"
           android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
         <ProgressBar
           android:id="@+id/osm_login_progress"
@@ -69,19 +98,30 @@
           android:layout_height="@dimen/editor_auth_btn_height"
           android:layout_gravity="center"
           android:elevation="@dimen/design_fab_elevation"
-          android:visibility="gone"/>
+          android:visibility="gone" />
       </FrameLayout>
       <Button
         android:id="@+id/lost_password"
+        style="@style/MwmWidget.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/MwmWidget.Button"
         android:layout_gravity="end"
-        android:padding="@dimen/margin_half"
         android:background="?clickableBackground"
+        android:padding="@dimen/margin_half"
         android:text="@string/forgot_password"
         android:textAppearance="@style/MwmTextAppearance.Body3" />
-
+      <com.google.android.material.divider.MaterialDivider
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_base"
+        android:layout_marginBottom="@dimen/margin_base" />
+      <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="@string/robotoRegular"
+        android:text="@string/no_osm_account"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        android:textColor="?android:textColorPrimary" />
       <Button
         android:id="@+id/register"
         style="@style/MwmWidget.Button.Accent"
@@ -93,7 +133,7 @@
         android:padding="@dimen/margin_quarter"
         android:text="@string/register_at_openstreetmap"
         android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="@color/text_dark"/>
+        android:textColor="@color/text_dark" />
     </LinearLayout>
   </ScrollView>
 </LinearLayout>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index e5f4beebcc..c9c8d6c516 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -167,6 +167,9 @@
   <dimen name="editor_auth_btn_height">@dimen/primary_button_min_height</dimen>
   <dimen name="editor_margin_timetable_left">50dp</dimen>
 
+  <!-- Login -->
+  <dimen name="login_osm_logo">64dp</dimen>
+
   <!-- Altitude chart -->
   <dimen name="altitude_chart_container_padding_left">16dp</dimen>
   <dimen name="altitude_chart_container_padding_bottom">10dp</dimen>