diff --git a/android/res/layout-land/onmap_downloader.xml b/android/res/layout-land/onmap_downloader.xml
index 00120ac075..022971104d 100644
--- a/android/res/layout-land/onmap_downloader.xml
+++ b/android/res/layout-land/onmap_downloader.xml
@@ -20,7 +20,7 @@
     android:gravity="center"
     tools:ignore="UselessParent">
     <LinearLayout
-      android:layout_width="@dimen/square_block_size"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:orientation="vertical"
       android:clipToPadding="false"
@@ -31,10 +31,10 @@
         android:id="@+id/downloader_parent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_eighth"
+        android:layout_marginBottom="@dimen/margin_eighth"
         android:textAppearance="@style/MwmTextAppearance.Body2"
         android:gravity="center_horizontal"
-        tools:text="Honduras"/>
+        tools:text="Some country very loooooooooong country"/>
       <TextView
         android:id="@+id/downloader_title"
         android:layout_width="wrap_content"
@@ -43,7 +43,7 @@
         android:fontFamily="@string/robotoMedium"
         android:textStyle="normal"
         android:gravity="center_horizontal"
-        tools:text="Some title very loooooooooong title"
+        tools:text="Some name very loooooooooong name"
         tools:ignore="UnusedAttribute"/>
       <TextView
         android:id="@+id/downloader_size"
@@ -56,12 +56,13 @@
       <FrameLayout
         android:id="@+id/downloader_controls_frame"
         android:layout_width="180dp"
-        android:layout_height="@dimen/height_block_base"
+        android:layout_height="@dimen/downloader_status_size"
         android:clipChildren="false">
         <Button
           android:id="@+id/downloader_button"
           style="@style/MwmWidget.Button.Primary"
           android:layout_width="180dp"
+          android:layout_gravity="center"
           android:visibility="gone"
           tools:visibility="visible"/>
         <app.organicmaps.widget.WheelProgressView
diff --git a/android/res/layout/onmap_downloader.xml b/android/res/layout/onmap_downloader.xml
index 3e2a2625dc..b2e1331d5d 100644
--- a/android/res/layout/onmap_downloader.xml
+++ b/android/res/layout/onmap_downloader.xml
@@ -8,7 +8,7 @@
   android:visibility="gone"
   tools:visibility="visible">
   <LinearLayout
-    android:layout_width="wrap_content"
+    android:layout_width="212dp"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="@dimen/margin_base"
@@ -22,12 +22,12 @@
 
     <TextView
       android:id="@+id/downloader_parent"
-      android:layout_width="wrap_content"
+      android:layout_width="@dimen/square_block_size"
       android:layout_height="wrap_content"
-      android:layout_margin="@dimen/margin_eighth"
+      android:layout_marginBottom="@dimen/margin_eighth"
       android:textAppearance="@style/MwmTextAppearance.Body2"
       android:gravity="center_horizontal"
-      tools:text="Honduras"/>
+      tools:text="Some country very loooooooooong country"/>
     <TextView
       android:id="@+id/downloader_title"
       android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
       android:fontFamily="@string/robotoMedium"
       android:textStyle="normal"
       android:gravity="center_horizontal"
-      tools:text="Some title"
+      tools:text="Some name very loooooooooong name"
       tools:ignore="UnusedAttribute"/>
     <TextView
       android:id="@+id/downloader_size"
@@ -49,13 +49,15 @@
     <FrameLayout
       android:id="@+id/downloader_controls_frame"
       android:layout_width="180dp"
-      android:layout_height="@dimen/height_block_base"
+      android:layout_height="@dimen/downloader_status_size"
       android:clipChildren="false">
       <Button
         android:id="@+id/downloader_button"
         style="@style/MwmWidget.Button.Primary"
         android:layout_width="180dp"
-        android:visibility="gone"/>
+        android:layout_gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible"/>
       <app.organicmaps.widget.WheelProgressView
         android:id="@+id/wheel_downloader_progress"
         android:layout_width="@dimen/downloader_status_size"