diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 01464d2c5d..b3ec9cf183 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -173,7 +173,7 @@
         android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/>
 
     <activity
-        android:name="com.mapswithme.country.DownloadActivity"
+        android:name="com.mapswithme.maps.downloader.DownloaderActivity"
         android:configChanges="orientation|screenLayout|screenSize"
         android:label="@string/download_maps"
         android:parentActivityName="com.mapswithme.maps.MwmActivity">
diff --git a/android/res/layout-land/layout_turn_instructions.xml b/android/res/layout-land/layout_turn_instructions.xml
index ae313395d1..eca3cda478 100644
--- a/android/res/layout-land/layout_turn_instructions.xml
+++ b/android/res/layout-land/layout_turn_instructions.xml
@@ -23,8 +23,8 @@
 
   <ImageView
     android:id="@+id/btn__close"
-    android:layout_width="@dimen/base_block_size"
-    android:layout_height="@dimen/base_block_size"
+    android:layout_width="@dimen/height_block_base"
+    android:layout_height="@dimen/height_block_base"
     android:layout_centerVertical="true"
     android:layout_marginBottom="@dimen/margin_base_plus"
     android:layout_marginLeft="@dimen/margin_quarter"
diff --git a/android/res/layout-w840dp/layout_turn_instructions.xml b/android/res/layout-w840dp/layout_turn_instructions.xml
index bd67a26389..1741b43064 100644
--- a/android/res/layout-w840dp/layout_turn_instructions.xml
+++ b/android/res/layout-w840dp/layout_turn_instructions.xml
@@ -19,8 +19,8 @@
 
     <ImageView
         android:id="@+id/btn__close"
-        android:layout_width="@dimen/base_block_size"
-        android:layout_height="@dimen/base_block_size"
+        android:layout_width="@dimen/height_block_base"
+        android:layout_height="@dimen/height_block_base"
         android:layout_centerVertical="true"
         android:layout_marginRight="@dimen/margin_base"
         android:layout_weight="0"
diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml
index 7984b17a19..e477d5f564 100644
--- a/android/res/layout/fragment_editor.xml
+++ b/android/res/layout/fragment_editor.xml
@@ -43,7 +43,7 @@
         <TextView
           android:id="@+id/name_multilang"
           android:layout_width="match_parent"
-          android:layout_height="@dimen/base_block_size"
+          android:layout_height="@dimen/height_block_base"
           android:background="?clickableBackground"
           android:drawableEnd="@drawable/ic_arrow_down"
           android:drawableRight="@drawable/ic_arrow_down"
@@ -175,7 +175,7 @@
           style="@style/MwmWidget.Editor.FieldLayout"
           android:background="?clickableBackground"
           android:gravity="center_vertical"
-          android:minHeight="@dimen/base_block_size"
+          android:minHeight="@dimen/height_block_base"
           android:text="@string/edit_opening_hours"
           android:textAllCaps="true"
           android:textAppearance="@style/MwmTextAppearance.Body1"
diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
index c3d2f5082b..cf1f9f63e3 100644
--- a/android/res/layout/fragment_osm_login.xml
+++ b/android/res/layout/fragment_osm_login.xml
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
-        android:minHeight="@dimen/base_block_size">
+        android:minHeight="@dimen/height_block_base">
 
         <EditText
           android:id="@+id/osm_username"
@@ -48,7 +48,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
-        android:minHeight="@dimen/base_block_size">
+        android:minHeight="@dimen/height_block_base">
 
         <EditText
           android:id="@+id/osm_password"
diff --git a/android/res/layout/fragment_timetable.xml b/android/res/layout/fragment_timetable.xml
index 5e6925cbf7..6736d56f65 100644
--- a/android/res/layout/fragment_timetable.xml
+++ b/android/res/layout/fragment_timetable.xml
@@ -14,14 +14,14 @@
 
   <View
     android:layout_width="match_parent"
-    android:layout_height="@dimen/base_block_size"
+    android:layout_height="@dimen/height_block_base"
     android:layout_alignParentBottom="true"
     android:background="@android:color/white"/>
 
   <TextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/base_block_size"
+    android:layout_height="@dimen/height_block_base"
     android:layout_alignParentBottom="true"
     android:background="?clickableBackground"
     android:gravity="center_vertical"
diff --git a/android/res/layout/fragment_timetable_advanced.xml b/android/res/layout/fragment_timetable_advanced.xml
index 379169b683..2433432e34 100644
--- a/android/res/layout/fragment_timetable_advanced.xml
+++ b/android/res/layout/fragment_timetable_advanced.xml
@@ -51,7 +51,7 @@
         <TextView
           android:id="@+id/tv__examples_title"
           android:layout_width="match_parent"
-          android:layout_height="@dimen/base_block_size"
+          android:layout_height="@dimen/height_block_base"
           android:background="?clickableBackground"
           android:drawableEnd="@drawable/ic_expand_more"
           android:drawableLeft="@drawable/ic_type_text"
diff --git a/android/res/layout/fragment_timetable_picker.xml b/android/res/layout/fragment_timetable_picker.xml
index c10920a9e3..c704595b09 100644
--- a/android/res/layout/fragment_timetable_picker.xml
+++ b/android/res/layout/fragment_timetable_picker.xml
@@ -10,9 +10,9 @@
   <android.support.design.widget.TabLayout
     android:id="@+id/tabs"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/base_block_size"
-    android:background="@android:color/white"
+    android:layout_height="@dimen/height_block_base"
     android:elevation="@dimen/appbar_elevation"
+    android:background="@android:color/white"
     app:tabGravity="fill"
     app:tabIndicatorColor="?colorAccent"
     app:tabMode="fixed"
diff --git a/android/res/layout/item_bookmark_category_create.xml b/android/res/layout/item_bookmark_category_create.xml
index a9eac5003f..e7536e1219 100644
--- a/android/res/layout/item_bookmark_category_create.xml
+++ b/android/res/layout/item_bookmark_category_create.xml
@@ -2,7 +2,7 @@
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/base_block_size"
+    android:layout_height="@dimen/height_block_base"
     android:background="?clickableBackground"
     android:gravity="center_vertical|right"
     android:paddingLeft="@dimen/margin_base"
diff --git a/android/res/layout/item_opening_hours.xml b/android/res/layout/item_opening_hours.xml
index 076801ef71..50ac8d2ee4 100644
--- a/android/res/layout/item_opening_hours.xml
+++ b/android/res/layout/item_opening_hours.xml
@@ -7,7 +7,7 @@
   android:layout_height="wrap_content"
   android:background="?attr/clickableBackground"
   android:gravity="center_vertical"
-  android:minHeight="@dimen/base_block_size"
+  android:minHeight="@dimen/height_block_base"
   android:paddingEnd="@dimen/margin_base"
   android:paddingLeft="@dimen/margin_half"
   android:paddingRight="@dimen/margin_base"
diff --git a/android/res/layout/item_timetable_closed_hours.xml b/android/res/layout/item_timetable_closed_hours.xml
index 2edf7ad60c..e1d6fb728d 100644
--- a/android/res/layout/item_timetable_closed_hours.xml
+++ b/android/res/layout/item_timetable_closed_hours.xml
@@ -8,8 +8,8 @@
 
   <ImageView
     android:id="@+id/iv__remove_closed"
-    android:layout_width="@dimen/base_block_size"
-    android:layout_height="@dimen/base_block_size"
+    android:layout_width="@dimen/height_block_base"
+    android:layout_height="@dimen/height_block_base"
     android:layout_alignParentEnd="true"
     android:layout_alignParentRight="true"
     android:layout_centerVertical="true"
diff --git a/android/res/layout/layout_turn_instructions.xml b/android/res/layout/layout_turn_instructions.xml
index 0a7523780a..68e2dd6e4b 100644
--- a/android/res/layout/layout_turn_instructions.xml
+++ b/android/res/layout/layout_turn_instructions.xml
@@ -17,8 +17,8 @@
       android:padding="@dimen/margin_quarter">
     <ImageView
         android:id="@+id/btn__close"
-        android:layout_width="@dimen/base_block_size"
-        android:layout_height="@dimen/base_block_size"
+        android:layout_width="@dimen/height_block_base"
+        android:layout_height="@dimen/height_block_base"
         android:layout_weight="0"
         android:background="?selectableItemBackgroundBorderless"
         android:tint="?iconTint"
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 8c113e76f2..40c81762a4 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -25,11 +25,12 @@
   <dimen name="neg_margin_base">-16dp</dimen>
   <dimen name="neg_margin_double">-32dp</dimen>
 
-  <!-- margins -->
-
   <dimen name="margin_navigation_buttons">@dimen/margin_quarter</dimen>
 
-  <dimen name="base_block_size">48dp</dimen>
+  <!-- base sizes -->
+  <dimen name="height_block_base">48dp</dimen>
+  <dimen name="height_item_oneline">56dp</dimen>
+  <dimen name="height_item_edit_bookmark">72dp</dimen>
 
   <dimen name="dialog_max_height">320dp</dimen>
   <dimen name="search_item_height">56dp</dimen>
@@ -38,9 +39,7 @@
   <dimen name="place_page_width">360dp</dimen>
   <dimen name="place_page_buttons_height">56dp</dimen>
 
-  <dimen name="progress_wheel_width">48dp</dimen>
-  <dimen name="progress_wheel_height">40dp</dimen>
-  <dimen name="progress_wheel_width_neg">-48dp</dimen>
+  <dimen name="downloader_status_size">48dp</dimen>
   <dimen name="search_progress_size">32dp</dimen>
 
   <dimen name="panel_width">360dp</dimen>
@@ -52,9 +51,6 @@
   <dimen name="margin_direction_mid">24dp</dimen>
   <dimen name="margin_direction_around_center">40dp</dimen>
 
-  <dimen name="height_item_oneline">56dp</dimen>
-  <dimen name="height_item_edit_bookmark">72dp</dimen>
-
   <dimen name="zoom_buttons_top_required_space">266dp</dimen>
   <dimen name="zoom_buttons_bottom_max_space">228dp</dimen>
 
diff --git a/android/res/values/styles-place_page.xml b/android/res/values/styles-place_page.xml
index ce2df313eb..7c6a2bcfb2 100644
--- a/android/res/values/styles-place_page.xml
+++ b/android/res/values/styles-place_page.xml
@@ -67,7 +67,7 @@
   <style name="PlacePageMetadata">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:minHeight">@dimen/base_block_size</item>
+    <item name="android:minHeight">@dimen/height_block_base</item>
     <item name="android:background">?clickableBackground</item>
     <item name="android:orientation">horizontal</item>
     <item name="android:gravity">center_vertical</item>