diff --git a/android/res/drawable-land/bg_circle_panel.xml b/android/res/drawable/bg_search_wheel_background_rect.xml
similarity index 100%
rename from android/res/drawable-land/bg_circle_panel.xml
rename to android/res/drawable/bg_search_wheel_background_rect.xml
diff --git a/android/res/drawable-land/bg_circle_panel_night.xml b/android/res/drawable/bg_search_wheel_background_rect_night.xml
similarity index 100%
rename from android/res/drawable-land/bg_circle_panel_night.xml
rename to android/res/drawable/bg_search_wheel_background_rect_night.xml
diff --git a/android/res/drawable/bg_circle_panel.xml b/android/res/drawable/bg_search_wheel_background_round.xml
similarity index 100%
rename from android/res/drawable/bg_circle_panel.xml
rename to android/res/drawable/bg_search_wheel_background_round.xml
diff --git a/android/res/drawable/bg_circle_panel_night.xml b/android/res/drawable/bg_search_wheel_background_round_night.xml
similarity index 100%
rename from android/res/drawable/bg_circle_panel_night.xml
rename to android/res/drawable/bg_search_wheel_background_round_night.xml
diff --git a/android/res/layout-land/map_buttons_layout_navigation.xml b/android/res/layout-h400dp/map_buttons_layout_navigation.xml
similarity index 93%
rename from android/res/layout-land/map_buttons_layout_navigation.xml
rename to android/res/layout-h400dp/map_buttons_layout_navigation.xml
index c0e4253148..a361afd6c2 100644
--- a/android/res/layout-land/map_buttons_layout_navigation.xml
+++ b/android/res/layout-h400dp/map_buttons_layout_navigation.xml
@@ -5,6 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
   tools:background="@color/bg_primary">
   <View
     android:id="@+id/touch_interceptor"
@@ -16,7 +18,7 @@
     android:id="@+id/map_buttons_inner_left"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/action_bar_extended_height"
+    android:layout_marginTop="@dimen/map_buttons_bottom_margin"
     android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
     android:clipChildren="false"
     android:clipToPadding="false"
@@ -28,7 +30,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent" />
     <include
@@ -53,7 +54,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/action_bar_extended_height"
-    android:layout_marginBottom="@dimen/menu_line_height"
+    android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
@@ -72,7 +73,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/res/layout-land/map_buttons_layout_planning.xml b/android/res/layout-h400dp/map_buttons_layout_planning.xml
similarity index 86%
rename from android/res/layout-land/map_buttons_layout_planning.xml
rename to android/res/layout-h400dp/map_buttons_layout_planning.xml
index 0f53774e9d..e87ef2c496 100644
--- a/android/res/layout-land/map_buttons_layout_planning.xml
+++ b/android/res/layout-h400dp/map_buttons_layout_planning.xml
@@ -5,6 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
   tools:background="@color/bg_primary">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_left"
@@ -15,8 +17,7 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toLeftOf="parent">
+    app:layout_constraintStart_toStartOf="parent">
     <include
       layout="@layout/map_buttons_bookmarks"
       android:layout_width="wrap_content"
@@ -42,22 +43,21 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintRight_toRightOf="parent">
+    app:layout_constraintEnd_toEndOf="parent">
     <include
       layout="@layout/map_buttons_zoom"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      app:layout_constraintBottom_toBottomOf="parent"
+      android:layout_marginBottom="@dimen/margin_half"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
       app:layout_constraintEnd_toEndOf="parent" />
     <include
       layout="@layout/map_buttons_myposition"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginEnd="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toStartOf="@+id/zoom_buttons_container" />
+      app:layout_constraintEnd_toEndOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/res/layout-land/map_buttons_layout_regular.xml b/android/res/layout-h400dp/map_buttons_layout_regular.xml
similarity index 95%
rename from android/res/layout-land/map_buttons_layout_regular.xml
rename to android/res/layout-h400dp/map_buttons_layout_regular.xml
index cff7fda11c..ee6753064a 100644
--- a/android/res/layout-land/map_buttons_layout_regular.xml
+++ b/android/res/layout-h400dp/map_buttons_layout_regular.xml
@@ -41,16 +41,16 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      app:layout_constraintBottom_toBottomOf="parent"
+      android:layout_marginBottom="@dimen/margin_half"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
       app:layout_constraintEnd_toEndOf="parent" />
     <include
       layout="@layout/map_buttons_myposition"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginEnd="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toStartOf="@+id/zoom_buttons_container" />
+      app:layout_constraintEnd_toEndOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_bottom"
diff --git a/android/res/layout-land/map_buttons_search_frame.xml b/android/res/layout-h400dp/map_buttons_search_frame.xml
similarity index 66%
rename from android/res/layout-land/map_buttons_search_frame.xml
rename to android/res/layout-h400dp/map_buttons_search_frame.xml
index e3b287bf54..a772fbd692 100644
--- a/android/res/layout-land/map_buttons_search_frame.xml
+++ b/android/res/layout-h400dp/map_buttons_search_frame.xml
@@ -9,52 +9,57 @@
   android:clipToPadding="false"
   android:elevation="6dp"
   android:layoutDirection="ltr"
-  android:theme="?navButtonsTheme">
-  <LinearLayout
+  android:theme="?navButtonsThemeRound">
+  <RelativeLayout
     android:id="@+id/search_frame"
-    android:layout_width="286dp"
-    android:layout_height="48dp"
+    android:layout_width="160dp"
+    android:layout_height="160dp"
     android:layout_alignParentStart="true"
+    android:layout_marginStart="-56dp"
     android:background="?searchLayoutBackground"
     android:elevation="5dp"
-    android:orientation="horizontal"
-    android:padding="@dimen/margin_quarter"
     android:visibility="invisible"
     tools:visibility="visible">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_fuel"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="50dp"
+      android:layout_alignParentTop="true"
+      android:layout_centerHorizontal="true"
+      android:layout_marginStart="@dimen/margin_half_plus"
+      android:layout_marginTop="@dimen/margin_half"
       android:contentDescription="@string/fuel"
       android:src="@drawable/ic_routing_fuel_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_parking"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="@dimen/margin_half"
+      android:layout_marginTop="@dimen/margin_base_plus"
+      android:layout_toEndOf="@id/search_fuel"
       android:contentDescription="@string/parkings"
       android:src="@drawable/ic_routing_parking_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_eat"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="@dimen/margin_half"
+      android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true"
+      android:layout_marginEnd="@dimen/margin_half"
       android:contentDescription="@string/eat"
       android:src="@drawable/ic_routing_eat_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_food"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="@dimen/margin_half"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="@dimen/margin_base_plus"
+      android:layout_toEndOf="@id/search_fuel"
       android:contentDescription="@string/shopping"
       android:src="@drawable/ic_routing_food_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_atm"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="@dimen/margin_half"
+      android:layout_alignParentBottom="true"
+      android:layout_centerHorizontal="true"
+      android:layout_marginStart="@dimen/margin_half_plus"
+      android:layout_marginBottom="@dimen/margin_half"
       android:contentDescription="@string/atm"
       android:src="@drawable/ic_routing_atm_on" />
-  </LinearLayout>
+  </RelativeLayout>
 </RelativeLayout>
diff --git a/android/res/layout/map_buttons_layout_navigation.xml b/android/res/layout/map_buttons_layout_navigation.xml
index 9f8fa08d9f..ad4f432b53 100644
--- a/android/res/layout/map_buttons_layout_navigation.xml
+++ b/android/res/layout/map_buttons_layout_navigation.xml
@@ -5,6 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
   tools:background="@color/bg_primary">
   <View
     android:id="@+id/touch_interceptor"
@@ -16,8 +18,8 @@
     android:id="@+id/map_buttons_inner_left"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/map_buttons_bottom_margin"
-    android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
+    android:layout_marginTop="@dimen/action_bar_extended_height"
+    android:layout_marginBottom="@dimen/nav_menu_height"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
@@ -28,9 +30,9 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
+      android:layout_marginStart="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="parent" />
+      app:layout_constraintStart_toEndOf="@+id/btn_search" />
     <include
       layout="@layout/map_buttons_search_frame"
       android:layout_width="wrap_content"
@@ -44,8 +46,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
-      app:layout_constraintBottom_toTopOf="@+id/btn_bookmarks"
+      app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
   <androidx.constraintlayout.widget.ConstraintLayout
@@ -53,7 +54,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/action_bar_extended_height"
-    android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
+    android:layout_marginBottom="@dimen/nav_menu_height"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
@@ -72,7 +73,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/res/layout/map_buttons_layout_planning.xml b/android/res/layout/map_buttons_layout_planning.xml
index 0ffdd6fadf..fa61856827 100644
--- a/android/res/layout/map_buttons_layout_planning.xml
+++ b/android/res/layout/map_buttons_layout_planning.xml
@@ -5,6 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
   tools:background="@color/bg_primary">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_left"
@@ -15,7 +17,8 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
-    app:layout_constraintStart_toStartOf="parent">
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent">
     <include
       layout="@layout/map_buttons_bookmarks"
       android:layout_width="wrap_content"
@@ -41,21 +44,22 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding"
-    app:layout_constraintEnd_toEndOf="parent">
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintRight_toRightOf="parent">
     <include
       layout="@layout/map_buttons_zoom"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
-      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent" />
     <include
       layout="@layout/map_buttons_myposition"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
+      android:layout_marginEnd="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent" />
+      app:layout_constraintEnd_toStartOf="@+id/zoom_buttons_container" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/res/layout/map_buttons_layout_regular.xml b/android/res/layout/map_buttons_layout_regular.xml
index ab7b0a29b9..cff7fda11c 100644
--- a/android/res/layout/map_buttons_layout_regular.xml
+++ b/android/res/layout/map_buttons_layout_regular.xml
@@ -5,6 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
   tools:background="@color/bg_primary">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_top"
@@ -39,16 +41,16 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_half"
-      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent" />
     <include
       layout="@layout/map_buttons_myposition"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentBottom="true"
+      android:layout_marginEnd="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent" />
+      app:layout_constraintEnd_toStartOf="@+id/zoom_buttons_container" />
   </androidx.constraintlayout.widget.ConstraintLayout>
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_bottom"
diff --git a/android/res/layout/map_buttons_search_frame.xml b/android/res/layout/map_buttons_search_frame.xml
index a4718f7475..f732d853a1 100644
--- a/android/res/layout/map_buttons_search_frame.xml
+++ b/android/res/layout/map_buttons_search_frame.xml
@@ -9,57 +9,52 @@
   android:clipToPadding="false"
   android:elevation="6dp"
   android:layoutDirection="ltr"
-  android:theme="?navButtonsTheme">
-  <RelativeLayout
+  android:theme="?navButtonsThemeRect">
+  <LinearLayout
     android:id="@+id/search_frame"
-    android:layout_width="160dp"
-    android:layout_height="160dp"
+    android:layout_width="286dp"
+    android:layout_height="48dp"
     android:layout_alignParentStart="true"
-    android:layout_marginStart="-56dp"
     android:background="?searchLayoutBackground"
     android:elevation="5dp"
+    android:orientation="horizontal"
+    android:padding="@dimen/margin_quarter"
     android:visibility="invisible"
     tools:visibility="visible">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_fuel"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_alignParentTop="true"
-      android:layout_centerHorizontal="true"
-      android:layout_marginStart="@dimen/margin_half_plus"
-      android:layout_marginTop="@dimen/margin_half"
+      android:layout_gravity="center_vertical"
+      android:layout_marginStart="50dp"
       android:contentDescription="@string/fuel"
       android:src="@drawable/ic_routing_fuel_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_parking"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_marginTop="@dimen/margin_base_plus"
-      android:layout_toEndOf="@id/search_fuel"
+      android:layout_gravity="center_vertical"
+      android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/parkings"
       android:src="@drawable/ic_routing_parking_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_eat"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_alignParentEnd="true"
-      android:layout_centerVertical="true"
-      android:layout_marginEnd="@dimen/margin_half"
+      android:layout_gravity="center_vertical"
+      android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/eat"
       android:src="@drawable/ic_routing_eat_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_food"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_alignParentBottom="true"
-      android:layout_marginBottom="@dimen/margin_base_plus"
-      android:layout_toEndOf="@id/search_fuel"
+      android:layout_gravity="center_vertical"
+      android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/shopping"
       android:src="@drawable/ic_routing_food_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_atm"
       style="@style/MwmWidget.MapButton.Search"
-      android:layout_alignParentBottom="true"
-      android:layout_centerHorizontal="true"
-      android:layout_marginStart="@dimen/margin_half_plus"
-      android:layout_marginBottom="@dimen/margin_half"
+      android:layout_gravity="center_vertical"
+      android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/atm"
       android:src="@drawable/ic_routing_atm_on" />
-  </RelativeLayout>
+  </LinearLayout>
 </RelativeLayout>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index d6eca6cb95..0e5a2387e6 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -133,6 +133,7 @@
   <dimen name="nav_icon_size">48dp</dimen>
   <dimen name="nav_bottom_gap">12dp</dimen>
   <dimen name="nav_menu_top_offset">0dp</dimen>
+  <dimen name="nav_menu_height">70sp</dimen>
   <dimen name="nav_numbers_height">54sp</dimen>
   <dimen name="nav_menu_content_height">64dp</dimen>
   <dimen name="nav_menu_landscape_width">360dp</dimen>
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index b8d09e3bb9..f2edbb1b54 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -46,7 +46,8 @@
     <attr name="myPositionButtonAnimation" format="reference" />
     <attr name="wheelPendingAnimation" format="reference" />
     <attr name="trafficLoadingAnimation" format="reference" />
-    <attr name="navButtonsTheme" format="reference" />
+    <attr name="navButtonsThemeRect" format="reference" />
+    <attr name="navButtonsThemeRound" format="reference" />
     <attr name="downloaderTheme" format="reference" />
     <attr name="navigationTheme" format="reference" />
     <attr name="fabAdd" format="reference" />
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index ca47b615d1..8d8a720bfa 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -76,7 +76,8 @@
     <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
     <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading</item>
 
-    <item name="navButtonsTheme">@style/MwmTheme.NavButtons</item>
+    <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect</item>
+    <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound</item>
     <item name="downloaderTheme">@style/MwmTheme.Downloader</item>
     <item name="navigationTheme">@style/MwmTheme.Navigation</item>
 
@@ -252,7 +253,8 @@
     <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
     <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
 
-    <item name="navButtonsTheme">@style/MwmTheme.NavButtons.Night</item>
+    <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
+    <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
     <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
     <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
 
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 29a130c14b..7cce3ae197 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -160,12 +160,20 @@
     <item name="status_folder_done">@drawable/ic_downloader_folder_done_night</item>
   </style>
 
-  <style name="MwmTheme.NavButtons">
-    <item name="searchLayoutBackground">@drawable/bg_circle_panel</item>
+  <style name="MwmTheme.NavButtonsRound">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round</item>
   </style>
 
-  <style name="MwmTheme.NavButtons.Night" parent="MwmTheme.Night">
-    <item name="searchLayoutBackground">@drawable/bg_circle_panel_night</item>
+  <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+  </style>
+
+  <style name="MwmTheme.NavButtonsRect">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect</item>
+  </style>
+
+  <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
   </style>
 
   <style name="MwmTheme.Navigation">
diff --git a/android/src/com/mapswithme/maps/maplayer/SearchWheel.java b/android/src/com/mapswithme/maps/maplayer/SearchWheel.java
index d50ec6f226..29bd6621a2 100644
--- a/android/src/com/mapswithme/maps/maplayer/SearchWheel.java
+++ b/android/src/com/mapswithme/maps/maplayer/SearchWheel.java
@@ -3,9 +3,13 @@ package com.mapswithme.maps.maplayer;
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
 import android.content.Context;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.view.View;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
 import android.widget.ImageView;
 
 import androidx.annotation.DrawableRes;
@@ -20,7 +24,7 @@ import com.mapswithme.maps.search.SearchEngine;
 import com.mapswithme.util.Graphics;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.concurrency.UiThread;
-
+import com.mapswithme.util.log.Logger;
 
 public class SearchWheel implements View.OnClickListener
 {
@@ -125,11 +129,18 @@ public class SearchWheel implements View.OnClickListener
       mSearchLayout = mFrame.findViewById(R.id.search_frame);
       if (mSearchLayout != null)
       {
-        if (UiUtils.isLandscape(mFrame.getContext()))
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        WindowManager windowmanager = (WindowManager) mFrame.getContext().getSystemService(Context.WINDOW_SERVICE);
+        windowmanager.getDefaultDisplay().getMetrics(displayMetrics);
+        // Get available screen height in DP
+        int height =  Math.round(displayMetrics.heightPixels / displayMetrics.density);
+        // If height is less than 400dp, the search wheel in a straight line
+        // In this case, move the pivot for the animation
+        if (height < 400)
         {
           UiUtils.waitLayout(mSearchLayout, () -> {
             mSearchLayout.setPivotX(0);
-            mSearchLayout.setPivotY(mSearchLayout.getMeasuredHeight() / 2);
+            mSearchLayout.setPivotY(mSearchLayout.getMeasuredHeight() / 2f);
           });
         }
         for (SearchOption searchOption : SearchOption.values())