diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
index 150be733f..f95144ced 100644
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
@@ -3,14 +3,15 @@ package app.organicmaps.util.bottomsheet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.location.TrackRecorder;
 import app.organicmaps.util.Config;
@@ -49,7 +50,7 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
   public void onBindViewHolder(ViewHolder viewHolder, final int position)
   {
     final MenuBottomSheetItem item = dataSet.get(position);
-    final ImageView iv = viewHolder.getIconImageView();
+    final ShapeableImageView iv = viewHolder.getIconImageView();
     if (item.iconRes == R.drawable.ic_donate && Config.isNY())
     {
       iv.setImageResource(R.drawable.ic_christmas_tree);
@@ -59,7 +60,7 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
       iv.setImageResource(item.iconRes);
     viewHolder.getContainer().setOnClickListener((v) -> onMenuItemClick(item));
     viewHolder.getTitleTextView().setText(item.titleRes);
-    TextView badge = viewHolder.getBadgeTextView();
+    MaterialTextView badge = viewHolder.getBadgeTextView();
     if (item.badgeCount > 0)
     {
       badge.setText(String.valueOf(item.badgeCount));
@@ -87,9 +88,9 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
   public static class ViewHolder extends RecyclerView.ViewHolder
   {
     private final LinearLayout container;
-    private final ImageView iconImageView;
-    private final TextView titleTextView;
-    private final TextView badgeTextView;
+    private final ShapeableImageView iconImageView;
+    private final MaterialTextView titleTextView;
+    private final MaterialTextView badgeTextView;
 
     public ViewHolder(View view)
     {
@@ -100,17 +101,17 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
       badgeTextView = view.findViewById(R.id.bottom_sheet_menu_item_badge);
     }
 
-    public ImageView getIconImageView()
+    public ShapeableImageView getIconImageView()
     {
       return iconImageView;
     }
 
-    public TextView getTitleTextView()
+    public MaterialTextView getTitleTextView()
     {
       return titleTextView;
     }
 
-    public TextView getBadgeTextView()
+    public MaterialTextView getBadgeTextView()
     {
       return badgeTextView;
     }
diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
index ebe79f409..56c5626e7 100644
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -7,7 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -20,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.textview.MaterialTextView;
 
 import java.util.ArrayList;
 import java.util.Objects;
@@ -93,7 +93,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
   {
     super.onViewCreated(view, savedInstanceState);
     attachToNearestContext();
-    TextView titleView = view.findViewById(R.id.bottomSheetTitle);
+    MaterialTextView titleView = view.findViewById(R.id.bottomSheetTitle);
     RecyclerView recyclerView = view.findViewById(R.id.bottomSheetMenuContainer);
     if (getArguments() != null)
     {
diff --git a/android/app/src/main/res/layout/bottom_sheet.xml b/android/app/src/main/res/layout/bottom_sheet.xml
index d3eca7902..84b27dc35 100644
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -13,7 +13,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/bottomSheetTitle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/bottom_sheet_handle.xml b/android/app/src/main/res/layout/bottom_sheet_handle.xml
index 67c3bcfff..d92c9def9 100644
--- a/android/app/src/main/res/layout/bottom_sheet_handle.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_handle.xml
@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:layout_width="match_parent"
     android:layout_height="4dp"
     android:layout_marginTop="@dimen/margin_quarter"
diff --git a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
index f636d6f18..a0a6f33c1 100644
--- a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -11,14 +11,14 @@
   android:background="?clickableBackground"
   android:orientation="horizontal">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/bottom_sheet_menu_item_icon"
     android:layout_width="@dimen/bookmark_icon_size"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
     tools:src="@drawable/ic_menu_download"
     app:tint="?android:textColorSecondary"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/bottom_sheet_menu_item_text"
     android:textAppearance="@style/MwmTextAppearance.Body1"
     android:layout_width="0dp"
@@ -29,7 +29,7 @@
     android:gravity="center_vertical"
     android:singleLine="true"
     tools:text="Menu Item" />
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/bottom_sheet_menu_item_badge"
     style="@style/MwmWidget.Counter"
     android:layout_gravity="end|center_vertical"