From bb99b7f47b9e92d4b711d7ffb1e3b510fe7f6f19 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Thu, 21 May 2015 15:04:35 +0300
Subject: [PATCH] Base map buttons changes.

---
 .../{bg_btn_zoom.xml => bg_btn_green.xml}     |   5 +-
 ...bg_toolbar_button.xml => bg_btn_white.xml} |   8 +-
 android/res/layout-land/activity_map.xml      |   4 +-
 .../res/layout-sw600dp-land/activity_map.xml  |   4 +-
 ...tom_toolbar.xml => map_bottom_buttons.xml} |   8 +-
 android/res/layout-sw600dp/activity_map.xml   |   4 +-
 .../layout-sw600dp/map_navigation_buttons.xml |   7 +-
 .../layout-sw600dp/map_turn_instructions.xml  |   2 +-
 android/res/layout-sw720dp/activity_map.xml   |   4 +-
 ...tom_toolbar.xml => map_bottom_buttons.xml} |   8 +-
 android/res/layout/activity_map.xml           |  27 ++--
 android/res/layout/item_bookmark.xml          |   2 +-
 android/res/layout/item_bookmark_category.xml |   2 +-
 android/res/layout/item_category_title.xml    |   1 +
 android/res/layout/map_bottom_buttons.xml     |  43 +++++
 android/res/layout/map_bottom_toolbar.xml     |  69 --------
 android/res/layout/map_navigation_buttons.xml |  31 ++--
 android/res/layout/map_turn_instructions.xml  |   2 +-
 android/res/layout/toolbar_default.xml        |   4 +-
 android/res/values-sw600dp-land/styles.xml    |   2 +-
 android/res/values-sw720dp/styles.xml         |   2 +-
 android/res/values/styles.xml                 |  27 ++--
 .../maps/LocationButtonImageSetter.java       |  15 +-
 .../src/com/mapswithme/maps/MWMActivity.java  | 151 ++++--------------
 24 files changed, 154 insertions(+), 278 deletions(-)
 rename android/res/drawable/{bg_btn_zoom.xml => bg_btn_green.xml} (66%)
 rename android/res/drawable/{bg_toolbar_button.xml => bg_btn_white.xml} (60%)
 rename android/res/layout-sw600dp-land/{map_bottom_toolbar.xml => map_bottom_buttons.xml} (87%)
 rename android/res/layout-sw720dp/{map_bottom_toolbar.xml => map_bottom_buttons.xml} (87%)
 create mode 100644 android/res/layout/map_bottom_buttons.xml
 delete mode 100644 android/res/layout/map_bottom_toolbar.xml

diff --git a/android/res/drawable/bg_btn_zoom.xml b/android/res/drawable/bg_btn_green.xml
similarity index 66%
rename from android/res/drawable/bg_btn_zoom.xml
rename to android/res/drawable/bg_btn_green.xml
index 04e7b71880..08dda5a31a 100644
--- a/android/res/drawable/bg_btn_zoom.xml
+++ b/android/res/drawable/bg_btn_green.xml
@@ -5,7 +5,8 @@
           android:exitFadeDuration="200"
           tools:ignore="UnusedAttribute">
 
-  <item android:drawable="@drawable/ic_bg_zoom_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/ic_bg_zoom_normal"/>
+  <item android:drawable="@drawable/btn_green_pressed"
+        android:state_pressed="true"/>
 
+  <item android:drawable="@drawable/btn_green_normal"/>
 </selector>
\ No newline at end of file
diff --git a/android/res/drawable/bg_toolbar_button.xml b/android/res/drawable/bg_btn_white.xml
similarity index 60%
rename from android/res/drawable/bg_toolbar_button.xml
rename to android/res/drawable/bg_btn_white.xml
index aee7c8aad8..d58c897343 100644
--- a/android/res/drawable/bg_toolbar_button.xml
+++ b/android/res/drawable/bg_btn_white.xml
@@ -5,10 +5,8 @@
           android:exitFadeDuration="200"
           tools:ignore="UnusedAttribute">
 
-  <item android:state_pressed="true">
-    <bitmap android:gravity="center"
-            android:src="@drawable/ic_toolbar_active"/>
-  </item>
-  <item android:drawable="@android:color/transparent"/>
+  <item android:drawable="@drawable/btn_white_normal"
+        android:state_pressed="true"/>
 
+  <item android:drawable="@drawable/btn_white_pressed"/>
 </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 7955458a9a..cb50a81178 100644
--- a/android/res/layout-land/activity_map.xml
+++ b/android/res/layout-land/activity_map.xml
@@ -48,8 +48,8 @@
       android:visibility="gone"/>
 
   <include
-      android:id="@+id/map_bottom_toolbar"
-      layout="@layout/map_bottom_toolbar"
+      android:id="@+id/map_bottom_buttons"
+      layout="@layout/map_bottom_buttons"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_alignParentBottom="true"/>
diff --git a/android/res/layout-sw600dp-land/activity_map.xml b/android/res/layout-sw600dp-land/activity_map.xml
index fcfbec4a02..a2e411be31 100644
--- a/android/res/layout-sw600dp-land/activity_map.xml
+++ b/android/res/layout-sw600dp-land/activity_map.xml
@@ -55,8 +55,8 @@
       android:layout_margin="@dimen/margin_medium"/>
 
   <include
-      android:id="@+id/map_bottom_toolbar"
-      layout="@layout/map_bottom_toolbar"
+      android:id="@+id/map_bottom_buttons"
+      layout="@layout/map_bottom_buttons"
       android:layout_width="@dimen/bottom_panel_width"
       android:layout_height="280dp"
       android:layout_alignParentBottom="true"
diff --git a/android/res/layout-sw600dp-land/map_bottom_toolbar.xml b/android/res/layout-sw600dp-land/map_bottom_buttons.xml
similarity index 87%
rename from android/res/layout-sw600dp-land/map_bottom_toolbar.xml
rename to android/res/layout-sw600dp-land/map_bottom_buttons.xml
index 4b67ba3e63..2acc1be112 100644
--- a/android/res/layout-sw600dp-land/map_bottom_toolbar.xml
+++ b/android/res/layout-sw600dp-land/map_bottom_buttons.xml
@@ -9,7 +9,7 @@
 
   <ImageButton
       android:id="@+id/btn__more"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
@@ -17,7 +17,7 @@
 
   <ImageButton
       android:id="@+id/btn__bookmarks"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
@@ -25,7 +25,7 @@
 
   <ImageButton
       android:id="@+id/btn__search"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
@@ -33,7 +33,7 @@
 
   <ImageButton
       android:id="@+id/btn__myposition"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
diff --git a/android/res/layout-sw600dp/activity_map.xml b/android/res/layout-sw600dp/activity_map.xml
index f9e632a3d9..38076f9332 100644
--- a/android/res/layout-sw600dp/activity_map.xml
+++ b/android/res/layout-sw600dp/activity_map.xml
@@ -55,8 +55,8 @@
       android:layout_margin="@dimen/margin_medium"/>
 
   <include
-      android:id="@+id/map_bottom_toolbar"
-      layout="@layout/map_bottom_toolbar"
+      android:id="@+id/map_bottom_buttons"
+      layout="@layout/map_bottom_buttons"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_alignParentBottom="true"
diff --git a/android/res/layout-sw600dp/map_navigation_buttons.xml b/android/res/layout-sw600dp/map_navigation_buttons.xml
index b365deb1b9..68a0a87239 100644
--- a/android/res/layout-sw600dp/map_navigation_buttons.xml
+++ b/android/res/layout-sw600dp/map_navigation_buttons.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/navigation_buttons_container"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
@@ -9,7 +8,7 @@
 
   <ImageButton
       android:id="@+id/yop_it"
-      style="@style/MwmWidget.MapButton.Zoom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentRight="true"
@@ -18,7 +17,7 @@
 
   <ImageButton
       android:id="@+id/map_button_plus"
-      style="@style/MwmWidget.MapButton.Zoom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/zoom_buttom_size"
       android:layout_height="@dimen/zoom_buttom_size"
       android:layout_above="@+id/map_button_minus"
@@ -27,7 +26,7 @@
 
   <ImageButton
       android:id="@+id/map_button_minus"
-      style="@style/MwmWidget.MapButton.Zoom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/zoom_buttom_size"
       android:layout_height="@dimen/zoom_buttom_size"
       android:layout_alignParentBottom="true"
diff --git a/android/res/layout-sw600dp/map_turn_instructions.xml b/android/res/layout-sw600dp/map_turn_instructions.xml
index d520bb5e6f..21259b1425 100644
--- a/android/res/layout-sw600dp/map_turn_instructions.xml
+++ b/android/res/layout-sw600dp/map_turn_instructions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/navigation_buttons_container"
+    android:id="@+id/navigation_buttons"
     style="@style/MwmWidget.Shadow.Panel"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/android/res/layout-sw720dp/activity_map.xml b/android/res/layout-sw720dp/activity_map.xml
index d29c02e7f0..b7adeb366e 100644
--- a/android/res/layout-sw720dp/activity_map.xml
+++ b/android/res/layout-sw720dp/activity_map.xml
@@ -54,8 +54,8 @@
       android:layout_margin="@dimen/margin_medium"/>
 
   <include
-      android:id="@+id/map_bottom_toolbar"
-      layout="@layout/map_bottom_toolbar"
+      android:id="@+id/map_bottom_buttons"
+      layout="@layout/map_bottom_buttons"
       android:layout_width="@dimen/bottom_panel_width"
       android:layout_height="280dp"
       android:layout_alignParentBottom="true"
diff --git a/android/res/layout-sw720dp/map_bottom_toolbar.xml b/android/res/layout-sw720dp/map_bottom_buttons.xml
similarity index 87%
rename from android/res/layout-sw720dp/map_bottom_toolbar.xml
rename to android/res/layout-sw720dp/map_bottom_buttons.xml
index 4b67ba3e63..2acc1be112 100644
--- a/android/res/layout-sw720dp/map_bottom_toolbar.xml
+++ b/android/res/layout-sw720dp/map_bottom_buttons.xml
@@ -9,7 +9,7 @@
 
   <ImageButton
       android:id="@+id/btn__more"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
@@ -17,7 +17,7 @@
 
   <ImageButton
       android:id="@+id/btn__bookmarks"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
@@ -25,7 +25,7 @@
 
   <ImageButton
       android:id="@+id/btn__search"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
@@ -33,7 +33,7 @@
 
   <ImageButton
       android:id="@+id/btn__myposition"
-      style="@style/MwmWidget.MapButton.Bottom"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_width="@dimen/bottom_button_width"
       android:layout_height="@dimen/bottom_panel_height"
       android:layout_gravity="center"
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
index fe0c482f63..acaf665219 100644
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:placePage="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="bottom">
+                android:layout_height="match_parent">
 
   <FrameLayout
       android:id="@+id/map_fragment_container"
@@ -42,30 +41,22 @@
   </FrameLayout>
 
   <include
-      android:id="@+id/navigation_buttons_container_ref"
+      android:id="@+id/navigation_buttons"
       layout="@layout/map_navigation_buttons"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:layout_below="@id/fl__routing"/>
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
 
-  <ImageView
+  <View
       android:id="@+id/fade_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:src="@android:color/black"
+      android:background="@android:color/black"
       android:visibility="gone"/>
 
   <include
-      android:id="@+id/map_bottom_toolbar"
-      layout="@layout/map_bottom_toolbar"
+      android:id="@+id/map_bottom_buttons"
+      layout="@layout/map_bottom_buttons"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/bottom_panel_height"
-      android:layout_alignParentBottom="true"/>
-
-  <include
-      android:id="@+id/map_bottom_vertical_toolbar"
-      layout="@layout/map_bottom_vertical_toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="match_parent"
       android:layout_alignParentBottom="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/item_bookmark.xml b/android/res/layout/item_bookmark.xml
index 6de5a2a973..74c9c0a09e 100644
--- a/android/res/layout/item_bookmark.xml
+++ b/android/res/layout/item_bookmark.xml
@@ -29,6 +29,6 @@
       android:layout_alignParentRight="true"
       android:layout_centerVertical="true"
       android:layout_marginRight="@dimen/dp_x_4"
-      android:textAppearance="@style/MwmTextAppearance.Body3"/>
+      android:textAppearance="@style/MwmTextAppearance.Body2"/>
 
 </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 777c3fb191..2c45b77140 100644
--- a/android/res/layout/item_bookmark_category.xml
+++ b/android/res/layout/item_bookmark_category.xml
@@ -32,6 +32,6 @@
       android:layout_height="wrap_content"
       android:layout_weight="0"
       android:gravity="right"
-      android:textAppearance="@style/MwmTextAppearance.Body3"/>
+      android:textAppearance="@style/MwmTextAppearance.Body2"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/item_category_title.xml b/android/res/layout/item_category_title.xml
index 5c0e085d1e..1c08b82b72 100644
--- a/android/res/layout/item_category_title.xml
+++ b/android/res/layout/item_category_title.xml
@@ -7,4 +7,5 @@
     android:gravity="left|center_vertical"
     android:paddingLeft="@dimen/margin_medium"
     android:paddingTop="@dimen/margin_small"
+    android:textAppearance="@style/MwmTextAppearance.Body3"
     android:text="@string/bookmarks"/>
\ No newline at end of file
diff --git a/android/res/layout/map_bottom_buttons.xml b/android/res/layout/map_bottom_buttons.xml
new file mode 100644
index 0000000000..296e41c13c
--- /dev/null
+++ b/android/res/layout/map_bottom_buttons.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/margin_small">
+
+  <ImageButton
+      android:id="@+id/btn__bookmarks"
+      style="@style/MwmWidget.MapButton.Green"
+      android:layout_above="@+id/btn__download_maps"
+      android:layout_alignParentRight="true"
+      android:src="@drawable/btn_green_bookmarks"/>
+
+  <ImageButton
+      android:id="@+id/btn__download_maps"
+      style="@style/MwmWidget.MapButton.Green"
+      android:layout_above="@+id/btn__settings"
+      android:layout_alignParentRight="true"
+      android:src="@drawable/btn_green_download"/>
+
+  <ImageButton
+      android:id="@+id/btn__settings"
+      style="@style/MwmWidget.MapButton.Green"
+      android:layout_above="@+id/btn__share"
+      android:layout_alignParentRight="true"
+      android:src="@drawable/btn_green_settings"/>
+
+  <ImageButton
+      android:id="@+id/btn__share"
+      style="@style/MwmWidget.MapButton.Green"
+      android:layout_above="@+id/btn__search"
+      android:layout_alignParentRight="true"
+      android:src="@drawable/btn_green_share"/>
+
+  <ImageButton
+      android:id="@+id/btn__search"
+      style="@style/MwmWidget.MapButton.Green"
+      android:layout_alignParentBottom="true"
+      android:layout_alignParentRight="true"
+      android:src="@drawable/btn_green_search"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/map_bottom_toolbar.xml b/android/res/layout/map_bottom_toolbar.xml
deleted file mode 100644
index 4eebd9cdfa..0000000000
--- a/android/res/layout/map_bottom_toolbar.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/bottom_panel_height"
-    android:clipChildren="false"
-    android:background="@drawable/toolbar_gradient">
-
-  <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1">
-
-    <ImageButton
-        android:id="@+id/btn__myposition"
-        style="@style/MwmWidget.MapButton.Bottom"
-        android:layout_width="@dimen/bottom_button_width"
-        android:layout_height="@dimen/bottom_panel_height"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_my_position"/>
-
-  </FrameLayout>
-
-  <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1">
-
-    <ImageButton
-        android:id="@+id/btn__search"
-        style="@style/MwmWidget.MapButton.Bottom"
-        android:layout_width="@dimen/bottom_button_width"
-        android:layout_height="@dimen/bottom_panel_height"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_search"/>
-
-  </FrameLayout>
-
-  <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1">
-
-    <ImageButton
-        android:id="@+id/btn__bookmarks"
-        style="@style/MwmWidget.MapButton.Bottom"
-        android:layout_width="@dimen/bottom_button_width"
-        android:layout_height="@dimen/bottom_panel_height"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_bookmark"/>
-
-  </FrameLayout>
-
-  <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1">
-
-    <ImageButton
-        android:id="@+id/btn__more"
-        style="@style/MwmWidget.MapButton.Bottom"
-        android:layout_width="@dimen/bottom_button_width"
-        android:layout_height="@dimen/bottom_panel_height"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_settings"/>
-
-  </FrameLayout>
-
-</LinearLayout>
\ 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 0b1bd97723..7545f14b20 100644
--- a/android/res/layout/map_navigation_buttons.xml
+++ b/android/res/layout/map_navigation_buttons.xml
@@ -1,45 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/navigation_buttons_container"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:gravity="top"
-    android:orientation="vertical">
+    android:padding="@dimen/margin_small">
+
+  <ImageButton
+      android:id="@+id/btn__myposition"
+      style="@style/MwmWidget.MapButton.White"
+      android:layout_alignParentBottom="true"
+      android:src="@drawable/bg_btn_white"/>
 
   <ImageButton
       android:id="@+id/yop_it"
-      style="@style/MwmWidget.MapButton.Zoom"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_alignParentRight="true"
-      android:layout_marginRight="@dimen/margin_tiny"
       android:src="@drawable/ic_btn_yota_ptb"/>
 
   <View
       android:id="@+id/anchor_center"
       android:layout_width="0dp"
       android:layout_height="0dp"
-      android:layout_centerVertical="true"
-      android:layout_marginBottom="-30dp"
-      android:layout_marginRight="@dimen/margin_tiny"/>
+      android:layout_centerVertical="true"/>
 
   <ImageButton
       android:id="@+id/map_button_plus"
-      style="@style/MwmWidget.MapButton.Zoom"
-      android:layout_width="@dimen/zoom_buttom_size"
-      android:layout_height="@dimen/zoom_buttom_size"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_alignParentRight="true"
       android:layout_below="@id/anchor_center"
-      android:src="@drawable/ic_zoom_in"/>
+      android:src="@drawable/btn_white_zoom_in"/>
 
   <ImageButton
       android:id="@+id/map_button_minus"
-      style="@style/MwmWidget.MapButton.Zoom"
-      android:layout_width="@dimen/zoom_buttom_size"
-      android:layout_height="@dimen/zoom_buttom_size"
+      style="@style/MwmWidget.MapButton.White"
       android:layout_alignParentRight="true"
       android:layout_below="@+id/map_button_plus"
-      android:src="@drawable/ic_zoom_out"/>
+      android:src="@drawable/btn_white_zoom_out"/>
 
 </RelativeLayout>
diff --git a/android/res/layout/map_turn_instructions.xml b/android/res/layout/map_turn_instructions.xml
index d520bb5e6f..21259b1425 100644
--- a/android/res/layout/map_turn_instructions.xml
+++ b/android/res/layout/map_turn_instructions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/navigation_buttons_container"
+    android:id="@+id/navigation_buttons"
     style="@style/MwmWidget.Shadow.Panel"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/android/res/layout/toolbar_default.xml b/android/res/layout/toolbar_default.xml
index 6da90bf2bf..02ab46c074 100644
--- a/android/res/layout/toolbar_default.xml
+++ b/android/res/layout/toolbar_default.xml
@@ -4,4 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:theme="@style/MwmWidget.Toolbar"/>
\ No newline at end of file
+    android:theme="@style/MwmWidget.Toolbar"
+    style="@style/MwmWidget.Toolbar"/>
+    <!-- style is needed, too, because some attrs(insets, eg) are not supported in theme-->
\ No newline at end of file
diff --git a/android/res/values-sw600dp-land/styles.xml b/android/res/values-sw600dp-land/styles.xml
index 976f173c51..d8b2c142d2 100644
--- a/android/res/values-sw600dp-land/styles.xml
+++ b/android/res/values-sw600dp-land/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="MwmWidget.MapButton.Bottom" parent="android:Widget.ImageButton">
+  <style name="MwmWidget.MapButton.White" parent="android:Widget.ImageButton">
     <item name="android:background">@drawable/bg_toolbar_button_vert</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/android/res/values-sw720dp/styles.xml b/android/res/values-sw720dp/styles.xml
index 976f173c51..d8b2c142d2 100644
--- a/android/res/values-sw720dp/styles.xml
+++ b/android/res/values-sw720dp/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="MwmWidget.MapButton.Bottom" parent="android:Widget.ImageButton">
+  <style name="MwmWidget.MapButton.White" parent="android:Widget.ImageButton">
     <item name="android:background">@drawable/bg_toolbar_button_vert</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index b393c86e82..2d3aae7488 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -9,6 +9,8 @@
     <item name="clickableBackground">?attr/selectableItemBackground</item>
     <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
     <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:contentInsetStart">150dp</item>
+    <item name="android:contentInsetLeft">150dp</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:windowBackground">@android:color/white</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
@@ -50,18 +52,19 @@
 
   <style name="MwmWidget"/>
 
-  <style name="MwmWidget.MapButton" parent="android:Widget.ImageButton"/>
-
-  <style name="MwmWidget.MapButton.Zoom">
-    <item name="android:background">@drawable/bg_btn_zoom</item>
+  <style name="MwmWidget.MapButton" parent="android:Widget.ImageButton">
     <item name="android:scaleType">center</item>
-    <item name="android:layout_marginRight">@dimen/margin_small</item>
-    <item name="android:layout_marginBottom">@dimen/margin_tiny_and_half</item>
-    <item name="android:padding">0dp</item>
+    <item name="android:layout_margin">@dimen/margin_micro</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
   </style>
 
-  <style name="MwmWidget.MapButton.Bottom">
-    <item name="android:background">@drawable/bg_toolbar_button</item>
+  <style name="MwmWidget.MapButton.White">
+    <item name="android:background">@drawable/bg_btn_white</item>
+  </style>
+
+  <style name="MwmWidget.MapButton.Green">
+    <item name="android:background">@drawable/bg_btn_green</item>
   </style>
 
   <style name="MwmWidget.PlacePage.EditText" parent="Widget.AppCompat.EditText">
@@ -81,6 +84,10 @@
     <item name="android:elevation">4dp</item>
     <item name="android:gravity">center_vertical</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
+    <item name="contentInsetStart">72dp</item>
+    <item name="contentInsetLeft">72dp</item>
+    <item name="android:contentInsetStart">72dp</item>
+    <item name="android:contentInsetLeft">72dp</item>
   </style>
 
   <style name="MwmWidget.ListView" parent="android:Widget.ListView">
@@ -179,7 +186,7 @@
 
   <style name="MwmTextAppearance.Body3">
     <item name="android:textSize">@dimen/text_size_body_3</item>
-    <item name="android:textColor">@color/text_dark_hint</item>
+    <item name="android:textColor">@color/text_dark_subtitle</item>
   </style>
 
   <style name="MwmTextAppearance.IconTitle">
diff --git a/android/src/com/mapswithme/maps/LocationButtonImageSetter.java b/android/src/com/mapswithme/maps/LocationButtonImageSetter.java
index 36c65eeba4..0d93f29239 100644
--- a/android/src/com/mapswithme/maps/LocationButtonImageSetter.java
+++ b/android/src/com/mapswithme/maps/LocationButtonImageSetter.java
@@ -9,18 +9,18 @@ import java.util.Map;
 
 public class LocationButtonImageSetter
 {
-
-  private final static Map<Integer, Integer> STATE_TO_RES = new HashMap<Integer, Integer>();
+  private final static Map<Integer, Integer> STATE_TO_RES = new HashMap<>();
 
   static
   {
-    STATE_TO_RES.put(LocationState.UNKNOWN_POSITION, R.drawable.ic_my_position);
-    STATE_TO_RES.put(LocationState.NOT_FOLLOW, R.drawable.ic_my_position_pressed);
-    STATE_TO_RES.put(LocationState.FOLLOW, R.drawable.ic_my_position_pressed);
-    STATE_TO_RES.put(LocationState.ROTATE_AND_FOLLOW, R.drawable.ic_my_position_auto_follow);
-    STATE_TO_RES.put(LocationState.PENDING_POSITION, R.drawable.ic_my_position_search);
+    STATE_TO_RES.put(LocationState.UNKNOWN_POSITION, R.drawable.btn_white_noposition);
+    STATE_TO_RES.put(LocationState.NOT_FOLLOW, R.drawable.btn_white_target_off_1);
+    STATE_TO_RES.put(LocationState.FOLLOW, R.drawable.btn_white_follow);
+    STATE_TO_RES.put(LocationState.ROTATE_AND_FOLLOW, R.drawable.btn_white_direction);
+    STATE_TO_RES.put(LocationState.PENDING_POSITION, R.drawable.btn_white_loading_6);
   }
 
+  @SuppressWarnings("deprecation")
   public static void setButtonViewFromState(int state, ImageButton button)
   {
     final int id = STATE_TO_RES.get(state);
@@ -31,5 +31,4 @@ public class LocationButtonImageSetter
     if (draw instanceof AnimationDrawable)
       ((AnimationDrawable) draw).start();
   }
-
 }
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index 6cd0907d73..737f2ab7b4 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -18,7 +18,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.Toolbar;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.AbsoluteSizeSpan;
@@ -115,7 +114,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
   private ImageButton mLocationButton;
   // map
   private MapFragment mMapFragment;
-  private View mNavigationButtons;
   // Place page
   private PlacePageView mPlacePage;
   private View mRlStartRouting;
@@ -139,10 +137,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
   private boolean mStorageWritable = true;
   // toolbars
   private static final long VERT_TOOLBAR_ANIM_DURATION = 250;
-  private ViewGroup mVerticalToolbar;
-  private ViewGroup mBottomToolbar;
-  private Animation mVerticalToolbarAnimation;
   private static final float FADE_VIEW_ALPHA = 0.5f;
+  private ViewGroup mBottomToolbar;
   private View mFadeView;
 
   private static final String IS_KML_MOVED = "KmlBeenMoved";
@@ -401,7 +397,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
     {
       if (getSupportFragmentManager().findFragmentByTag(SearchFragment.class.getName()) != null) // search is already shown
         return;
-      setVerticalToolbarVisible(false);
       hidePlacePage();
       Framework.deactivatePopup();
       popFragment();
@@ -418,69 +413,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
       startActivity(new Intent(this, SearchActivity.class));
   }
 
-  private void setVerticalToolbarVisible(boolean showVerticalToolbar)
-  {
-    if (mVerticalToolbarAnimation != null ||
-        (mVerticalToolbar.getVisibility() == View.VISIBLE && showVerticalToolbar) ||
-        (mVerticalToolbar.getVisibility() != View.VISIBLE && !showVerticalToolbar))
-      return;
-
-    hidePlacePage();
-    Framework.deactivatePopup();
-    popFragment();
-
-    int fromY, toY;
-    Animation.AnimationListener listener;
-    float fromAlpha, toAlpha;
-    if (showVerticalToolbar)
-    {
-      fromY = 1;
-      toY = 0;
-      fromAlpha = 0.0f;
-      toAlpha = FADE_VIEW_ALPHA;
-
-      listener = new UiUtils.SimpleAnimationListener()
-      {
-        @Override
-        public void onAnimationStart(Animation animation)
-        {
-          UiUtils.show(mVerticalToolbar);
-        }
-
-        @Override
-        public void onAnimationEnd(Animation animation)
-        {
-          mVerticalToolbarAnimation = null;
-        }
-      };
-    }
-    else
-    {
-      fromY = 0;
-      toY = 1;
-      fromAlpha = FADE_VIEW_ALPHA;
-      toAlpha = 0.0f;
-
-      listener = new UiUtils.SimpleAnimationListener()
-      {
-        @Override
-        public void onAnimationEnd(Animation animation)
-        {
-          UiUtils.invisible(mVerticalToolbar);
-          mVerticalToolbarAnimation = null;
-        }
-      };
-    }
-
-    mVerticalToolbarAnimation = UiUtils.generateRelativeSlideAnimation(0, 0, fromY, toY);
-    mVerticalToolbarAnimation.setDuration(VERT_TOOLBAR_ANIM_DURATION);
-    mVerticalToolbarAnimation.setAnimationListener(listener);
-    mVerticalToolbar.startAnimation(mVerticalToolbarAnimation);
-
-    // fade map
-    fadeMap(fromAlpha, toAlpha);
-  }
-
   private void fadeMap(float fromAlpha, final float toAlpha)
   {
     Animation alphaAnimation = new AlphaAnimation(fromAlpha, toAlpha);
@@ -535,7 +467,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
     {
       if (getSupportFragmentManager().findFragmentByTag(DownloadFragment.class.getName()) != null) // downloader is already shown
         return;
-      setVerticalToolbarVisible(false);
       popFragment();
       hidePlacePage();
       SearchController.getInstance().cancelSearch();
@@ -647,6 +578,7 @@ public class MWMActivity extends BaseMwmFragmentActivity
 
   private void setupMap()
   {
+    mFadeView = findViewById(R.id.fade_view);
     mMapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag(MapFragment.FRAGMENT_TAG);
     if (mMapFragment == null)
     {
@@ -659,39 +591,17 @@ public class MWMActivity extends BaseMwmFragmentActivity
 
   private void setupToolbars()
   {
-    mBottomToolbar = (ViewGroup) findViewById(R.id.map_bottom_toolbar);
-    mBottomToolbar.findViewById(R.id.btn__more).setOnClickListener(this);
+    mBottomToolbar = (ViewGroup) findViewById(R.id.map_bottom_buttons);
     mBottomToolbar.findViewById(R.id.btn__search).setOnClickListener(this);
     mBottomToolbar.findViewById(R.id.btn__bookmarks).setOnClickListener(this);
-    mLocationButton = (ImageButton) mBottomToolbar.findViewById(R.id.btn__myposition);
+    mBottomToolbar.findViewById(R.id.btn__download_maps).setOnClickListener(this);
+    mBottomToolbar.findViewById(R.id.btn__share).setOnClickListener(this);
+    mBottomToolbar.findViewById(R.id.btn__settings).setOnClickListener(this);
+
+    findViewById(R.id.map_button_plus).setOnClickListener(this);
+    findViewById(R.id.map_button_minus).setOnClickListener(this);
+    mLocationButton = (ImageButton) findViewById(R.id.btn__myposition);
     mLocationButton.setOnClickListener(this);
-    mVerticalToolbar = (ViewGroup) findViewById(R.id.map_bottom_vertical_toolbar);
-    mVerticalToolbar.findViewById(R.id.btn_download_maps).setOnClickListener(this);
-    mVerticalToolbar.findViewById(R.id.btn_share).setOnClickListener(this);
-    mVerticalToolbar.findViewById(R.id.btn_settings).setOnClickListener(this);
-
-    UiUtils.invisible(mVerticalToolbar);
-
-    mFadeView = findViewById(R.id.fade_view);
-
-    final Toolbar toolbar = (Toolbar) mVerticalToolbar.findViewById(R.id.toolbar);
-    if (toolbar != null)
-    {
-      UiUtils.showHomeUpButton(toolbar);
-      toolbar.setTitle(getString(R.string.toolbar_application_menu));
-      toolbar.setNavigationOnClickListener(new OnClickListener()
-      {
-        @Override
-        public void onClick(View v)
-        {
-          onBackPressed();
-        }
-      });
-    }
-
-    mNavigationButtons = findViewById(R.id.navigation_buttons_container_ref);
-    mNavigationButtons.findViewById(R.id.map_button_plus).setOnClickListener(this);
-    mNavigationButtons.findViewById(R.id.map_button_minus).setOnClickListener(this);
   }
 
   private void setupPlacePage()
@@ -749,8 +659,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
       outState.putBoolean(STATE_PP_OPENED, true);
       outState.putParcelable(STATE_MAP_OBJECT, mPlacePage.getMapObject());
     }
-    else if (mVerticalToolbar.getVisibility() == View.VISIBLE)
-      outState.putBoolean(STATE_MENU_OPENED, true);
+//    else if (mVerticalToolbar.getVisibility() == View.VISIBLE)
+//      outState.putBoolean(STATE_MENU_OPENED, true);
 
     super.onSaveInstanceState(outState);
   }
@@ -763,8 +673,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
       mPlacePage.setMapObject((MapObject) savedInstanceState.getParcelable(STATE_MAP_OBJECT));
       mPlacePage.setState(State.PREVIEW);
     }
-    else if (savedInstanceState.getBoolean(STATE_MENU_OPENED))
-      setVerticalToolbarVisible(true);
+//    else if (savedInstanceState.getBoolean(STATE_MENU_OPENED))
+//      setVerticalToolbarVisible(true);
 
     super.onRestoreInstanceState(savedInstanceState);
   }
@@ -1127,8 +1037,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
       hidePlacePage();
       Framework.deactivatePopup();
     }
-    else if (mVerticalToolbar.getVisibility() == View.VISIBLE)
-      setVerticalToolbarVisible(false);
+//    else if (mVerticalToolbar.getVisibility() == View.VISIBLE)
+//      setVerticalToolbarVisible(false);
     else if (canFragmentInterceptBackPress())
       return;
     else if (popFragment())
@@ -1164,7 +1074,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
     if (count < 1) // first fragment is dummy and shouldn't be removed
       return false;
 
-    InputUtils.hideKeyboard(mVerticalToolbar);
     Fragment fragment = manager.findFragmentByTag(SearchFragment.class.getName());
     if (fragment != null)
     {
@@ -1309,7 +1218,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
   @Override
   public void onPreviewVisibilityChanged(boolean isVisible)
   {
-    setVerticalToolbarVisible(false);
     if (!isVisible)
     {
       Framework.deactivatePopup();
@@ -1318,7 +1226,13 @@ public class MWMActivity extends BaseMwmFragmentActivity
     if (previewIntersectsBottomMenu())
       mBottomToolbar.setVisibility(isVisible ? View.GONE : View.VISIBLE);
     if (previewIntersectsZoomButtons())
-      mNavigationButtons.setVisibility(isVisible ? View.GONE : View.VISIBLE);
+      showNavigationButtons(isVisible);
+  }
+
+  private void showNavigationButtons(boolean isVisible)
+  {
+    // TODO toggle zoom buttons and location. with animation.
+//    mNavigationButtons.setVisibility(isVisible ? View.GONE : View.VISIBLE);
   }
 
   private boolean previewIntersectsBottomMenu()
@@ -1335,9 +1249,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
   public void onPlacePageVisibilityChanged(boolean isVisible)
   {
     AlohaHelper.logClick(AlohaHelper.PP_OPEN);
-    setVerticalToolbarVisible(false);
     if (placePageIntersectsZoomButtons())
-      mNavigationButtons.setVisibility(isVisible ? View.GONE : View.VISIBLE);
+      showNavigationButtons(isVisible);
   }
 
   private boolean placePageIntersectsZoomButtons()
@@ -1352,17 +1265,14 @@ public class MWMActivity extends BaseMwmFragmentActivity
     {
     case R.id.btn_share:
       AlohaHelper.logClick(AlohaHelper.MENU_SHARE);
-      setVerticalToolbarVisible(false);
       shareMyLocation();
       break;
     case R.id.btn_settings:
       AlohaHelper.logClick(AlohaHelper.MENU_SETTINGS);
-      setVerticalToolbarVisible(false);
       startActivity(new Intent(this, SettingsActivity.class));
       break;
     case R.id.btn_download_maps:
       AlohaHelper.logClick(AlohaHelper.MENU_DOWNLOADER);
-      setVerticalToolbarVisible(false);
       showDownloader(false);
       break;
     case R.id.rl__route:
@@ -1391,7 +1301,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
       break;
     case R.id.btn__more:
       AlohaHelper.logClick(AlohaHelper.TOOLBAR_MENU);
-      setVerticalToolbarVisible(true);
       break;
     case R.id.btn__search:
       AlohaHelper.logClick(AlohaHelper.TOOLBAR_SEARCH);
@@ -1509,11 +1418,11 @@ public class MWMActivity extends BaseMwmFragmentActivity
   {
     boolean result = false;
     // if vertical toolbar is visible - hide it and ignore touch
-    if (mVerticalToolbar.getVisibility() == View.VISIBLE)
-    {
-      setVerticalToolbarVisible(false);
-      result = true;
-    }
+//    if (mVerticalToolbar.getVisibility() == View.VISIBLE)
+//    {
+//      setVerticalToolbarVisible(false);
+//      result = true;
+//    }
     if (mPlacePage.getState() == State.DETAILS || mPlacePage.getState() == State.BOOKMARK)
     {
       Framework.deactivatePopup();
@@ -1529,7 +1438,7 @@ public class MWMActivity extends BaseMwmFragmentActivity
   {
     if (keyCode == KeyEvent.KEYCODE_MENU)
     {
-      setVerticalToolbarVisible(true);
+      // TODO toggle menu
       return true;
     }
     return super.onKeyUp(keyCode, event);