diff --git a/android/res/drawable/bg_btn_zoom.xml b/android/res/drawable/bg_btn_zoom.xml
index c765e3bf67..e6b2173eee 100644
--- a/android/res/drawable/bg_btn_zoom.xml
+++ b/android/res/drawable/bg_btn_zoom.xml
@@ -9,5 +9,8 @@
   <item android:drawable="@drawable/btn_second_white_hover"
         android:state_hovered="true"/>
 
+  <item android:drawable="@drawable/btn_second_white_disable"
+        android:state_enabled="false"/>
+
   <item android:drawable="@drawable/btn_second_white_normal"/>
 </selector>
\ No newline at end of file
diff --git a/android/res/layout-land/activity_map.xml b/android/res/layout-land/activity_map.xml
index 75392ffb3e..dc035556f0 100644
--- a/android/res/layout-land/activity_map.xml
+++ b/android/res/layout-land/activity_map.xml
@@ -50,6 +50,6 @@
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
       android:layout_alignParentRight="true"
-      android:padding="@dimen/margin_small"/>
+      android:padding="@dimen/margin_quarter"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout-sw600dp-land/activity_map.xml b/android/res/layout-sw600dp-land/activity_map.xml
index e0c4808e29..3b7ce7c044 100644
--- a/android/res/layout-sw600dp-land/activity_map.xml
+++ b/android/res/layout-sw600dp-land/activity_map.xml
@@ -14,7 +14,7 @@
       android:layout_width="@dimen/panel_width"
       android:layout_height="@dimen/routing_pp_height"
       android:layout_below="@+id/toolbar_search"
-      android:layout_margin="@dimen/margin_medium">
+      android:layout_margin="@dimen/margin_base">
 
     <include layout="@layout/map_routing_full"/>
 
@@ -29,7 +29,7 @@
       android:layout_width="@dimen/panel_width"
       android:layout_height="wrap_content"
       android:layout_below="@+id/toolbar_search"
-      android:layout_margin="@dimen/margin_medium"
+      android:layout_margin="@dimen/margin_base"
       placePage:animationType="leftTop"/>
 
   <com.mapswithme.maps.widget.FadeView
@@ -43,14 +43,14 @@
       android:id="@+id/fragment_container"
       android:layout_width="@dimen/panel_width"
       android:layout_height="match_parent"
-      android:layout_margin="@dimen/margin_medium"/>
+      android:layout_margin="@dimen/margin_base"/>
 
   <include
       android:id="@+id/toolbar_search"
       layout="@layout/toolbar_with_search"
       android:layout_width="@dimen/panel_width"
       android:layout_height="?attr/actionBarSize"
-      android:layout_margin="@dimen/margin_medium"/>
+      android:layout_margin="@dimen/margin_base"/>
 
   <com.mapswithme.maps.widget.BottomButtonsLayout
       android:id="@+id/map_bottom_buttons"
@@ -58,6 +58,6 @@
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
       android:layout_alignParentRight="true"
-      android:padding="@dimen/margin_small"/>
+      android:padding="@dimen/margin_quarter"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout-sw600dp/activity_map.xml b/android/res/layout-sw600dp/activity_map.xml
index e04efd0d51..6f791cb8e0 100644
--- a/android/res/layout-sw600dp/activity_map.xml
+++ b/android/res/layout-sw600dp/activity_map.xml
@@ -15,14 +15,14 @@
       layout="@layout/toolbar_with_search"
       android:layout_width="@dimen/panel_width"
       android:layout_height="?attr/actionBarSize"
-      android:layout_margin="@dimen/margin_medium"/>
+      android:layout_margin="@dimen/margin_base"/>
 
   <FrameLayout
       android:id="@+id/fl__routing"
       android:layout_width="@dimen/panel_width"
       android:layout_height="@dimen/routing_pp_height"
       android:layout_below="@+id/toolbar_search"
-      android:layout_margin="@dimen/margin_medium">
+      android:layout_margin="@dimen/margin_base">
 
     <include layout="@layout/map_routing_full"/>
 
@@ -50,7 +50,7 @@
       android:id="@+id/fragment_container"
       android:layout_width="@dimen/panel_width"
       android:layout_height="match_parent"
-      android:layout_margin="@dimen/margin_medium"/>
+      android:layout_margin="@dimen/margin_base"/>
 
   <com.mapswithme.maps.widget.BottomButtonsLayout
       android:id="@+id/map_bottom_buttons"
@@ -58,5 +58,5 @@
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
       android:layout_alignParentRight="true"
-      android:padding="@dimen/margin_small"/>
+      android:padding="@dimen/margin_quarter"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout-sw600dp/download_item_placeholder.xml b/android/res/layout-sw600dp/download_item_placeholder.xml
index fc22832dc9..3178cc7ca8 100644
--- a/android/res/layout-sw600dp/download_item_placeholder.xml
+++ b/android/res/layout-sw600dp/download_item_placeholder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/margin_medium"
+      android:layout_height="@dimen/margin_base"
       android:background="@color/downloader_gray_bg"/>
diff --git a/android/res/layout-sw600dp/fragment_downloader.xml b/android/res/layout-sw600dp/fragment_downloader.xml
index cb8fd24d55..9e6c09fe57 100644
--- a/android/res/layout-sw600dp/fragment_downloader.xml
+++ b/android/res/layout-sw600dp/fragment_downloader.xml
@@ -20,7 +20,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:gravity="center_vertical"
-        android:padding="@dimen/margin_small"
+        android:padding="@dimen/margin_half"
         android:text="@string/downloader_update_all"
         android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
   </android.support.v7.widget.Toolbar>
diff --git a/android/res/layout-sw600dp/map_navigation_buttons.xml b/android/res/layout-sw600dp/map_navigation_buttons.xml
index 1081d9d40f..d59e94e64f 100644
--- a/android/res/layout-sw600dp/map_navigation_buttons.xml
+++ b/android/res/layout-sw600dp/map_navigation_buttons.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/margin_small">
+    android:padding="@dimen/margin_half">
 
   <ImageButton
       android:id="@+id/btn__myposition"
@@ -15,7 +15,7 @@
       android:id="@+id/yop_it"
       style="@style/MwmWidget.MapButton.Zoom"
       android:layout_alignParentRight="true"
-      android:layout_marginRight="@dimen/margin_tiny"
+      android:layout_marginRight="@dimen/margin_quarter"
       android:src="@drawable/ic_btn_yota_ptb"/>
 
   <android.support.v4.widget.Space
diff --git a/android/res/layout-sw600dp/map_turn_instructions.xml b/android/res/layout-sw600dp/map_turn_instructions.xml
index 21259b1425..3eee3f6051 100644
--- a/android/res/layout-sw600dp/map_turn_instructions.xml
+++ b/android/res/layout-sw600dp/map_turn_instructions.xml
@@ -11,7 +11,7 @@
       style="@style/TextAppearance.AppCompat.Large"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_medium"/>
+      android:layout_marginLeft="@dimen/margin_base"/>
 
   <TextView
       android:id="@+id/tv__total_time"
diff --git a/android/res/layout-sw600dp/place_page_details.xml b/android/res/layout-sw600dp/place_page_details.xml
index ff3c5f7421..7e4272ec10 100644
--- a/android/res/layout-sw600dp/place_page_details.xml
+++ b/android/res/layout-sw600dp/place_page_details.xml
@@ -11,8 +11,8 @@
       android:layout_height="wrap_content"
       android:clipChildren="false"
       android:orientation="vertical"
-      android:paddingLeft="@dimen/margin_medium_and_half"
-      android:paddingRight="@dimen/margin_medium_and_half">
+      android:paddingLeft="@dimen/margin_base_plus"
+      android:paddingRight="@dimen/margin_base_plus">
 
     <View
         android:layout_width="match_parent"
@@ -23,16 +23,16 @@
         android:id="@+id/rl__details_attrs"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_small">
+        android:paddingBottom="@dimen/margin_half"
+        android:paddingTop="@dimen/margin_half">
 
       <View
           android:id="@+id/anchor_center"
           android:layout_width="0px"
           android:layout_height="match_parent"
           android:layout_centerHorizontal="true"
-          android:layout_marginLeft="@dimen/margin_medium"
-          android:layout_marginRight="@dimen/margin_medium"/>
+          android:layout_marginLeft="@dimen/margin_base"
+          android:layout_marginRight="@dimen/margin_base"/>
 
       <LinearLayout
           android:id="@+id/ll__details_left"
diff --git a/android/res/layout-sw720dp/activity_map.xml b/android/res/layout-sw720dp/activity_map.xml
index 39ab64141b..851c6f6e84 100644
--- a/android/res/layout-sw720dp/activity_map.xml
+++ b/android/res/layout-sw720dp/activity_map.xml
@@ -14,7 +14,7 @@
       android:layout_width="@dimen/panel_width"
       android:layout_height="@dimen/routing_pp_height"
       android:layout_below="@+id/toolbar_search"
-      android:layout_margin="@dimen/margin_medium">
+      android:layout_margin="@dimen/margin_base">
 
     <include layout="@layout/map_routing_full"/>
 
@@ -28,7 +28,7 @@
       android:id="@+id/info_box"
       android:layout_width="@dimen/panel_width"
       android:layout_height="wrap_content"
-      android:layout_margin="@dimen/margin_medium"
+      android:layout_margin="@dimen/margin_base"
       placePage:animationType="leftTop"/>
 
   <com.mapswithme.maps.widget.FadeView
@@ -42,14 +42,14 @@
       android:id="@+id/fragment_container"
       android:layout_width="@dimen/panel_width"
       android:layout_height="match_parent"
-      android:layout_margin="@dimen/margin_medium"/>
+      android:layout_margin="@dimen/margin_base"/>
 
   <include
       android:id="@+id/toolbar_search"
       layout="@layout/toolbar_with_search"
       android:layout_width="@dimen/panel_width"
       android:layout_height="?attr/actionBarSize"
-      android:layout_margin="@dimen/margin_medium"/>
+      android:layout_margin="@dimen/margin_base"/>
 
   <com.mapswithme.maps.widget.BottomButtonsLayout
       android:id="@+id/map_bottom_buttons"
@@ -57,6 +57,6 @@
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
       android:layout_alignParentRight="true"
-      android:padding="@dimen/margin_small"/>
+      android:padding="@dimen/margin_quarter"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
index 469472c99c..45929d76e2 100644
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@@ -57,5 +57,5 @@
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
       android:layout_alignParentRight="true"
-      android:padding="@dimen/margin_small"/>
+      android:padding="@dimen/margin_quarter"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/color_row.xml b/android/res/layout/color_row.xml
index 023c2d0332..0633114782 100644
--- a/android/res/layout/color_row.xml
+++ b/android/res/layout/color_row.xml
@@ -3,7 +3,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/clickableBackground"
-                android:padding="@dimen/margin_small_and_half">
+                android:padding="@dimen/margin_half_plus">
 
   <ImageView
       android:id="@+id/iv__color"
diff --git a/android/res/layout/dialog_edit_text.xml b/android/res/layout/dialog_edit_text.xml
index 9d2d3697fe..66a93ead43 100644
--- a/android/res/layout/dialog_edit_text.xml
+++ b/android/res/layout/dialog_edit_text.xml
@@ -2,12 +2,12 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:orientation="vertical"
-              android:padding="@dimen/margin_medium_and_half">
+              android:padding="@dimen/margin_base_plus">
   <TextView
       android:id="@+id/tv__title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_medium"
+      android:layout_marginBottom="@dimen/margin_base"
       android:textAppearance="@style/MwmTextAppearance.Title"/>
 
   <com.mapswithme.maps.widget.CustomTextInputLayout
diff --git a/android/res/layout/download_item_country.xml b/android/res/layout/download_item_country.xml
index 066aade998..19efeb0582 100644
--- a/android/res/layout/download_item_country.xml
+++ b/android/res/layout/download_item_country.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="?attr/clickableBackground"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="@dimen/margin_small">
+    android:paddingLeft="@dimen/margin_half">
 
   <TextView
       android:id="@+id/title"
@@ -14,7 +14,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentLeft="true"
       android:layout_centerVertical="true"
-      android:layout_marginLeft="@dimen/margin_small"
+      android:layout_marginLeft="@dimen/margin_half"
       android:layout_toLeftOf="@+id/ll__info_slided"
       android:maxLines="2"
       android:textAppearance="@style/MwmTextAppearance.Body1"/>
@@ -26,11 +26,11 @@
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
       android:layout_marginRight="@dimen/progress_wheel_width_neg"
-      android:paddingLeft="@dimen/margin_tiny"
-      android:paddingRight="@dimen/margin_tiny"
+      android:paddingLeft="@dimen/margin_quarter"
+      android:paddingRight="@dimen/margin_quarter"
       wheel:progressColor="@color/downloader_blue"
       wheel:secondaryColor="@color/downloader_progress_bg"
-      wheel:wheelThickness="@dimen/margin_micro"/>
+      wheel:wheelThickness="@dimen/margin_eighth"/>
 
   <ImageView
       android:id="@+id/iv__routing_status_slided"
@@ -47,11 +47,11 @@
       android:layout_height="@dimen/progress_wheel_height"
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
-      android:paddingLeft="@dimen/margin_tiny"
-      android:paddingRight="@dimen/margin_tiny"
+      android:paddingLeft="@dimen/margin_quarter"
+      android:paddingRight="@dimen/margin_quarter"
       wheel:progressColor="@color/downloader_blue"
       wheel:secondaryColor="@color/downloader_progress_bg"
-      wheel:wheelThickness="@dimen/margin_micro"/>
+      wheel:wheelThickness="@dimen/margin_eighth"/>
 
   <LinearLayout
       android:id="@+id/ll__info"
@@ -59,7 +59,7 @@
       android:layout_height="match_parent"
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
-      android:layout_marginRight="@dimen/margin_small"
+      android:layout_marginRight="@dimen/margin_half"
       android:gravity="right"
       android:minWidth="60dp"
       android:orientation="vertical">
diff --git a/android/res/layout/download_item_dialog.xml b/android/res/layout/download_item_dialog.xml
index 3be5d9f88d..9164247a3a 100644
--- a/android/res/layout/download_item_dialog.xml
+++ b/android/res/layout/download_item_dialog.xml
@@ -21,8 +21,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/divider_top"
-        android:layout_marginLeft="@dimen/margin_medium_and_half"
-        android:layout_marginRight="@dimen/margin_medium_and_half"
+        android:layout_marginLeft="@dimen/margin_base_plus"
+        android:layout_marginRight="@dimen/margin_base_plus"
         android:gravity="center_vertical"
         android:minHeight="60dp"
         android:orientation="horizontal">
diff --git a/android/res/layout/download_item_extended.xml b/android/res/layout/download_item_extended.xml
index b2529e4cec..9b74a88851 100644
--- a/android/res/layout/download_item_extended.xml
+++ b/android/res/layout/download_item_extended.xml
@@ -9,8 +9,8 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_centerVertical="true"
-      android:layout_marginLeft="@dimen/margin_medium"
-      android:layout_marginRight="@dimen/margin_medium"
+      android:layout_marginLeft="@dimen/margin_base"
+      android:layout_marginRight="@dimen/margin_base"
       android:text="@string/downloader_downloaded"
       android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
diff --git a/android/res/layout/download_item_group.xml b/android/res/layout/download_item_group.xml
index ae965ddae5..cf2d777560 100644
--- a/android/res/layout/download_item_group.xml
+++ b/android/res/layout/download_item_group.xml
@@ -10,7 +10,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_centerVertical="true"
-      android:layout_marginLeft="@dimen/margin_medium"
+      android:layout_marginLeft="@dimen/margin_base"
       android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/download_item_placeholder.xml b/android/res/layout/download_item_placeholder.xml
index fc22832dc9..3178cc7ca8 100644
--- a/android/res/layout/download_item_placeholder.xml
+++ b/android/res/layout/download_item_placeholder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/margin_medium"
+      android:layout_height="@dimen/margin_base"
       android:background="@color/downloader_gray_bg"/>
diff --git a/android/res/layout/download_item_updated.xml b/android/res/layout/download_item_updated.xml
index 8306685172..b0c267ab9d 100644
--- a/android/res/layout/download_item_updated.xml
+++ b/android/res/layout/download_item_updated.xml
@@ -5,6 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="40dp"
     android:background="@color/downloader_gray_bg"
-    android:paddingLeft="@dimen/margin_medium"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_half"
     android:textAppearance="@style/MwmTextAppearance.Body3"/>
\ No newline at end of file
diff --git a/android/res/layout/edit_bookmark_common.xml b/android/res/layout/edit_bookmark_common.xml
index 11d471f9ac..3385fa7a43 100644
--- a/android/res/layout/edit_bookmark_common.xml
+++ b/android/res/layout/edit_bookmark_common.xml
@@ -4,14 +4,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/margin_small">
+    android:padding="@dimen/margin_half">
 
   <LinearLayout
       android:id="@+id/ll__bookmark_name"
       android:layout_width="match_parent"
       android:layout_height="@dimen/height_item_edit_bookmark"
-      android:layout_marginLeft="@dimen/margin_small"
-      android:layout_marginRight="@dimen/margin_small"
+      android:layout_marginLeft="@dimen/margin_half"
+      android:layout_marginRight="@dimen/margin_half"
       android:orientation="vertical">
 
     <com.mapswithme.maps.widget.CustomTextInputLayout
@@ -36,15 +36,15 @@
       android:layout_width="match_parent"
       android:layout_height="@dimen/height_item_edit_bookmark"
       android:layout_below="@id/ll__bookmark_name"
-      android:layout_marginLeft="@dimen/margin_small_and_half"
-      android:layout_marginTop="@dimen/margin_small">
+      android:layout_marginLeft="@dimen/margin_half_plus"
+      android:layout_marginTop="@dimen/margin_half">
 
     <TextView
         android:id="@+id/tv__bookmark_set_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/margin_extra_large"
-        android:layout_marginTop="@dimen/margin_medium"
+        android:layout_marginRight="@dimen/margin_quadruple"
+        android:layout_marginTop="@dimen/margin_base"
         android:text="@string/set"
         android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
@@ -54,20 +54,20 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/tv__bookmark_set_title"
         android:layout_centerVertical="true"
-        android:layout_marginRight="@dimen/margin_extra_large"
+        android:layout_marginRight="@dimen/margin_quadruple"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:drawableRight="@drawable/ic_arrow_down"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_tiny_and_half"
+        android:paddingBottom="@dimen/margin_half"
+        android:paddingTop="@dimen/margin_quarter_plus"
         android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/margin_small"
-        android:layout_marginRight="@dimen/margin_extra_large"
+        android:layout_marginBottom="@dimen/margin_half"
+        android:layout_marginRight="@dimen/margin_quadruple"
         android:background="@color/base_black_divider"/>
 
     <ImageView
@@ -77,7 +77,7 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:background="?attr/clickableBackground"
-        android:padding="@dimen/margin_small"
+        android:padding="@dimen/margin_half"
         android:src="@drawable/color_picker_red_on"/>
   </RelativeLayout>
 
@@ -85,9 +85,9 @@
       android:layout_width="match_parent"
       android:layout_height="@dimen/height_item_edit_bookmark"
       android:layout_below="@id/rl__bookmark_set"
-      android:layout_margin="@dimen/margin_small"
+      android:layout_margin="@dimen/margin_half"
       android:orientation="vertical"
-      android:paddingTop="@dimen/margin_medium">
+      android:paddingTop="@dimen/margin_base">
 
     <com.mapswithme.maps.widget.CustomTextInputLayout
         android:layout_width="match_parent"
diff --git a/android/res/layout/fragment_app_invites_dialog.xml b/android/res/layout/fragment_app_invites_dialog.xml
index 27d67ddc7f..672f74400a 100644
--- a/android/res/layout/fragment_app_invites_dialog.xml
+++ b/android/res/layout/fragment_app_invites_dialog.xml
@@ -14,7 +14,7 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_medium_and_half"
+        android:layout_margin="@dimen/margin_base_plus"
         android:contentDescription="@null"
         android:src="@drawable/img_smile"/>
 
@@ -22,9 +22,9 @@
         android:id="@+id/tv__title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/margin_medium"
-        android:layout_marginLeft="@dimen/margin_medium_and_half"
-        android:layout_marginRight="@dimen/margin_medium_and_half"
+        android:layout_marginBottom="@dimen/margin_base"
+        android:layout_marginLeft="@dimen/margin_base_plus"
+        android:layout_marginRight="@dimen/margin_base_plus"
         android:text="@string/rating_do_like_maps"
         android:textAppearance="@style/MwmTextAppearance.Title.Light"
         android:textStyle="bold"/>
@@ -34,10 +34,10 @@
       android:id="@+id/tv__subtitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_medium_and_half"
-      android:layout_marginLeft="@dimen/margin_medium_and_half"
-      android:layout_marginRight="@dimen/margin_medium_and_half"
-      android:layout_marginTop="@dimen/margin_medium"
+      android:layout_marginBottom="@dimen/margin_base_plus"
+      android:layout_marginLeft="@dimen/margin_base_plus"
+      android:layout_marginRight="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_base"
       android:text="@string/rating_tap_star"
       android:textAppearance="@style/MwmTextAppearance.Body2"/>
 
diff --git a/android/res/layout/fragment_color_grid.xml b/android/res/layout/fragment_color_grid.xml
index 2de2931de4..46308b5cca 100644
--- a/android/res/layout/fragment_color_grid.xml
+++ b/android/res/layout/fragment_color_grid.xml
@@ -3,6 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingTop="@dimen/margin_half"
     android:gravity="center"
     android:numColumns="4"/>
diff --git a/android/res/layout/fragment_direction.xml b/android/res/layout/fragment_direction.xml
index 3bed9ce2af..614c74de35 100644
--- a/android/res/layout/fragment_direction.xml
+++ b/android/res/layout/fragment_direction.xml
@@ -32,8 +32,8 @@
         android:layout_below="@id/tv__title"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/margin_direction_small"
-        android:layout_marginLeft="@dimen/margin_medium_and_half"
-        android:layout_marginRight="@dimen/margin_medium_and_half"
+        android:layout_marginLeft="@dimen/margin_base_plus"
+        android:layout_marginRight="@dimen/margin_base_plus"
         android:textColor="@color/semitransparent_white"
         android:textSize="@dimen/text_direction_subtitle"/>
 
diff --git a/android/res/layout/fragment_downloader.xml b/android/res/layout/fragment_downloader.xml
index ddadc6ddfd..2aee12aadd 100644
--- a/android/res/layout/fragment_downloader.xml
+++ b/android/res/layout/fragment_downloader.xml
@@ -18,7 +18,7 @@
         android:layout_gravity="right"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:gravity="center_vertical"
-        android:padding="@dimen/margin_small"
+        android:padding="@dimen/margin_half"
         android:text="@string/downloader_update_all"
         android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
   </android.support.v7.widget.Toolbar>
diff --git a/android/res/layout/fragment_edit_bookmark.xml b/android/res/layout/fragment_edit_bookmark.xml
index 97f6efceb1..ae4d262f4a 100644
--- a/android/res/layout/fragment_edit_bookmark.xml
+++ b/android/res/layout/fragment_edit_bookmark.xml
@@ -19,7 +19,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:gravity="center_vertical"
-        android:padding="@dimen/margin_small"
+        android:padding="@dimen/margin_half"
         android:text="@string/save"
         android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
   </android.support.v7.widget.Toolbar>
diff --git a/android/res/layout/fragment_edit_description.xml b/android/res/layout/fragment_edit_description.xml
index 93e541c7c2..182fbbe7de 100644
--- a/android/res/layout/fragment_edit_description.xml
+++ b/android/res/layout/fragment_edit_description.xml
@@ -19,7 +19,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:gravity="center_vertical"
-        android:padding="@dimen/margin_small"
+        android:padding="@dimen/margin_half"
         android:text="@string/save"
         android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
   </android.support.v7.widget.Toolbar>
@@ -29,8 +29,8 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_below="@id/toolbar"
-      android:paddingLeft="@dimen/margin_medium"
-      android:paddingRight="@dimen/margin_medium">
+      android:paddingLeft="@dimen/margin_base"
+      android:paddingRight="@dimen/margin_base">
 
     <EditText
         android:id="@+id/et__description"
diff --git a/android/res/layout/fragment_google_play_dialog.xml b/android/res/layout/fragment_google_play_dialog.xml
index 33d4224dc4..f17cccc896 100644
--- a/android/res/layout/fragment_google_play_dialog.xml
+++ b/android/res/layout/fragment_google_play_dialog.xml
@@ -8,10 +8,10 @@
       android:id="@+id/tv__title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_small"
-      android:layout_marginLeft="@dimen/margin_medium_and_half"
-      android:layout_marginRight="@dimen/margin_medium_and_half"
-      android:layout_marginTop="@dimen/margin_medium_and_half"
+      android:layout_marginBottom="@dimen/margin_half"
+      android:layout_marginLeft="@dimen/margin_base_plus"
+      android:layout_marginRight="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_base_plus"
       android:fontFamily="@string/robotoMedium"
       android:text="@string/rating_do_like_maps"
       android:textColor="@color/text_dark"
@@ -22,9 +22,9 @@
       android:id="@+id/tv__subtitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_medium_and_half"
-      android:layout_marginLeft="@dimen/margin_medium_and_half"
-      android:layout_marginRight="@dimen/margin_medium_and_half"
+      android:layout_marginBottom="@dimen/margin_base_plus"
+      android:layout_marginLeft="@dimen/margin_base_plus"
+      android:layout_marginRight="@dimen/margin_base_plus"
       android:fontFamily="@string/robotoRegular"
       android:text="@string/rating_tap_star"
       android:textColor="@color/text_dark_subtitle"
@@ -59,7 +59,7 @@
         android:drawableLeft="@drawable/ic_rate_send"
         android:fontFamily="@string/robotoRegular"
         android:gravity="center_vertical"
-        android:padding="@dimen/margin_medium"
+        android:padding="@dimen/margin_base"
         android:text="@string/rating_send_feedback"
         android:textColor="@color/text_dark"
         android:visibility="gone"/>
diff --git a/android/res/layout/fragment_google_plus_dialog.xml b/android/res/layout/fragment_google_plus_dialog.xml
index 09a3ed479a..1be9412d68 100644
--- a/android/res/layout/fragment_google_plus_dialog.xml
+++ b/android/res/layout/fragment_google_plus_dialog.xml
@@ -9,7 +9,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      android:padding="@dimen/margin_medium"
+      android:padding="@dimen/margin_base"
       android:src="@drawable/ic_launcher"/>
 
   <TextView
@@ -18,14 +18,14 @@
       android:textSize="20sp"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      android:padding="@dimen/margin_small"
+      android:padding="@dimen/margin_half"
       android:text="@string/rating_do_like_maps"/>
 
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:fontFamily="@string/robotoLight"
-      android:padding="@dimen/margin_small"
+      android:padding="@dimen/margin_half"
       android:textSize="14sp"
       android:text="@string/rating_google_plus"/>
 
@@ -39,7 +39,7 @@
       xmlns:plus="http://schemas.android.com/apk/lib/com.google.android.gms.plus"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_margin="@dimen/margin_small"
+      android:layout_margin="@dimen/margin_half"
       plus:annotation="inline"
       plus:size="normal"/>
 
diff --git a/android/res/layout/item_bookmark.xml b/android/res/layout/item_bookmark.xml
index 3d8d4029b6..a82c5ff6bb 100644
--- a/android/res/layout/item_bookmark.xml
+++ b/android/res/layout/item_bookmark.xml
@@ -9,8 +9,8 @@
       android:layout_height="wrap_content"
       android:layout_alignParentLeft="true"
       android:layout_centerVertical="true"
-      android:layout_marginLeft="@dimen/margin_medium"
-      android:layout_marginRight="@dimen/margin_medium"/>
+      android:layout_marginLeft="@dimen/margin_base"
+      android:layout_marginRight="@dimen/margin_base"/>
 
   <TextView
       android:id="@+id/tv__bookmark_name"
@@ -28,7 +28,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
-      android:layout_marginRight="@dimen/margin_medium"
+      android:layout_marginRight="@dimen/margin_base"
       android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/item_bookmark_category.xml b/android/res/layout/item_bookmark_category.xml
index 2c45b77140..ee6bed865a 100644
--- a/android/res/layout/item_bookmark_category.xml
+++ b/android/res/layout/item_bookmark_category.xml
@@ -4,8 +4,8 @@
               android:layout_height="wrap_content"
               android:gravity="center_vertical"
               android:minHeight="@dimen/height_item_oneline"
-              android:paddingLeft="@dimen/margin_medium"
-              android:paddingRight="@dimen/margin_medium">
+              android:paddingLeft="@dimen/margin_base"
+              android:paddingRight="@dimen/margin_base">
 
   <CheckBox
       android:id="@+id/chb__set_visible"
@@ -20,7 +20,7 @@
       android:id="@+id/tv__set_name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_medium"
+      android:layout_marginLeft="@dimen/margin_base"
       android:layout_weight="1"
       android:ellipsize="marquee"
       android:singleLine="true"
diff --git a/android/res/layout/item_bookmark_hint.xml b/android/res/layout/item_bookmark_hint.xml
index e6ed927259..dc3c58d564 100644
--- a/android/res/layout/item_bookmark_hint.xml
+++ b/android/res/layout/item_bookmark_hint.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:paddingBottom="@dimen/dp_x_3"
-    android:paddingLeft="@dimen/dp_x_8"
-    android:paddingRight="@dimen/dp_x_8"
-    android:paddingTop="@dimen/dp_x_3"
+    android:paddingBottom="@dimen/margin_base"
+    android:paddingLeft="@dimen/margin_double_plus"
+    android:paddingRight="@dimen/margin_double_plus"
+    android:paddingTop="@dimen/margin_base"
     android:text="@string/bookmarks_usage_hint"
     android:textAppearance="@style/MwmTextAppearance.Body2"/>
diff --git a/android/res/layout/item_bookmark_set_chooser.xml b/android/res/layout/item_bookmark_set_chooser.xml
index 0544b3b3bd..2ecd7a6c57 100644
--- a/android/res/layout/item_bookmark_set_chooser.xml
+++ b/android/res/layout/item_bookmark_set_chooser.xml
@@ -5,8 +5,8 @@
     android:layout_height="48dp"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/margin_medium"
-    android:paddingRight="@dimen/margin_medium">
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base">
 
   <TextView
       android:id="@+id/tv__set_name"
diff --git a/android/res/layout/item_bookmark_set_create.xml b/android/res/layout/item_bookmark_set_create.xml
index 8bd7cfdfa2..d01d623a9d 100644
--- a/android/res/layout/item_bookmark_set_create.xml
+++ b/android/res/layout/item_bookmark_set_create.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:paddingLeft="@dimen/margin_medium"
-    android:paddingRight="@dimen/margin_medium">
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base">
 
   <TextView
       android:id="@+id/chs_footer_button"
diff --git a/android/res/layout/item_category_title.xml b/android/res/layout/item_category_title.xml
index 1c08b82b72..02cae566f6 100644
--- a/android/res/layout/item_category_title.xml
+++ b/android/res/layout/item_category_title.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_item_oneline"
     android:gravity="left|center_vertical"
-    android:paddingLeft="@dimen/margin_medium"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_half"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:text="@string/bookmarks"/>
\ No newline at end of file
diff --git a/android/res/layout/item_search.xml b/android/res/layout/item_search.xml
index bfdf15fab8..e88e177200 100644
--- a/android/res/layout/item_search.xml
+++ b/android/res/layout/item_search.xml
@@ -7,16 +7,16 @@
     android:gravity="top"
     android:minHeight="@dimen/search_item_height"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_medium"
-    android:paddingLeft="@dimen/margin_medium"
-    android:paddingRight="@dimen/margin_medium"
-    android:paddingTop="@dimen/margin_medium">
+    android:paddingBottom="@dimen/margin_base"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_base">
 
   <ImageView
       android:id="@+id/iv__search_image"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_medium"
+      android:layout_marginRight="@dimen/margin_base"
       android:contentDescription="@null"/>
 
   <LinearLayout
@@ -30,7 +30,7 @@
         android:id="@+id/tv__search_category"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_tiny"
+        android:layout_marginBottom="@dimen/margin_quarter"
         android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
     <TextView
@@ -52,7 +52,7 @@
         android:id="@+id/tv_search_item_type"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_marginBottom="@dimen/margin_tiny"
+        android:layout_marginBottom="@dimen/margin_quarter"
         android:layout_weight="1"
         android:gravity="top"
         android:textAppearance="@style/MwmTextAppearance.Body3"/>
diff --git a/android/res/layout/item_search_category.xml b/android/res/layout/item_search_category.xml
index fb0c9f738d..064125db8e 100644
--- a/android/res/layout/item_search_category.xml
+++ b/android/res/layout/item_search_category.xml
@@ -4,8 +4,8 @@
               android:layout_height="@dimen/search_item_height"
               android:gravity="center_vertical"
               android:orientation="horizontal"
-              android:paddingLeft="@dimen/margin_medium"
-              android:paddingRight="@dimen/margin_medium">
+              android:paddingLeft="@dimen/margin_base"
+              android:paddingRight="@dimen/margin_base">
 
   <ImageView
       android:id="@+id/iv__search_category"
@@ -20,7 +20,7 @@
       android:id="@+id/tv__search_category"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_medium"
+      android:layout_marginLeft="@dimen/margin_base"
       android:layout_weight="1"
       android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
diff --git a/android/res/layout/item_search_message.xml b/android/res/layout/item_search_message.xml
index c39182e778..b46c1192a9 100644
--- a/android/res/layout/item_search_message.xml
+++ b/android/res/layout/item_search_message.xml
@@ -6,7 +6,7 @@
               android:gravity="center_vertical"
               android:minHeight="@dimen/search_item_height"
               android:orientation="horizontal"
-              android:padding="@dimen/margin_medium">
+              android:padding="@dimen/margin_base">
 
   <ImageView
       android:id="@+id/iv__search_image"
diff --git a/android/res/layout/item_track.xml b/android/res/layout/item_track.xml
index be899b5f84..c86491d663 100644
--- a/android/res/layout/item_track.xml
+++ b/android/res/layout/item_track.xml
@@ -9,8 +9,8 @@
       android:layout_height="wrap_content"
       android:layout_alignParentLeft="true"
       android:layout_centerVertical="true"
-      android:layout_marginLeft="@dimen/margin_medium"
-      android:layout_marginRight="@dimen/margin_medium"/>
+      android:layout_marginLeft="@dimen/margin_base"
+      android:layout_marginRight="@dimen/margin_base"/>
 
   <TextView
       android:id="@+id/tv__bookmark_name"
@@ -28,7 +28,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
-      android:layout_marginRight="@dimen/margin_medium"
+      android:layout_marginRight="@dimen/margin_base"
       android:textAppearance="@style/MwmTextAppearance.Body2"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/map_navigation_buttons.xml b/android/res/layout/map_navigation_buttons.xml
index 04ba87c19a..ef6ec4a5e0 100644
--- a/android/res/layout/map_navigation_buttons.xml
+++ b/android/res/layout/map_navigation_buttons.xml
@@ -3,18 +3,20 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/margin_small">
+    android:padding="@dimen/margin_quarter">
 
   <ImageButton
       android:id="@+id/btn__myposition"
       style="@style/MwmWidget.MapButton.White"
       android:layout_alignParentBottom="true"
+      android:contentDescription="@string/my_position"
       android:src="@drawable/bg_btn_white"/>
 
   <ImageButton
       android:id="@+id/yop_it"
       style="@style/MwmWidget.MapButton.White"
       android:layout_alignParentRight="true"
+      android:contentDescription="@null"
       android:src="@drawable/ic_btn_yota_ptb"/>
 
   <android.support.v4.widget.Space
@@ -28,6 +30,7 @@
       style="@style/MwmWidget.MapButton.Zoom"
       android:layout_above="@id/space_bottom"
       android:layout_alignParentRight="true"
+      android:contentDescription="@null"
       android:src="@drawable/btn_white_zoom_out"/>
 
   <ImageButton
@@ -35,6 +38,7 @@
       style="@style/MwmWidget.MapButton.Zoom"
       android:layout_above="@id/map_button_minus"
       android:layout_alignParentRight="true"
+      android:contentDescription="@null"
       android:src="@drawable/btn_white_zoom_in"/>
 
 </RelativeLayout>
diff --git a/android/res/layout/map_routing_box.xml b/android/res/layout/map_routing_box.xml
index 55d9547427..83ede712cb 100644
--- a/android/res/layout/map_routing_box.xml
+++ b/android/res/layout/map_routing_box.xml
@@ -45,7 +45,7 @@
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
       android:background="?attr/clickableBackground"
-      android:padding="@dimen/margin_medium"
+      android:padding="@dimen/margin_base"
       android:scaleType="center"
       android:src="@drawable/ic_close_routing"/>
 
diff --git a/android/res/layout/map_turn_instructions.xml b/android/res/layout/map_turn_instructions.xml
index 21259b1425..3eee3f6051 100644
--- a/android/res/layout/map_turn_instructions.xml
+++ b/android/res/layout/map_turn_instructions.xml
@@ -11,7 +11,7 @@
       style="@style/TextAppearance.AppCompat.Large"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_medium"/>
+      android:layout_marginLeft="@dimen/margin_base"/>
 
   <TextView
       android:id="@+id/tv__total_time"
diff --git a/android/res/layout/place_page_bookmark_details.xml b/android/res/layout/place_page_bookmark_details.xml
index 5621252566..30722eefe3 100644
--- a/android/res/layout/place_page_bookmark_details.xml
+++ b/android/res/layout/place_page_bookmark_details.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="false"
-    android:paddingBottom="@dimen/margin_medium"
+    android:paddingBottom="@dimen/margin_base"
     android:visibility="invisible">
 
   <View
@@ -17,8 +17,8 @@
       android:id="@+id/layout__bookmark_name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_small"
-      android:layout_marginTop="@dimen/margin_medium">
+      android:layout_marginBottom="@dimen/margin_half"
+      android:layout_marginTop="@dimen/margin_base">
 
     <EditText
         android:id="@+id/et__bookmark_name"
@@ -38,7 +38,7 @@
       android:layout_height="wrap_content"
       android:layout_alignLeft="@id/layout__bookmark_name"
       android:layout_below="@id/layout__bookmark_name"
-      android:layout_marginTop="@dimen/margin_medium_and_half"
+      android:layout_marginTop="@dimen/margin_base_plus"
       android:lineSpacingMultiplier="1.67"
       android:text="@string/set"
       android:textColor="@color/text_place_page_subtitle"
@@ -62,9 +62,9 @@
         android:background="?attr/clickableBackground"
         android:drawableRight="@drawable/ic_arrow_down"
         android:lineSpacingMultiplier="1.43"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingRight="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_small"
+        android:paddingBottom="@dimen/margin_half"
+        android:paddingRight="@dimen/margin_half"
+        android:paddingTop="@dimen/margin_half"
         android:textColor="@color/text_place_page"
         android:textSize="@dimen/place_page_subtitle"/>
 
@@ -72,7 +72,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_below="@id/tv__bookmark_group"
-        android:layout_marginTop="@dimen/margin_tiny"
+        android:layout_marginTop="@dimen/margin_quarter"
         android:layout_toLeftOf="@+id/iv__bookmark_color"
         android:background="?attr/dividerHorizontal"/>
 
@@ -84,7 +84,7 @@
         android:layout_centerVertical="true"
         android:layout_marginRight="-8dp"
         android:background="?attr/clickableBackground"
-        android:padding="@dimen/margin_small"
+        android:padding="@dimen/margin_half"
         android:src="@drawable/color_picker_red_on"/>
   </RelativeLayout>
 
@@ -94,8 +94,8 @@
       android:layout_height="wrap_content"
       android:layout_alignLeft="@id/layout__bookmark_name"
       android:layout_below="@id/ll__group"
-      android:layout_marginBottom="@dimen/margin_small"
-      android:layout_marginTop="@dimen/margin_medium"
+      android:layout_marginBottom="@dimen/margin_half"
+      android:layout_marginTop="@dimen/margin_base"
       android:clickable="true"
       android:lineSpacingMultiplier="1.67"
       android:text="@string/description"
@@ -114,7 +114,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentRight="true"
       android:layout_below="@id/wv__description"
-      android:layout_marginRight="@dimen/margin_medium"
+      android:layout_marginRight="@dimen/margin_base"
       android:background="?attr/selectableItemBackground"
       android:text="@string/edit"
       android:textAppearance="@style/MwmTextAppearance.Button"/>
diff --git a/android/res/layout/place_page_buttons.xml b/android/res/layout/place_page_buttons.xml
index e97ee3c305..40da398acd 100644
--- a/android/res/layout/place_page_buttons.xml
+++ b/android/res/layout/place_page_buttons.xml
@@ -4,14 +4,14 @@
               android:layout_height="wrap_content"
               android:background="@color/bg_top_panels"
               android:orientation="vertical"
-              android:paddingLeft="@dimen/margin_small_and_half"
-              android:paddingRight="@dimen/margin_small_and_half">
+              android:paddingLeft="@dimen/margin_half_plus"
+              android:paddingRight="@dimen/margin_half_plus">
 
   <View
       android:layout_width="match_parent"
       android:layout_height="1px"
-      android:layout_marginLeft="@dimen/margin_small_and_half"
-      android:layout_marginRight="@dimen/margin_small_and_half"
+      android:layout_marginLeft="@dimen/margin_half_plus"
+      android:layout_marginRight="@dimen/margin_half_plus"
       android:background="?android:attr/listDivider"/>
 
   <LinearLayout
@@ -19,8 +19,8 @@
       android:layout_height="@dimen/place_page_buttons_height"
       android:baselineAligned="false"
       android:orientation="horizontal"
-      android:paddingLeft="@dimen/margin_small_and_half"
-      android:paddingRight="@dimen/margin_small_and_half">
+      android:paddingLeft="@dimen/margin_half_plus"
+      android:paddingRight="@dimen/margin_half_plus">
 
     <LinearLayout
         android:id="@+id/rl__api_back"
diff --git a/android/res/layout/place_page_details_common.xml b/android/res/layout/place_page_details_common.xml
index 77435c0969..c4aa210bc3 100644
--- a/android/res/layout/place_page_details_common.xml
+++ b/android/res/layout/place_page_details_common.xml
@@ -6,14 +6,14 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:orientation="vertical"
-      android:paddingLeft="@dimen/margin_medium_and_half"
-      android:paddingRight="@dimen/margin_medium_and_half"
-      android:paddingTop="@dimen/margin_medium">
+      android:paddingLeft="@dimen/margin_base_plus"
+      android:paddingRight="@dimen/margin_base_plus"
+      android:paddingTop="@dimen/margin_base">
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:layout_marginBottom="@dimen/margin_small"
+        android:layout_marginBottom="@dimen/margin_half"
         android:background="?android:attr/listDivider"/>
 
     <include layout="@layout/place_page_placename"/>
@@ -35,7 +35,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0px"
-        android:layout_marginBottom="@dimen/margin_small"/>
+        android:layout_marginBottom="@dimen/margin_half"/>
 
     <include
         layout="@layout/place_page_bookmark_details"
diff --git a/android/res/layout/place_page_email.xml b/android/res/layout/place_page_email.xml
index 34b8d551af..989e8318ce 100644
--- a/android/res/layout/place_page_email.xml
+++ b/android/res/layout/place_page_email.xml
@@ -7,8 +7,8 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:tag="email"
     android:visibility="gone">
 
@@ -16,7 +16,7 @@
       android:id="@+id/iv__place_email"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_email"/>
 
   <TextView
diff --git a/android/res/layout/place_page_latlon.xml b/android/res/layout/place_page_latlon.xml
index afe42a30b2..2f99d2b71c 100644
--- a/android/res/layout/place_page_latlon.xml
+++ b/android/res/layout/place_page_latlon.xml
@@ -7,15 +7,15 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:tag="latlon">
 
   <ImageView
       android:id="@+id/iv__place_latlon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_text_position"/>
 
   <TextView
diff --git a/android/res/layout/place_page_operator.xml b/android/res/layout/place_page_operator.xml
index bb5b9bfe87..94bf380f71 100644
--- a/android/res/layout/place_page_operator.xml
+++ b/android/res/layout/place_page_operator.xml
@@ -7,8 +7,8 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:tag="operator"
     android:visibility="gone">
 
@@ -16,7 +16,7 @@
       android:id="@+id/iv__place_operator"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_bank_operator"/>
 
   <TextView
diff --git a/android/res/layout/place_page_phone.xml b/android/res/layout/place_page_phone.xml
index 4e84a84eec..4914fd74ef 100644
--- a/android/res/layout/place_page_phone.xml
+++ b/android/res/layout/place_page_phone.xml
@@ -7,8 +7,8 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:tag="phone"
     android:visibility="gone">
 
@@ -16,7 +16,7 @@
       android:id="@+id/iv__place_phone"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_text_phone"/>
 
   <TextView
diff --git a/android/res/layout/place_page_placename.xml b/android/res/layout/place_page_placename.xml
index aeec2a0218..7fd7764d38 100644
--- a/android/res/layout/place_page_placename.xml
+++ b/android/res/layout/place_page_placename.xml
@@ -7,15 +7,15 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:visibility="gone">
 
   <ImageView
       android:id="@+id/iv__place_name"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_text_adress"/>
 
   <TextView
diff --git a/android/res/layout/place_page_preview_common.xml b/android/res/layout/place_page_preview_common.xml
index ca02bebd6a..e297618e7b 100644
--- a/android/res/layout/place_page_preview_common.xml
+++ b/android/res/layout/place_page_preview_common.xml
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/tv__title"
-        android:layout_marginRight="@dimen/margin_medium"
+        android:layout_marginRight="@dimen/margin_base"
         android:textColor="@color/text_place_page_subtitle"
         android:textSize="@dimen/place_page_subtitle"/>
 
@@ -40,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/tv__subtitle"
-        android:layout_marginBottom="@dimen/margin_micro"
+        android:layout_marginBottom="@dimen/margin_eighth"
         android:layout_toRightOf="@id/tv__subtitle"
         android:numStars="5"
         android:progressDrawable="@drawable/rating_bar_stars"
@@ -74,7 +74,7 @@
       android:layout_height="wrap_content"
       android:layout_marginRight="-8dp"
       android:clickable="true"
-      android:padding="@dimen/margin_small"/>
+      android:padding="@dimen/margin_half"/>
 
 </merge>
 
diff --git a/android/res/layout/place_page_schedule.xml b/android/res/layout/place_page_schedule.xml
index c1ffc3b9b1..3160168cde 100644
--- a/android/res/layout/place_page_schedule.xml
+++ b/android/res/layout/place_page_schedule.xml
@@ -7,8 +7,8 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:tag="schedule"
     android:visibility="gone">
 
@@ -16,7 +16,7 @@
       android:id="@+id/iv__place_schedule"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_text_worktime"/>
 
   <TextView
diff --git a/android/res/layout/place_page_website.xml b/android/res/layout/place_page_website.xml
index 1dbd42226c..478c7e6203 100644
--- a/android/res/layout/place_page_website.xml
+++ b/android/res/layout/place_page_website.xml
@@ -7,8 +7,8 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:tag="website"
     android:visibility="gone">
 
@@ -16,7 +16,7 @@
       android:id="@+id/iv__place_website"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_text_link"/>
 
   <TextView
diff --git a/android/res/layout/place_page_wifi.xml b/android/res/layout/place_page_wifi.xml
index cc22b4464b..0b381edeb7 100644
--- a/android/res/layout/place_page_wifi.xml
+++ b/android/res/layout/place_page_wifi.xml
@@ -7,15 +7,15 @@
     android:background="?attr/clickableBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_small"
-    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
     android:visibility="gone">
 
   <ImageView
       android:id="@+id/iv__place_wifi"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_large"
+      android:layout_marginRight="@dimen/margin_double"
       android:src="@drawable/ic_text_wifi"/>
 
   <TextView
diff --git a/android/res/layout/search_box.xml b/android/res/layout/search_box.xml
index dba5b896b3..d98fadbe1a 100644
--- a/android/res/layout/search_box.xml
+++ b/android/res/layout/search_box.xml
@@ -20,7 +20,7 @@
       android:hint="@string/search"
       android:imeOptions="actionSearch|flagNoExtractUi"
       android:inputType="text"
-      android:padding="@dimen/margin_tiny"
+      android:padding="@dimen/margin_quarter"
       android:singleLine="true"
       android:textCursorDrawable="@drawable/cursor_drawable"/>
 
@@ -29,7 +29,7 @@
       style="@style/Widget.AppCompat.ProgressBar"
       android:layout_width="@dimen/routing_progress_size"
       android:layout_height="@dimen/routing_progress_size"
-      android:layout_marginRight="@dimen/margin_small"
+      android:layout_marginRight="@dimen/margin_half"
       android:layout_weight="0"
       android:background="@android:color/transparent"/>
 
@@ -41,7 +41,7 @@
       android:layout_weight="0"
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="@null"
-      android:padding="@dimen/margin_medium"
+      android:padding="@dimen/margin_base"
       android:src="@drawable/ic_close_w"/>
 
   <ImageView
@@ -52,7 +52,7 @@
       android:layout_weight="0"
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="@null"
-      android:padding="@dimen/margin_medium"
+      android:padding="@dimen/margin_base"
       android:src="@drawable/ic_mic_white"
       android:visibility="gone"/>
 
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index ba7e53b454..ad1d003838 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -3,54 +3,34 @@
 
   <dimen name="track_circle_size">40dp</dimen>
 
-  <dimen name="margin_micro">2dp</dimen>
-  <dimen name="margin_tiny">4dp</dimen>
-  <dimen name="margin_tiny_and_half">6dp</dimen>
-  <dimen name="margin_small">8dp</dimen>
-  <dimen name="margin_small_and_half">12dp</dimen>
-  <dimen name="margin_medium">16dp</dimen>
-  <dimen name="margin_medium_and_half">24dp</dimen>
-  <dimen name="margin_large">32dp</dimen>
-  <dimen name="margin_large_and_half">48dp</dimen>
-  <dimen name="margin_extra_large">64dp</dimen>
+  <dimen name="margin_eighth">2dp</dimen>
+  <dimen name="margin_quarter">4dp</dimen>
+  <dimen name="margin_quarter_plus">6dp</dimen>
+  <dimen name="margin_half">8dp</dimen>
+  <dimen name="margin_half_plus">12dp</dimen>
+  <dimen name="margin_base">16dp</dimen>
+  <dimen name="margin_base_plus">24dp</dimen>
+  <dimen name="margin_double">32dp</dimen>
+  <dimen name="margin_double_plus">48dp</dimen>
+  <dimen name="margin_quadruple">64dp</dimen>
 
-  <dimen name="neg_margin_micro">-2dp</dimen>
-  <dimen name="neg_margin_tiny">-4dp</dimen>
-  <dimen name="neg_margin_tiny_and_half">-6dp</dimen>
-  <dimen name="neg_margin_small">-8dp</dimen>
-  <dimen name="neg_margin_small_and_half">-12dp</dimen>
-  <dimen name="neg_margin_medium">-16dp</dimen>
-  <dimen name="neg_margin_large">-32dp</dimen>
-
-  <!-- TODO remove all that dimens -->
-  <dimen name="dp_x_1">4dp</dimen>
-  <dimen name="dp_x_2">8dp</dimen>
-  <dimen name="dp_x_3">12dp</dimen>
-  <dimen name="dp_x_4">16dp</dimen>
-  <dimen name="dp_x_6">24dp</dimen>
-  <dimen name="dp_x_8">32dp</dimen>
-  <dimen name="dp_x_10">40dp</dimen>
-  <dimen name="dp_x_12">48dp</dimen>
-  <dimen name="dp_x_14">56dp</dimen>
-  <dimen name="dp_x_16">64dp</dimen>
-  <dimen name="dp_x_20">80dp</dimen>
+  <dimen name="neg_margin_eighth">-2dp</dimen>
+  <dimen name="neg_margin_quarter">-4dp</dimen>
+  <dimen name="neg_margin_quarter_plus">-6dp</dimen>
+  <dimen name="neg_margin_half">-8dp</dimen>
+  <dimen name="neg_margin_half_plus">-12dp</dimen>
+  <dimen name="neg_margin_base">-16dp</dimen>
+  <dimen name="neg_margin_double">-32dp</dimen>
 
   <dimen name="dialog_max_height">320dp</dimen>
-  <dimen name="zoom_buttom_size">56dp</dimen>
   <dimen name="search_item_height">56dp</dimen>
   <dimen name="search_box_height">56dp</dimen>
 
   <dimen name="place_page_buttons_height">56dp</dimen>
 
-  <dimen name="bottom_panel_height">46dp</dimen>
-  <dimen name="bottom_button_width">113dp</dimen>
-  <dimen name="bottom_item_height">46dp</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="bg_downloader_radius">6dp</dimen>
-  <dimen name="bg_downloader_size">16dp</dimen>
 
   <dimen name="routing_pp_height">55dp</dimen>
   <dimen name="routing_button_height">51dp</dimen>
@@ -70,7 +50,7 @@
   <dimen name="margin_bottom_zoom_buttons">250dp</dimen>
 
   <!-- map widgets -->
-  <dimen name="margin_bottom_compass">104dp</dimen>
+  <dimen name="margin_bottom_compass">120dp</dimen>
   <dimen name="margin_bottom_ruler">10dp</dimen>
   <dimen name="margin_left_compass">40dp</dimen>
   <dimen name="margin_right_ruler">75dp</dimen>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 8613d8fe90..4042df8d77 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -137,7 +137,7 @@
     <item name="android:layout_height">wrap_content</item>
     <item name="android:maxWidth">200dp</item>
     <item name="android:layout_weight">1</item>
-    <item name="android:layout_marginRight">@dimen/margin_small</item>
+    <item name="android:layout_marginRight">@dimen/margin_half</item>
     <item name="android:gravity">right</item>
     <item name="android:textAllCaps">true</item>
   </style>
diff --git a/android/res/values/styles_place_page.xml b/android/res/values/styles_place_page.xml
index 13479576d6..08f3ce6d3b 100644
--- a/android/res/values/styles_place_page.xml
+++ b/android/res/values/styles_place_page.xml
@@ -6,10 +6,10 @@
     <item name="android:layout_height">56dp</item>
     <item name="android:gravity">center_vertical</item>
     <item name="android:orientation">horizontal</item>
-    <item name="android:paddingBottom">@dimen/margin_small_and_half</item>
-    <item name="android:paddingLeft">@dimen/margin_medium_and_half</item>
-    <item name="android:paddingRight">@dimen/margin_medium_and_half</item>
-    <item name="android:paddingTop">@dimen/margin_medium_and_half</item>
+    <item name="android:paddingBottom">@dimen/margin_half_plus</item>
+    <item name="android:paddingLeft">@dimen/margin_base_plus</item>
+    <item name="android:paddingRight">@dimen/margin_base_plus</item>
+    <item name="android:paddingTop">@dimen/margin_base_plus</item>
   </style>
 
   <style name="PlacePageButtonText">
@@ -17,7 +17,7 @@
     <item name="android:layout_height">wrap_content</item>
     <item name="android:textAllCaps">true</item>
     <item name="android:textColor">@color/text_place_page_buttons</item>
-    <item name="android:layout_marginTop">@dimen/margin_micro</item>
+    <item name="android:layout_marginTop">@dimen/margin_eighth</item>
     <item name="android:textSize">10sp</item>
   </style>
 
@@ -25,8 +25,8 @@
     <item name="android:layout_width">24dp</item>
     <item name="android:layout_height">0dp</item>
     <item name="android:layout_weight">1</item>
-    <item name="android:paddingTop">@dimen/margin_medium</item>
-    <item name="android:paddingBottom">@dimen/margin_medium</item>
+    <item name="android:paddingTop">@dimen/margin_base</item>
+    <item name="android:paddingBottom">@dimen/margin_base</item>
     <item name="android:scaleType">center</item>
   </style>
 
@@ -36,9 +36,9 @@
     <item name="android:layout_gravity">center_horizontal</item>
     <item name="android:layout_weight">1</item>
     <item name="android:orientation">vertical</item>
-    <item name="android:paddingTop">@dimen/margin_small</item>
+    <item name="android:paddingTop">@dimen/margin_half</item>
     <item name="android:background">?attr/clickableBackground</item>
-    <item name="android:paddingBottom">@dimen/margin_small</item>
+    <item name="android:paddingBottom">@dimen/margin_half</item>
     <item name="android:gravity">center_horizontal</item>
   </style>
 </resources>
\ No newline at end of file