diff --git a/android/app/src/main/res/layout-land/map_buttons_bottom.xml b/android/app/src/main/res/layout-land/map_buttons_bottom.xml
index 2aaba0ffb..50cf34565 100644
--- a/android/app/src/main/res/layout-land/map_buttons_bottom.xml
+++ b/android/app/src/main/res/layout-land/map_buttons_bottom.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/map_buttons_bottom"
-  style="@style/MwmWidget.MapButton.Bottom"
+  style="@style/MwmWidget.M3.FAB.MapButton.Bottom"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:clipChildren="false"
diff --git a/android/app/src/main/res/layout/map_buttons_bookmarks.xml b/android/app/src/main/res/layout/map_buttons_bookmarks.xml
index cb5350c15..87ed180c8 100644
--- a/android/app/src/main/res/layout/map_buttons_bookmarks.xml
+++ b/android/app/src/main/res/layout/map_buttons_bookmarks.xml
@@ -3,6 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/btn_bookmarks"
-  style="@style/MwmWidget.MapButton"
+  android:tint="?iconTint"
+  style="@style/MwmWidget.M3.FAB.MapButton"
   android:contentDescription="@string/bookmarks"
-  app:srcCompat="@drawable/ic_bookmarks" />
\ No newline at end of file
+  app:srcCompat="@drawable/ic_bookmarks"
+  app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton" />
diff --git a/android/app/src/main/res/layout/map_buttons_bottom.xml b/android/app/src/main/res/layout/map_buttons_bottom.xml
index 8d9a79bed..bcc4e98ce 100644
--- a/android/app/src/main/res/layout/map_buttons_bottom.xml
+++ b/android/app/src/main/res/layout/map_buttons_bottom.xml
@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
   <androidx.constraintlayout.widget.ConstraintLayout
-    style="@style/MwmWidget.MapButton.Bottom"
+    style="@style/MwmWidget.M3.FAB.MapButton.Bottom"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_centerInParent="true"
diff --git a/android/app/src/main/res/layout/map_buttons_myposition.xml b/android/app/src/main/res/layout/map_buttons_myposition.xml
index 281ff3ca8..2a60d74dd 100644
--- a/android/app/src/main/res/layout/map_buttons_myposition.xml
+++ b/android/app/src/main/res/layout/map_buttons_myposition.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.floatingactionbutton.FloatingActionButton
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/my_position"
-  style="@style/MwmWidget.MapButton"
-  android:contentDescription="@string/core_my_position" />
\ No newline at end of file
+  android:tint="?iconTint"
+  style="@style/MwmWidget.M3.FAB.MapButton"
+  android:contentDescription="@string/core_my_position"
+  app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton" />
diff --git a/android/app/src/main/res/layout/map_buttons_search.xml b/android/app/src/main/res/layout/map_buttons_search.xml
index 5ba5a345c..019d8f4b2 100644
--- a/android/app/src/main/res/layout/map_buttons_search.xml
+++ b/android/app/src/main/res/layout/map_buttons_search.xml
@@ -3,6 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/btn_search"
-  style="@style/MwmWidget.MapButton"
+  android:tint="?iconTint"
+  style="@style/MwmWidget.M3.FAB.MapButton"
   android:contentDescription="@string/search"
-  app:srcCompat="@drawable/ic_search" />
\ No newline at end of file
+  app:srcCompat="@drawable/ic_search"
+  app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton" />
diff --git a/android/app/src/main/res/layout/map_buttons_zoom.xml b/android/app/src/main/res/layout/map_buttons_zoom.xml
index 8da071c0a..0bb7a75d9 100644
--- a/android/app/src/main/res/layout/map_buttons_zoom.xml
+++ b/android/app/src/main/res/layout/map_buttons_zoom.xml
@@ -8,13 +8,17 @@
   android:orientation="vertical">
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_in"
-    style="@style/MwmWidget.MapButton.Zoom"
+    style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
+    android:tint="?iconTint"
     app:srcCompat="@drawable/ic_plus"
+    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
     android:layout_marginBottom="@dimen/margin_half"
     android:contentDescription="@string/zoom_in"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_out"
-    style="@style/MwmWidget.MapButton.Zoom"
+    style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
+    android:tint="?iconTint"
     app:srcCompat="@drawable/ic_minus"
+    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
     android:contentDescription="@string/zoom_out"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index de7efbcd1..e6a6fd847 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -432,4 +432,13 @@
   <style name="MwmWidget.M3.FAB.MapButton.Square">
     <item name="backgroundTint">?menuBackground</item>
   </style>
+
+  <style name="MwmWidget.M3.FAB.MapButton.Zoom">
+    <item name="maxImageSize">34dp</item>
+  </style>
+
+  <style name="MwmWidget.M3.FAB.MapButton.Bottom">
+    <item name="android:maxWidth">@dimen/map_buttons_bottom_max_width</item>
+    <item name="android:padding">@dimen/nav_frame_padding</item>
+  </style>
 </resources>