diff --git a/android/res/animator/show_zoom_in_alpha.xml b/android/res/animator/show_zoom_in_alpha.xml
new file mode 100644
index 0000000000..235b1370a1
--- /dev/null
+++ b/android/res/animator/show_zoom_in_alpha.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+  android:duration="@integer/anim_fade_main"
+  android:interpolator="@android:anim/decelerate_interpolator">
+  <objectAnimator
+    android:duration="@integer/anim_menu"
+    android:propertyName="scaleX"
+    android:valueFrom="0.3"
+    android:valueTo="1.0"/>
+
+  <objectAnimator
+    android:duration="@integer/anim_menu"
+    android:propertyName="scaleY"
+    android:valueFrom="0.3"
+    android:valueTo="1.0"/>
+
+  <objectAnimator
+    android:duration="@integer/anim_menu"
+    android:propertyName="alpha"
+    android:valueFrom="0.3"
+    android:valueTo="1.0"/>
+</set>
diff --git a/android/res/animator/show_zoom_out_alpha.xml b/android/res/animator/show_zoom_out_alpha.xml
new file mode 100644
index 0000000000..278e4a6e80
--- /dev/null
+++ b/android/res/animator/show_zoom_out_alpha.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+  android:duration="@integer/anim_fade_main"
+  android:interpolator="@android:anim/decelerate_interpolator">
+  <objectAnimator
+    android:duration="@integer/anim_menu"
+    android:propertyName="scaleX"
+    android:valueFrom="1.0"
+    android:valueTo="0.3"/>
+
+  <objectAnimator
+    android:duration="@integer/anim_menu"
+    android:propertyName="scaleY"
+    android:valueFrom="1.0"
+    android:valueTo="0.3"/>
+
+  <objectAnimator
+    android:duration="@integer/anim_menu"
+    android:propertyName="alpha"
+    android:valueFrom="1.0"
+    android:valueTo="0.3"/>
+</set>
diff --git a/android/res/drawable-hdpi/ic_routing_atm_off.png b/android/res/drawable-hdpi/ic_routing_atm_off.png
new file mode 100644
index 0000000000..b53420cf90
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_atm_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_atm_on.png b/android/res/drawable-hdpi/ic_routing_atm_on.png
new file mode 100644
index 0000000000..d2624581dc
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_atm_on.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_cafe_off.png b/android/res/drawable-hdpi/ic_routing_cafe_off.png
new file mode 100644
index 0000000000..8e67af703d
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_cafe_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_cafe_on.png b/android/res/drawable-hdpi/ic_routing_cafe_on.png
new file mode 100644
index 0000000000..287c24a85b
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_cafe_on.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_food_off.png b/android/res/drawable-hdpi/ic_routing_food_off.png
new file mode 100644
index 0000000000..84cd53e5ba
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_food_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_food_on.png b/android/res/drawable-hdpi/ic_routing_food_on.png
new file mode 100644
index 0000000000..9338bc895c
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_food_on.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_fuel_off.png b/android/res/drawable-hdpi/ic_routing_fuel_off.png
new file mode 100644
index 0000000000..d94327ffd9
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_fuel_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_fuel_on.png b/android/res/drawable-hdpi/ic_routing_fuel_on.png
new file mode 100644
index 0000000000..1b8ab916a1
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_fuel_on.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_parking_off.png b/android/res/drawable-hdpi/ic_routing_parking_off.png
new file mode 100644
index 0000000000..3136def5c2
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_parking_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_parking_on.png b/android/res/drawable-hdpi/ic_routing_parking_on.png
new file mode 100644
index 0000000000..675cea13e0
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_parking_on.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_search_off.png b/android/res/drawable-hdpi/ic_routing_search_off.png
new file mode 100644
index 0000000000..1ac40a6d31
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_search_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_search_on.png b/android/res/drawable-hdpi/ic_routing_search_on.png
new file mode 100644
index 0000000000..88d931ba62
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_search_on.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_shop_off.png b/android/res/drawable-hdpi/ic_routing_shop_off.png
new file mode 100644
index 0000000000..e2c69312fe
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_shop_off.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_shop_on.png b/android/res/drawable-hdpi/ic_routing_shop_on.png
new file mode 100644
index 0000000000..32772dcce1
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_shop_on.png differ
diff --git a/android/res/drawable-hdpi/ic_zoom_out_night.png b/android/res/drawable-hdpi/ic_zoom_out_night.png
deleted file mode 100644
index 946190c424..0000000000
Binary files a/android/res/drawable-hdpi/ic_zoom_out_night.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_zoom_out_pressed.png b/android/res/drawable-hdpi/ic_zoom_out_pressed.png
deleted file mode 100644
index 7906137b2c..0000000000
Binary files a/android/res/drawable-hdpi/ic_zoom_out_pressed.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_zoom_out_pressed_night.png b/android/res/drawable-hdpi/ic_zoom_out_pressed_night.png
deleted file mode 100644
index 8dbfb6dc72..0000000000
Binary files a/android/res/drawable-hdpi/ic_zoom_out_pressed_night.png and /dev/null differ
diff --git a/android/res/drawable-land/bg_circle_panel.xml b/android/res/drawable-land/bg_circle_panel.xml
new file mode 100644
index 0000000000..16b0516060
--- /dev/null
+++ b/android/res/drawable-land/bg_circle_panel.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <solid android:color="@color/bg_panel"/>
+  <corners android:radius="100dp"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/drawable-land/bg_circle_panel_night.xml b/android/res/drawable-land/bg_circle_panel_night.xml
new file mode 100644
index 0000000000..13509a5d5b
--- /dev/null
+++ b/android/res/drawable-land/bg_circle_panel_night.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <solid android:color="@color/bg_panel_night"/>
+  <corners android:radius="100dp"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/drawable-mdpi/ic_routing_atm_off.png b/android/res/drawable-mdpi/ic_routing_atm_off.png
new file mode 100644
index 0000000000..89afd241c6
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_atm_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_atm_on.png b/android/res/drawable-mdpi/ic_routing_atm_on.png
new file mode 100644
index 0000000000..21249abf79
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_atm_on.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_cafe_off.png b/android/res/drawable-mdpi/ic_routing_cafe_off.png
new file mode 100644
index 0000000000..c1c4ce8aa6
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_cafe_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_cafe_on.png b/android/res/drawable-mdpi/ic_routing_cafe_on.png
new file mode 100644
index 0000000000..9b4f9b453a
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_cafe_on.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_food_off.png b/android/res/drawable-mdpi/ic_routing_food_off.png
new file mode 100644
index 0000000000..8f208c15d7
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_food_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_food_on.png b/android/res/drawable-mdpi/ic_routing_food_on.png
new file mode 100644
index 0000000000..39a1ed0e6a
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_food_on.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_fuel_off.png b/android/res/drawable-mdpi/ic_routing_fuel_off.png
new file mode 100644
index 0000000000..07d8f308dc
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_fuel_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_fuel_on.png b/android/res/drawable-mdpi/ic_routing_fuel_on.png
new file mode 100644
index 0000000000..8bd37e958f
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_fuel_on.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_parking_off.png b/android/res/drawable-mdpi/ic_routing_parking_off.png
new file mode 100644
index 0000000000..1adf638009
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_parking_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_parking_on.png b/android/res/drawable-mdpi/ic_routing_parking_on.png
new file mode 100644
index 0000000000..d4256afb39
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_parking_on.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_search_off.png b/android/res/drawable-mdpi/ic_routing_search_off.png
new file mode 100644
index 0000000000..f571b825df
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_search_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_search_on.png b/android/res/drawable-mdpi/ic_routing_search_on.png
new file mode 100644
index 0000000000..831b1b2134
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_search_on.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_shop_off.png b/android/res/drawable-mdpi/ic_routing_shop_off.png
new file mode 100644
index 0000000000..19d00156e4
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_shop_off.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_shop_on.png b/android/res/drawable-mdpi/ic_routing_shop_on.png
new file mode 100644
index 0000000000..6e09c5dc73
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_shop_on.png differ
diff --git a/android/res/drawable-mdpi/ic_zoom_out_night.png b/android/res/drawable-mdpi/ic_zoom_out_night.png
deleted file mode 100644
index 9026ab6c85..0000000000
Binary files a/android/res/drawable-mdpi/ic_zoom_out_night.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_zoom_out_pressed.png b/android/res/drawable-mdpi/ic_zoom_out_pressed.png
deleted file mode 100644
index e74d4f2c66..0000000000
Binary files a/android/res/drawable-mdpi/ic_zoom_out_pressed.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_zoom_out_pressed_night.png b/android/res/drawable-mdpi/ic_zoom_out_pressed_night.png
deleted file mode 100644
index a6d1400787..0000000000
Binary files a/android/res/drawable-mdpi/ic_zoom_out_pressed_night.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_routing_atm_off.png b/android/res/drawable-xhdpi/ic_routing_atm_off.png
new file mode 100644
index 0000000000..f9e27a9b4c
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_atm_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_atm_on.png b/android/res/drawable-xhdpi/ic_routing_atm_on.png
new file mode 100644
index 0000000000..3e66e95a20
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_atm_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_cafe_off.png b/android/res/drawable-xhdpi/ic_routing_cafe_off.png
new file mode 100644
index 0000000000..24636c29ab
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_cafe_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_cafe_on.png b/android/res/drawable-xhdpi/ic_routing_cafe_on.png
new file mode 100644
index 0000000000..b565cdcc62
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_cafe_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_food_off.png b/android/res/drawable-xhdpi/ic_routing_food_off.png
new file mode 100644
index 0000000000..81d14e58a2
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_food_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_food_on.png b/android/res/drawable-xhdpi/ic_routing_food_on.png
new file mode 100644
index 0000000000..ceb73f9154
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_food_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_fuel_off.png b/android/res/drawable-xhdpi/ic_routing_fuel_off.png
new file mode 100644
index 0000000000..5f1c64fadd
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_fuel_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_fuel_on.png b/android/res/drawable-xhdpi/ic_routing_fuel_on.png
new file mode 100644
index 0000000000..8528f73b8d
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_fuel_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_parking_off.png b/android/res/drawable-xhdpi/ic_routing_parking_off.png
new file mode 100644
index 0000000000..3881ddeb11
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_parking_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_parking_on.png b/android/res/drawable-xhdpi/ic_routing_parking_on.png
new file mode 100644
index 0000000000..641a70c16f
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_parking_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_search_off.png b/android/res/drawable-xhdpi/ic_routing_search_off.png
new file mode 100644
index 0000000000..ca0485c9e7
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_search_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_search_on.png b/android/res/drawable-xhdpi/ic_routing_search_on.png
new file mode 100644
index 0000000000..c188ba2bf4
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_search_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_shop_off.png b/android/res/drawable-xhdpi/ic_routing_shop_off.png
new file mode 100644
index 0000000000..58243e3f72
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_shop_off.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_shop_on.png b/android/res/drawable-xhdpi/ic_routing_shop_on.png
new file mode 100644
index 0000000000..bd750d99b5
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_shop_on.png differ
diff --git a/android/res/drawable-xhdpi/ic_zoom_out_night.png b/android/res/drawable-xhdpi/ic_zoom_out_night.png
deleted file mode 100644
index 60badc53a3..0000000000
Binary files a/android/res/drawable-xhdpi/ic_zoom_out_night.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_zoom_out_pressed.png b/android/res/drawable-xhdpi/ic_zoom_out_pressed.png
deleted file mode 100644
index eb968c9083..0000000000
Binary files a/android/res/drawable-xhdpi/ic_zoom_out_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_zoom_out_pressed_night.png b/android/res/drawable-xhdpi/ic_zoom_out_pressed_night.png
deleted file mode 100644
index 656893239f..0000000000
Binary files a/android/res/drawable-xhdpi/ic_zoom_out_pressed_night.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_atm_off.png b/android/res/drawable-xxhdpi/ic_routing_atm_off.png
new file mode 100644
index 0000000000..0caddc3f22
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_atm_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_atm_on.png b/android/res/drawable-xxhdpi/ic_routing_atm_on.png
new file mode 100644
index 0000000000..701bcc58c7
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_atm_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_cafe_off.png b/android/res/drawable-xxhdpi/ic_routing_cafe_off.png
new file mode 100644
index 0000000000..b437128e81
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_cafe_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_cafe_on.png b/android/res/drawable-xxhdpi/ic_routing_cafe_on.png
new file mode 100644
index 0000000000..0a98613ecf
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_cafe_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_food_off.png b/android/res/drawable-xxhdpi/ic_routing_food_off.png
new file mode 100644
index 0000000000..7716b3acdb
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_food_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_food_on.png b/android/res/drawable-xxhdpi/ic_routing_food_on.png
new file mode 100644
index 0000000000..e66a16fd7c
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_food_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_fuel_off.png b/android/res/drawable-xxhdpi/ic_routing_fuel_off.png
new file mode 100644
index 0000000000..9401afc463
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_fuel_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_fuel_on.png b/android/res/drawable-xxhdpi/ic_routing_fuel_on.png
new file mode 100644
index 0000000000..cc6ac1f835
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_fuel_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_parking_off.png b/android/res/drawable-xxhdpi/ic_routing_parking_off.png
new file mode 100644
index 0000000000..1684728bd3
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_parking_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_parking_on.png b/android/res/drawable-xxhdpi/ic_routing_parking_on.png
new file mode 100644
index 0000000000..c3743c6a85
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_parking_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_search_off.png b/android/res/drawable-xxhdpi/ic_routing_search_off.png
new file mode 100644
index 0000000000..24d7f5dc66
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_search_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_search_on.png b/android/res/drawable-xxhdpi/ic_routing_search_on.png
new file mode 100644
index 0000000000..b7f2152e6b
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_search_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_shop_off.png b/android/res/drawable-xxhdpi/ic_routing_shop_off.png
new file mode 100644
index 0000000000..9511fa6376
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_shop_off.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_shop_on.png b/android/res/drawable-xxhdpi/ic_routing_shop_on.png
new file mode 100644
index 0000000000..4829fe120a
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_shop_on.png differ
diff --git a/android/res/drawable-xxhdpi/ic_zoom_out_night.png b/android/res/drawable-xxhdpi/ic_zoom_out_night.png
deleted file mode 100644
index 4e2baa5fd7..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_zoom_out_night.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_zoom_out_pressed.png b/android/res/drawable-xxhdpi/ic_zoom_out_pressed.png
deleted file mode 100644
index 4b9f9b729e..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_zoom_out_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_zoom_out_pressed_night.png b/android/res/drawable-xxhdpi/ic_zoom_out_pressed_night.png
deleted file mode 100644
index 98e85d4e86..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_zoom_out_pressed_night.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_atm_off.png b/android/res/drawable-xxxhdpi/ic_routing_atm_off.png
new file mode 100644
index 0000000000..ffe8e06ad9
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_atm_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_atm_on.png b/android/res/drawable-xxxhdpi/ic_routing_atm_on.png
new file mode 100644
index 0000000000..eb2f97cdda
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_atm_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_cafe_off.png b/android/res/drawable-xxxhdpi/ic_routing_cafe_off.png
new file mode 100644
index 0000000000..1ad755c6a6
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_cafe_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_cafe_on.png b/android/res/drawable-xxxhdpi/ic_routing_cafe_on.png
new file mode 100644
index 0000000000..5b20dccc6e
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_cafe_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_food_off.png b/android/res/drawable-xxxhdpi/ic_routing_food_off.png
new file mode 100644
index 0000000000..b730f30fae
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_food_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_food_on.png b/android/res/drawable-xxxhdpi/ic_routing_food_on.png
new file mode 100644
index 0000000000..62bd9e0a88
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_food_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_fuel_off.png b/android/res/drawable-xxxhdpi/ic_routing_fuel_off.png
new file mode 100644
index 0000000000..dafafa4d53
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_fuel_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_fuel_on.png b/android/res/drawable-xxxhdpi/ic_routing_fuel_on.png
new file mode 100644
index 0000000000..7d47b348bc
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_fuel_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_parking_off.png b/android/res/drawable-xxxhdpi/ic_routing_parking_off.png
new file mode 100644
index 0000000000..23226d82d3
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_parking_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_parking_on.png b/android/res/drawable-xxxhdpi/ic_routing_parking_on.png
new file mode 100644
index 0000000000..431c956896
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_parking_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_search_off.png b/android/res/drawable-xxxhdpi/ic_routing_search_off.png
new file mode 100644
index 0000000000..789760cb48
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_search_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_search_on.png b/android/res/drawable-xxxhdpi/ic_routing_search_on.png
new file mode 100644
index 0000000000..e793d4273a
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_search_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_shop_off.png b/android/res/drawable-xxxhdpi/ic_routing_shop_off.png
new file mode 100644
index 0000000000..bbffc6eaf7
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_shop_off.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_shop_on.png b/android/res/drawable-xxxhdpi/ic_routing_shop_on.png
new file mode 100644
index 0000000000..82864233d7
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_shop_on.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_zoom_out_night.png b/android/res/drawable-xxxhdpi/ic_zoom_out_night.png
deleted file mode 100644
index d2456aba4d..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_zoom_out_night.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_zoom_out_pressed.png b/android/res/drawable-xxxhdpi/ic_zoom_out_pressed.png
deleted file mode 100644
index 858371f709..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_zoom_out_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_zoom_out_pressed_night.png b/android/res/drawable-xxxhdpi/ic_zoom_out_pressed_night.png
deleted file mode 100644
index 98960d0c55..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_zoom_out_pressed_night.png and /dev/null differ
diff --git a/android/res/drawable/bg_circle_panel.xml b/android/res/drawable/bg_circle_panel.xml
new file mode 100644
index 0000000000..1286abf9b6
--- /dev/null
+++ b/android/res/drawable/bg_circle_panel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+  <solid android:color="@color/bg_panel"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/drawable/bg_circle_panel_night.xml b/android/res/drawable/bg_circle_panel_night.xml
new file mode 100644
index 0000000000..00e31d17af
--- /dev/null
+++ b/android/res/drawable/bg_circle_panel_night.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+  <solid android:color="@color/bg_panel_night"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/drawable/zoom_out.xml b/android/res/drawable/zoom_out.xml
deleted file mode 100644
index 9094b8ad3d..0000000000
--- a/android/res/drawable/zoom_out.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          tools:ignore="UnusedAttribute">
-  <item android:drawable="@drawable/ic_zoom_out_pressed"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/ic_zoom_out"/>
-</selector>
\ No newline at end of file
diff --git a/android/res/drawable/zoom_out_night.xml b/android/res/drawable/zoom_out_night.xml
deleted file mode 100644
index d6522a4ca5..0000000000
--- a/android/res/drawable/zoom_out_night.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          tools:ignore="UnusedAttribute">
-  <item android:drawable="@drawable/ic_zoom_out_pressed_night"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/ic_zoom_out_night"/>
-</selector>
\ No newline at end of file
diff --git a/android/res/layout-land/layout_nav_search.xml b/android/res/layout-land/layout_nav_search.xml
new file mode 100644
index 0000000000..a34bf7c4b1
--- /dev/null
+++ b/android/res/layout-land/layout_nav_search.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:theme="?navButtonsTheme"
+  android:layout_marginBottom="@dimen/nav_menu_height"
+  tools:background="@color/bg_primary"
+  tools:showIn="@layout/layout_nav">
+
+  <View
+    android:id="@+id/touch_interceptor"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"/>
+
+  <LinearLayout
+    android:id="@+id/search_frame"
+    android:layout_width="286dp"
+    android:layout_height="56dp"
+    android:layout_alignParentBottom="true"
+    android:layout_marginBottom="@dimen/margin_half_plus"
+    android:background="?searchLayoutBackground"
+    android:orientation="horizontal"
+    android:padding="@dimen/margin_quarter"
+    android:visibility="invisible"
+    tools:visibility="visible">
+
+    <ImageView
+      android:id="@+id/search_fuel"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:layout_marginLeft="60dp"
+      android:layout_marginStart="60dp"
+      android:src="@drawable/ic_routing_fuel_on"/>
+
+    <ImageView
+      android:id="@+id/search_parking"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:src="@drawable/ic_routing_parking_on"/>
+
+    <ImageView
+      android:id="@+id/search_food"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:src="@drawable/ic_routing_food_on"/>
+
+    <ImageView
+      android:id="@+id/search_shop"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:src="@drawable/ic_routing_shop_on"/>
+
+    <ImageView
+      android:id="@+id/search_atm"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:src="@drawable/ic_routing_atm_on"/>
+
+  </LinearLayout>
+
+  <ImageButton
+    android:id="@+id/btn_search"
+    style="@style/MwmWidget.SearchNavigationButton"
+    android:layout_width="64dp"
+    android:layout_height="64dp"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_marginBottom="@dimen/margin_half"
+    android:background="?nav_background"
+    android:src="@drawable/ic_menu_search"
+    android:tint="@null"/>
+</RelativeLayout>
diff --git a/android/res/layout-land/map_navigation_buttons.xml b/android/res/layout-land/map_navigation_buttons.xml
new file mode 100644
index 0000000000..34cec2fcb4
--- /dev/null
+++ b/android/res/layout-land/map_navigation_buttons.xml
@@ -0,0 +1,38 @@
+<?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:layout_marginBottom="@dimen/nav_menu_height"
+  android:padding="@dimen/nav_frame_padding"
+  android:theme="?navButtonsTheme">
+
+  <ImageButton
+    android:id="@+id/nav_zoom_out"
+    style="@style/MwmWidget.MapButton"
+    android:layout_above="@+id/nav_zoom_in"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:background="?nav_background"
+    android:src="@drawable/ic_zoom_out"/>
+
+  <ImageButton
+    android:id="@+id/nav_zoom_in"
+    style="@style/MwmWidget.MapButton"
+    android:layout_above="@+id/my_position"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:background="?nav_background"
+    android:src="@drawable/ic_zoom_in"/>
+
+  <ImageButton
+    android:id="@+id/my_position"
+    style="@style/MwmWidget.MapButton"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="@dimen/margin_base_plus"
+    android:background="?nav_background"
+    android:contentDescription="@string/my_position"
+    android:tint="@null"/>
+</RelativeLayout>
diff --git a/android/res/layout-w1020dp/activity_map.xml b/android/res/layout-w1020dp/activity_map.xml
index 2495d739dc..41f98b0d56 100644
--- a/android/res/layout-w1020dp/activity_map.xml
+++ b/android/res/layout-w1020dp/activity_map.xml
@@ -35,6 +35,7 @@
     android:layout_height="wrap_content"
     android:layout_alignWithParentIfMissing="true"
     android:layout_toRightOf="@+id/fragment_container"
+    android:layout_toEndOf="@id/fragment_container"
     android:clipToPadding="false"
     android:orientation="vertical"
     android:padding="@dimen/margin_base">
@@ -48,13 +49,6 @@
       android:visibility="gone"
       tools:visibility="visible"/>
 
-    <include
-      layout="@layout/layout_nav"
-      android:layout_width="@dimen/panel_width"
-      android:layout_height="match_parent"
-      android:visibility="invisible"
-      tools:visibility="visible"/>
-
     <com.mapswithme.maps.widget.placepage.PlacePageView
       android:id="@+id/info_box"
       style="@style/MwmWidget.Floating"
@@ -66,6 +60,13 @@
       placePage:floating="true"/>
   </LinearLayout>
 
+  <include
+    layout="@layout/layout_nav"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="invisible"
+    tools:visibility="visible"/>
+
   <include
     android:id="@+id/menu_frame"
     layout="@layout/menu"
diff --git a/android/res/layout/layout_nav.xml b/android/res/layout/layout_nav.xml
index a2c2cb20a9..87f0457a35 100644
--- a/android/res/layout/layout_nav.xml
+++ b/android/res/layout/layout_nav.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/navigation_frame"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  tools:showIn="@layout/activity_map">
+
   <include layout="@layout/layout_nav_top"/>
+
+  <include layout="@layout/layout_nav_search"/>
+
   <include layout="@layout/layout_nav_bottom"/>
 </FrameLayout>
diff --git a/android/res/layout/layout_nav_bottom.xml b/android/res/layout/layout_nav_bottom.xml
index c0d5b61106..0e894043eb 100644
--- a/android/res/layout/layout_nav_bottom.xml
+++ b/android/res/layout/layout_nav_bottom.xml
@@ -11,7 +11,8 @@
   android:clickable="true"
   android:visibility="invisible"
   android:background="?menuBackgroundOpen"
-  tools:visibility="visible">
+  tools:visibility="visible"
+  tools:showIn="@layout/layout_nav">
 
   <FrameLayout
     android:id="@+id/line_frame"
@@ -80,7 +81,7 @@
       android:layout_width="@dimen/nav_icon_size"
       android:layout_height="@dimen/nav_icon_size"
       android:scaleType="center"
-      android:layout_gravity="center_vertical|right"
+      android:layout_gravity="center_vertical|end"
       android:src="@drawable/ic_voice_on"
       android:background="?selectableItemBackgroundBorderless"/>
   </FrameLayout>
diff --git a/android/res/layout/layout_nav_search.xml b/android/res/layout/layout_nav_search.xml
new file mode 100644
index 0000000000..a4996c695b
--- /dev/null
+++ b/android/res/layout/layout_nav_search.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:theme="?navButtonsTheme"
+  tools:background="@color/bg_primary"
+  tools:showIn="@layout/layout_nav">
+
+  <Space
+    android:id="@id/anchor_center"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:layout_centerInParent="true"/>
+
+  <View
+    android:id="@+id/touch_interceptor"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"/>
+
+  <RelativeLayout
+    android:id="@+id/search_frame"
+    android:layout_width="200dp"
+    android:layout_height="200dp"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_marginTop="-68dp"
+    android:layout_below="@id/anchor_center"
+    android:layout_marginLeft="-70dp"
+    android:layout_marginStart="-70dp"
+    android:background="?searchLayoutBackground"
+    android:visibility="invisible"
+    tools:visibility="visible">
+
+    <ImageView
+      android:id="@+id/search_fuel"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:layout_alignParentTop="true"
+      android:layout_centerHorizontal="true"
+      android:src="@drawable/ic_routing_fuel_on"/>
+
+    <ImageView
+      android:id="@+id/search_parking"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:layout_marginTop="30dp"
+      android:layout_toEndOf="@id/search_fuel"
+      android:layout_toRightOf="@id/search_fuel"
+      android:src="@drawable/ic_routing_parking_on"/>
+
+    <ImageView
+      android:id="@+id/search_food"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentRight="true"
+      android:layout_centerVertical="true"
+      android:src="@drawable/ic_routing_food_on"/>
+
+    <ImageView
+      android:id="@+id/search_shop"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="30dp"
+      android:layout_toEndOf="@id/search_fuel"
+      android:layout_toRightOf="@id/search_fuel"
+      android:src="@drawable/ic_routing_shop_on"/>
+
+    <ImageView
+      android:id="@+id/search_atm"
+      style="@style/MwmWidget.SearchNavigationButton"
+      android:layout_alignParentBottom="true"
+      android:layout_centerHorizontal="true"
+      android:src="@drawable/ic_routing_atm_on"/>
+
+  </RelativeLayout>
+
+  <ImageButton
+    android:id="@+id/btn_search"
+    style="@style/MwmWidget.SearchNavigationButton"
+    android:layout_width="64dp"
+    android:layout_height="64dp"
+    android:layout_below="@id/anchor_center"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:background="?nav_background"
+    android:src="@drawable/ic_menu_search"
+    android:tint="@null"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/layout_nav_top.xml b/android/res/layout/layout_nav_top.xml
index 77b14e200a..ce6e48aed2 100644
--- a/android/res/layout/layout_nav_top.xml
+++ b/android/res/layout/layout_nav_top.xml
@@ -5,7 +5,8 @@
   android:id="@+id/nav_top_frame"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  tools:background="#20FF0000">
+  tools:background="#20FF0000"
+  tools:showIn="@layout/layout_nav">
   <FrameLayout
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
diff --git a/android/res/layout/map_navigation_buttons.xml b/android/res/layout/map_navigation_buttons.xml
index 72df73e2eb..1e3e376fc4 100644
--- a/android/res/layout/map_navigation_buttons.xml
+++ b/android/res/layout/map_navigation_buttons.xml
@@ -3,24 +3,28 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:layout_marginBottom="@dimen/nav_menu_height"
   android:padding="@dimen/nav_frame_padding"
   android:theme="?navButtonsTheme">
 
+  <Space
+    android:id="@+id/anchor_center"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:layout_centerInParent="true"/>
+
   <ImageButton
     android:id="@+id/nav_zoom_out"
     style="@style/MwmWidget.MapButton"
-    android:layout_alignParentBottom="true"
     android:layout_alignParentEnd="true"
     android:layout_alignParentRight="true"
-    android:layout_marginBottom="@dimen/nav_zoom_bottom"
+    android:layout_below="@id/anchor_center"
     android:background="?nav_background"
     android:src="@drawable/ic_zoom_out"/>
 
   <ImageButton
     android:id="@+id/nav_zoom_in"
     style="@style/MwmWidget.MapButton"
-    android:layout_above="@id/nav_zoom_out"
+    android:layout_above="@id/anchor_center"
     android:layout_alignParentEnd="true"
     android:layout_alignParentRight="true"
     android:background="?nav_background"
@@ -29,10 +33,10 @@
   <ImageButton
     android:id="@+id/my_position"
     style="@style/MwmWidget.MapButton"
-    android:layout_alignParentBottom="true"
     android:layout_alignParentEnd="true"
     android:layout_alignParentRight="true"
-    android:layout_marginBottom="@dimen/margin_base"
+    android:layout_below="@id/nav_zoom_out"
+    android:layout_marginTop="@dimen/margin_double"
     android:background="?nav_background"
     android:contentDescription="@string/my_position"
     android:tint="@null"/>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 7c07b9e758..1383fad997 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
-           xmlns:tools="http://schemas.android.com/tools">
+  xmlns:tools="http://schemas.android.com/tools">
+
   <style name="MwmWidget"/>
+
   <style name="MwmWidget.ProgressWheel"/>
+
   <style name="MwmWidget.FrameLayout"/>
+
   <style name="MwmWidget.Downloader"/>
 
   <style name="BottomSheet.Icon">
@@ -13,7 +17,7 @@
   </style>
 
   <style name="MwmWidget.MapButton"
-         parent="android:Widget.ImageButton">
+    parent="android:Widget.ImageButton">
     <item name="android:scaleType">center</item>
     <item name="android:layout_height">64dp</item>
     <item name="android:layout_width">64dp</item>
@@ -45,49 +49,73 @@
   </style>
 
   <style name="MwmWidget.Floating">
-    <item name="android:elevation" tools:ignore="NewApi">@dimen/appbar_elevation</item>
+    <item name="android:elevation"
+      tools:ignore="NewApi">@dimen/appbar_elevation
+    </item>
   </style>
 
   <style name="MwmWidget.Floating.Panel">
     <item name="android:background">?panel</item>
   </style>
 
-  <style name="MwmWidget.PlacePage.EditText" parent="Widget.AppCompat.EditText">
+  <style
+    name="MwmWidget.PlacePage.EditText"
+    parent="Widget.AppCompat.EditText">
     <item name="android:imeOptions">actionDone</item>
     <item name="android:textAppearance">@style/MwmTextAppearance.PlacePage</item>
     <item name="android:textColorHint">?secondary</item>
     <item name="android:textCursorDrawable">@null</item>
-    <item name="android:fontFamily" tools:ignore="NewApi">@string/robotoRegular</item>
+    <item name="android:fontFamily"
+      tools:ignore="NewApi">@string/robotoRegular
+    </item>
   </style>
 
-  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+  <style
+    name="MwmWidget.ToolbarStyle"
+    parent="ThemeOverlay.AppCompat.Dark.ActionBar">
     <item name="android:background">?colorPrimary</item>
-    <item name="android:elevation" tools:ignore="NewApi">@dimen/appbar_elevation</item>
+    <item name="android:elevation"
+      tools:ignore="NewApi">@dimen/appbar_elevation
+    </item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">72dp</item>
-    <item name="android:titleTextAppearance" tools:ignore="NewApi">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="android:titleTextAppearance"
+      tools:ignore="NewApi">@style/MwmTextAppearance.Toolbar.Title
+    </item>
     <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
     <item name="contentInsetLeft">72dp</item>
-    <item name="android:contentInsetStart" tools:ignore="NewApi">72dp</item>
-    <item name="android:contentInsetLeft" tools:ignore="NewApi">72dp</item>
+    <item name="android:contentInsetStart"
+      tools:ignore="NewApi">72dp
+    </item>
+    <item name="android:contentInsetLeft"
+      tools:ignore="NewApi">72dp
+    </item>
   </style>
 
   <style name="MwmWidget.ToolbarStyle.Light">
-    <item name="android:titleTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Toolbar.Title.Light</item>
+    <item name="android:titleTextAppearance"
+      tools:targetApi="lollipop">@style/MwmTextAppearance.Toolbar.Title.Light
+    </item>
     <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
   </style>
 
-  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+  <style
+    name="MwmWidget.ToolbarTheme"
+    parent="ThemeOverlay.AppCompat.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
     <item name="colorAccent">@android:color/white</item>
   </style>
 
-  <style name="MwmWidget.ToolbarTheme.Light" parent="ThemeOverlay.AppCompat.ActionBar">
+  <style
+    name="MwmWidget.ToolbarTheme.Light"
+    parent="ThemeOverlay.AppCompat.ActionBar">
     <item name="android:gravity">center_vertical</item>
     <item name="colorAccent">@color/bg_window_night</item>
   </style>
 
-  <style name="MwmWidget.ListView" parent="Widget.AppCompat.ListView">
+  <style
+    name="MwmWidget.ListView"
+    parent="Widget.AppCompat.ListView">
     <item name="android:fadingEdge">none</item>
     <item name="android:divider">@color/divider</item>
     <item name="android:background">@null</item>
@@ -97,7 +125,8 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="android:Widget.TextView">
+  <style name="MwmWidget.TextView"
+    parent="android:Widget.TextView">
     <item name="android:background">@android:color/transparent</item>
   </style>
 
@@ -166,7 +195,8 @@
     <item name="android:foreground">@drawable/shadow_top</item>
   </style>
 
-  <style name="MwmWidget.RatingBar" parent="android:Widget.RatingBar">
+  <style name="MwmWidget.RatingBar"
+    parent="android:Widget.RatingBar">
     <item name="android:progressDrawable">@drawable/rating_bar</item>
     <item name="android:indeterminateDrawable">@drawable/rating_bar</item>
   </style>
@@ -201,4 +231,14 @@
     <item name="android:padding">@dimen/margin_half</item>
     <item name="android:textAppearance">@style/MwmTextAppearance.Toolbar.Title.Button</item>
   </style>
+
+  <style
+    name="MwmWidget.SearchNavigationButton"
+    parent="android:Widget.ImageButton">
+    <item name="android:scaleType">center</item>
+    <item name="android:layout_height">44dp</item>
+    <item name="android:layout_width">44dp</item>
+    <item name="android:background">?selectableItemBackgroundBorderless</item>
+    <item name="android:tint">?iconTint</item>
+  </style>
 </resources>
\ No newline at end of file
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index ec96f78e85..530cca73e8 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -73,5 +73,6 @@
 
   <declare-styleable name="ThemeAttrs.Navigation">
     <attr name="newsMarker" format="reference"/>
+    <attr name="searchLayoutBackground" format="reference"/>
   </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 1fd6145473..fa9c2df6fd 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -135,14 +135,12 @@
 
   <style name="MwmTheme.NavButtons">
     <item name="nav_background">@drawable/button_navigation_circle</item>
+    <item name="searchLayoutBackground">@drawable/bg_circle_panel</item>
   </style>
 
   <style name="MwmTheme.NavButtons.Night" parent="MwmTheme.Night">
     <item name="nav_background">@drawable/button_navigation_circle_night</item>
-  </style>
-
-  <style name="MwmTheme.Button" parent="Base.Widget.AppCompat.Button">
-    <item name="colorButtonNormal">?colorAccent</item>
+    <item name="searchLayoutBackground">@drawable/bg_circle_panel_night</item>
   </style>
 
   <style name="MwmTheme.Navigation">
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 84489a0994..73712ce0c8 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -19,6 +19,9 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
 
+import java.io.Serializable;
+import java.util.Stack;
+
 import com.mapswithme.maps.Framework.MapObjectListener;
 import com.mapswithme.maps.activity.CustomNavigateUpListener;
 import com.mapswithme.maps.ads.LikesManager;
@@ -83,9 +86,6 @@ import com.mapswithme.util.statistics.Statistics;
 import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
 import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
 
-import java.io.Serializable;
-import java.util.Stack;
-
 public class MwmActivity extends BaseMwmFragmentActivity
                       implements MapObjectListener,
                                  View.OnTouchListener,
@@ -745,7 +745,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       }
     });
     mOnmapDownloader.onResume();
-    mNavigationController.getNavMenu().onResume(null);
+    mNavigationController.onResume();
   }
 
   @Override
@@ -1249,6 +1249,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (RoutingController.get().isNavigating())
     {
       mNavigationController.show(true);
+      mSearchController.hide();
       mMainMenu.setState(MainMenu.State.NAVIGATION, false);
       return;
     }
diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java
index 60d5eb841c..9f17d7ef85 100644
--- a/android/src/com/mapswithme/maps/routing/NavigationController.java
+++ b/android/src/com/mapswithme/maps/routing/NavigationController.java
@@ -57,6 +57,8 @@ public class NavigationController
   private final TextView mDistanceUnits;
   private final FlatProgressView mRouteProgress;
 
+  private final SearchWheel mSearchWheel;
+
   private boolean mShowTimeLeft = true;
 
   private double mNorth;
@@ -103,6 +105,14 @@ public class NavigationController
     mDistanceValue = (TextView) mBottomFrame.findViewById(R.id.distance_value);
     mDistanceUnits = (TextView) mBottomFrame.findViewById(R.id.distance_dimen);
     mRouteProgress = (FlatProgressView) mBottomFrame.findViewById(R.id.navigation_progress);
+
+    mSearchWheel = new SearchWheel(mFrame);
+  }
+
+  public void onResume()
+  {
+    mNavMenu.onResume(null);
+    mSearchWheel.onResume();
   }
 
   private NavMenu createNavMenu()
@@ -120,6 +130,7 @@ public class NavigationController
           Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_CLOSE);
           AlohaHelper.logClick(AlohaHelper.ROUTING_CLOSE);
           parent.refreshFade();
+          mSearchWheel.reset();
           break;
         case SETTINGS:
           parent.closeMenu(Statistics.EventName.ROUTING_SETTINGS, AlohaHelper.MENU_SETTINGS, new Runnable()
@@ -240,7 +251,7 @@ public class NavigationController
       UiUtils.hide(mTimeHourUnits, mTimeHourValue);
       return;
     }
-    UiUtils.setTextAndShow(mTimeHourValue,String.valueOf(hours));
+    UiUtils.setTextAndShow(mTimeHourValue, String.valueOf(hours));
     // TODO set localized text
     UiUtils.setTextAndShow(mTimeHourUnits, "h");
   }
diff --git a/android/src/com/mapswithme/maps/routing/SearchWheel.java b/android/src/com/mapswithme/maps/routing/SearchWheel.java
new file mode 100644
index 0000000000..1f550a8802
--- /dev/null
+++ b/android/src/com/mapswithme/maps/routing/SearchWheel.java
@@ -0,0 +1,240 @@
+package com.mapswithme.maps.routing;
+
+import android.animation.Animator;
+import android.animation.AnimatorInflater;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+
+import com.mapswithme.maps.MwmActivity;
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.search.SearchEngine;
+import com.mapswithme.util.Graphics;
+import com.mapswithme.util.UiUtils;
+import com.mapswithme.util.concurrency.UiThread;
+
+class SearchWheel implements View.OnClickListener
+{
+  private final View mFrame;
+
+  private final View mSearchLayout;
+  private final ImageView mSearchButton;
+  private final View mTouchInterceptor;
+
+  private boolean mIsExpanded;
+  private SearchOption mCurrentOption;
+
+  private static final long CLOSE_DELAY_MILLIS = 5000L;
+  private Runnable mCloseRunnable = new Runnable() {
+    @Override
+    public void run()
+    {
+      toggleSearchLayout();
+    }
+  };
+
+  private enum SearchOption
+  {
+    FUEL(R.id.search_fuel, R.drawable.ic_routing_fuel_off, R.drawable.ic_routing_fuel_on, "fuel"),
+    PARKING(R.id.search_parking, R.drawable.ic_routing_parking_off, R.drawable.ic_routing_parking_on, "parking"),
+    FOOD(R.id.search_food, R.drawable.ic_routing_food_off, R.drawable.ic_routing_food_on, "food"),
+    SHOP(R.id.search_shop, R.drawable.ic_routing_shop_off, R.drawable.ic_routing_shop_on, "shop"),
+    ATM(R.id.search_atm, R.drawable.ic_routing_atm_off, R.drawable.ic_routing_atm_on, "atm");
+
+    private int mResId;
+    private int mDrawableOff;
+    private int mDrawableOn;
+    private String mSearchQuery;
+
+    SearchOption(@IdRes int resId, @DrawableRes int drawableOff, @DrawableRes int drawableOn, String searchQuery)
+    {
+      this.mResId = resId;
+      this.mDrawableOff = drawableOff;
+      this.mDrawableOn = drawableOn;
+      this.mSearchQuery = searchQuery;
+    }
+
+    @NonNull
+    public static SearchOption FromResId(@IdRes int resId)
+    {
+      for (SearchOption searchOption : SearchOption.values())
+      {
+        if (searchOption.mResId == resId)
+          return searchOption;
+      }
+      throw new IllegalArgumentException("No navigation search for id " + resId);
+    }
+
+    @Nullable
+    public static SearchOption FromSearchQuery(@NonNull String query)
+    {
+      final String normalizedQuery = query.trim().toLowerCase();
+      for (SearchOption searchOption : SearchOption.values())
+      {
+        if (searchOption.mSearchQuery.equals(normalizedQuery))
+          return searchOption;
+      }
+      return null;
+    }
+  }
+
+  SearchWheel(View frame)
+  {
+    mFrame = frame;
+
+    mTouchInterceptor = mFrame.findViewById(R.id.touch_interceptor);
+    mTouchInterceptor.setOnClickListener(this);
+    mSearchButton = (ImageView) mFrame.findViewById(R.id.btn_search);
+    mSearchButton.setOnClickListener(this);
+    mSearchLayout = mFrame.findViewById(R.id.search_frame);
+    if (UiUtils.isLandscape(mFrame.getContext()))
+    {
+      UiUtils.waitLayout(mSearchLayout, new ViewTreeObserver.OnGlobalLayoutListener()
+      {
+        @Override
+        public void onGlobalLayout()
+        {
+          mSearchLayout.setPivotX(0);
+          mSearchLayout.setPivotY(mSearchLayout.getMeasuredHeight() / 2);
+        }
+      });
+    }
+    for (SearchOption searchOption : SearchOption.values())
+      mFrame.findViewById(searchOption.mResId).setOnClickListener(this);
+    refreshSearchVisibility();
+  }
+
+  public void reset()
+  {
+    mIsExpanded = false;
+    mCurrentOption = null;
+    SearchEngine.cancelSearch();
+  }
+
+  public void onResume()
+  {
+    final String query = SearchEngine.getQuery();
+    if (TextUtils.isEmpty(query))
+    {
+      resetSearchButtonImage();
+      return;
+    }
+
+    mCurrentOption = SearchOption.FromSearchQuery(query);
+    refreshSearchButtonImage();
+  }
+
+  private void toggleSearchLayout()
+  {
+    final int animRes;
+    if (mIsExpanded)
+    {
+      animRes = R.animator.show_zoom_out_alpha;
+    }
+    else
+    {
+      animRes = R.animator.show_zoom_in_alpha;
+      UiUtils.show(mSearchLayout);
+    }
+    mIsExpanded = !mIsExpanded;
+    final Animator animator = AnimatorInflater.loadAnimator(mSearchLayout.getContext(), animRes);
+    animator.setTarget(mSearchLayout);
+    animator.start();
+    UiUtils.visibleIf(mIsExpanded, mTouchInterceptor);
+    animator.addListener(new UiUtils.SimpleAnimatorListener()
+    {
+      @Override
+      public void onAnimationEnd(Animator animation)
+      {
+        refreshSearchVisibility();
+      }
+    });
+  }
+
+  private void refreshSearchVisibility()
+  {
+    for (SearchOption searchOption : SearchOption.values())
+      UiUtils.visibleIf(mIsExpanded, mSearchLayout.findViewById(searchOption.mResId));
+
+    UiUtils.visibleIf(mIsExpanded, mSearchLayout, mTouchInterceptor);
+
+    if (mIsExpanded)
+    {
+      UiThread.cancelDelayedTasks(mCloseRunnable);
+      UiThread.runLater(mCloseRunnable, CLOSE_DELAY_MILLIS);
+    }
+  }
+
+  private void resetSearchButtonImage()
+  {
+    mSearchButton.setImageDrawable(Graphics.tint(mSearchButton.getContext(),
+                                                 R.drawable.ic_routing_search_on));
+  }
+
+  private void refreshSearchButtonImage()
+  {
+    mSearchButton.setImageDrawable(Graphics.tint(mSearchButton.getContext(),
+                                                 mCurrentOption == null ?
+                                                 R.drawable.ic_routing_search_off :
+                                                 mCurrentOption.mDrawableOff,
+                                                 R.attr.colorAccent));
+  }
+
+  @Override
+  public void onClick(View v)
+  {
+    switch (v.getId())
+    {
+    case R.id.btn_search:
+      if (mCurrentOption != null || !TextUtils.isEmpty(SearchEngine.getQuery()))
+      {
+        SearchEngine.cancelSearch();
+        mCurrentOption = null;
+        mIsExpanded = false;
+        resetSearchButtonImage();
+        refreshSearchVisibility();
+        return;
+      }
+
+      if (mIsExpanded)
+      {
+        showSearchInParent();
+        return;
+      }
+
+      toggleSearchLayout();
+      break;
+    case R.id.touch_interceptor:
+      toggleSearchLayout();
+      break;
+    case R.id.search_fuel:
+    case R.id.search_parking:
+    case R.id.search_food:
+    case R.id.search_shop:
+    case R.id.search_atm:
+      startSearch(SearchOption.FromResId(v.getId()));
+    }
+  }
+
+  private void showSearchInParent()
+  {
+    final MwmActivity parent = (MwmActivity) mFrame.getContext();
+    parent.showSearch();
+    mIsExpanded = false;
+    refreshSearchVisibility();
+  }
+
+  private void startSearch(SearchOption searchOption)
+  {
+    mCurrentOption = searchOption;
+    SearchEngine.searchInteractive(searchOption.mSearchQuery, System.nanoTime(), false /* isMapAndTable */);
+    refreshSearchButtonImage();
+
+    toggleSearchLayout();
+  }
+}
diff --git a/android/src/com/mapswithme/maps/search/TabAdapter.java b/android/src/com/mapswithme/maps/search/TabAdapter.java
index 042362335d..336e65b33b 100644
--- a/android/src/com/mapswithme/maps/search/TabAdapter.java
+++ b/android/src/com/mapswithme/maps/search/TabAdapter.java
@@ -159,7 +159,7 @@ class TabAdapter extends FragmentPagerAdapter
   {
     final Context context = tabs.getContext();
     final LayoutInflater inflater = LayoutInflater.from(context);
-    boolean landscape = (context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
+    final boolean landscape = UiUtils.isLandscape(context);
 
     int padding = UiUtils.dimen(landscape ? R.dimen.margin_half
                                           : R.dimen.margin_eighth);
diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
index 45739acb64..59e0457f3a 100644
--- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
+++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
@@ -31,6 +31,8 @@ public class MyPositionButton
         AlohaHelper.logClick(AlohaHelper.TOOLBAR_MY_POSITION);
       }
     });
+
+    mIcons.clear();
   }
 
   @SuppressWarnings("deprecation")
@@ -70,9 +72,4 @@ public class MyPositionButton
     if (image instanceof AnimationDrawable)
       ((AnimationDrawable) image).start();
   }
-
-  public static void clearCache()
-  {
-    mIcons.clear();
-  }
 }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 326b46482f..33c03d33f8 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -3,7 +3,6 @@ package com.mapswithme.maps.widget.placepage;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Color;
@@ -397,7 +396,7 @@ public class PlacePageView extends RelativeLayout
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
       setElevation(UiUtils.dimen(R.dimen.placepage_elevation));
 
-    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE)
+    if (UiUtils.isLandscape(getContext()))
       mDetails.setBackgroundResource(0);
 
     SponsoredHotel.setListener(this);
diff --git a/android/src/com/mapswithme/util/ThemeSwitcher.java b/android/src/com/mapswithme/util/ThemeSwitcher.java
index 8e56af5a7a..334951847d 100644
--- a/android/src/com/mapswithme/util/ThemeSwitcher.java
+++ b/android/src/com/mapswithme/util/ThemeSwitcher.java
@@ -9,7 +9,6 @@ import com.mapswithme.maps.downloader.DownloaderStatusIcon;
 import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.location.LocationListener;
 import com.mapswithme.maps.routing.RoutingController;
-import com.mapswithme.maps.widget.menu.MyPositionButton;
 import com.mapswithme.util.concurrency.UiThread;
 
 public final class ThemeSwitcher
@@ -92,7 +91,6 @@ public final class ThemeSwitcher
     Framework.nativeMarkMapStyle(style);
 
     DownloaderStatusIcon.clearCache();
-    MyPositionButton.clearCache();
 
     Activity a = MwmApplication.backgroundTracker().getTopActivity();
     if (a != null && !a.isFinishing())
diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 90fe645793..55c329dc93 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -334,6 +334,11 @@ public final class UiUtils
                                                  : layout.getContext().getResources().getColor(R.color.base_red));
   }
 
+  public static boolean isLandscape(Context context)
+  {
+    return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+  }
+
   // utility class
   private UiUtils() {}
 }
diff --git a/android/src/com/mapswithme/util/concurrency/UiThread.java b/android/src/com/mapswithme/util/concurrency/UiThread.java
index c3f1873c1e..63d8727ded 100644
--- a/android/src/com/mapswithme/util/concurrency/UiThread.java
+++ b/android/src/com/mapswithme/util/concurrency/UiThread.java
@@ -94,14 +94,14 @@ public class UiThread
   }
 
   /**
-   * Executes something on UI thread after a given delay.
+   * Executes something on UI thread after a given delayMillis.
    *
-   * @param task  the code that must be executed on UI thread after given delay.
-   * @param delay The delay (in milliseconds) until the code will be executed.
+   * @param task  the code that must be executed on UI thread after given delayMillis.
+   * @param delayMillis The delayMillis until the code will be executed.
    */
-  public static void runLater(Runnable task, long delay)
+  public static void runLater(Runnable task, long delayMillis)
   {
-    sUiHandler.postDelayed(task, delay);
+    sUiHandler.postDelayed(task, delayMillis);
   }
 
   /**