diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
index 0655bec5a..658272843 100644
--- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
@@ -6,13 +6,15 @@ import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+
+import com.google.android.material.imageview.ShapeableImageView;
+
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 
@@ -20,7 +22,7 @@ public class PlaceholderView extends LinearLayout
 {
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private ImageView mImage;
+  private ShapeableImageView mImage;
 
   @SuppressWarnings("NullableProblems")
   @NonNull
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index bd29be8e0..52f52058e 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -17,7 +17,6 @@ import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import androidx.activity.result.ActivityResultLauncher;
@@ -79,6 +78,7 @@ import app.organicmaps.widget.placepage.sections.PlacePageTrackFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.time.Instant;
 import java.time.ZoneId;
@@ -148,9 +148,9 @@ public class PlacePageView extends Fragment
   private View mAddOrganisation;
   private View mAddPlace;
   private View mEditTopSpace;
-  private ImageView mColorIcon;
+  private ShapeableImageView mColorIcon;
   private MaterialTextView mTvCategory;
-  private ImageView mEditBookmark;
+  private ShapeableImageView mEditBookmark;
 
   // Data
   private CoordinatesFormat mCoordsFormat = CoordinatesFormat.LatLonDecimal;
diff --git a/android/app/src/main/res/layout/current_location_marker.xml b/android/app/src/main/res/layout/current_location_marker.xml
index 50ec2a1c5..b2e8b4c35 100644
--- a/android/app/src/main/res/layout/current_location_marker.xml
+++ b/android/app/src/main/res/layout/current_location_marker.xml
@@ -19,7 +19,7 @@
     android:text="you"
     android:textColor="@color/base_accent"
     android:textSize="@dimen/text_size_icon_title" />
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/image"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/elevation_profile_internal.xml b/android/app/src/main/res/layout/elevation_profile_internal.xml
index 174fbbcd4..28bf829b7 100644
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:layout_width="@dimen/margin_base_plus_quarter"
           android:layout_height="wrap_content"
           android:layout_marginEnd="@dimen/margin_quarter"
@@ -85,7 +85,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:layout_width="@dimen/margin_base_plus_quarter"
           android:layout_height="wrap_content"
           android:layout_marginEnd="@dimen/margin_quarter"
@@ -123,7 +123,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="@dimen/margin_quarter"
@@ -161,7 +161,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="@dimen/margin_half"
diff --git a/android/app/src/main/res/layout/floating_marker_view.xml b/android/app/src/main/res/layout/floating_marker_view.xml
index aac3f4477..9ca756788 100644
--- a/android/app/src/main/res/layout/floating_marker_view.xml
+++ b/android/app/src/main/res/layout/floating_marker_view.xml
@@ -7,7 +7,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   tools:background="@color/black_54"
   tools:ignore="Overdraw">
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/image"
     android:layout_width="@dimen/elevation_profile_marker_width"
     android:layout_height="@dimen/elevation_profile_marker_width"
@@ -22,7 +22,7 @@
     android:layout_toEndOf="@id/image"
     android:clipChildren="false"
     tools:ignore="UnusedAttribute">
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/floating_triangle"
       android:layout_width="@dimen/margin_half"
       android:layout_height="@dimen/margin_base"
@@ -43,7 +43,7 @@
       android:maxWidth="@dimen/dialog_min_height"
       android:padding="@dimen/margin_quarter_plus"
       tools:ignore="UnusedAttribute">
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/distance_icon"
         android:layout_width="@dimen/margin_half_plus"
         android:layout_height="@dimen/margin_half_plus"
@@ -68,7 +68,7 @@
         android:layout_alignParentBottom="true"
         android:gravity="center_vertical"
         android:orientation="horizontal">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/triangle"
           android:layout_width="@dimen/margin_half_plus_eight"
           android:layout_height="@dimen/margin_half_plus_eight"
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 3f02ba131..7f11cb92c 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -192,7 +192,7 @@
       android:layout_height="wrap_content"
       android:background="?ppBackground"
       android:orientation="horizontal">
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/item_icon"
         android:layout_width="@dimen/place_page_icon_size"
         android:layout_height="@dimen/place_page_icon_size"
@@ -217,7 +217,7 @@
         android:background="?clickableBackground"
         android:textAllCaps="false"
         tools:text="@string/categories" />
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/edit_Bookmark"
         style="@style/MwmWidget.Editor.MetadataIcon"
         android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/placeholder_image.xml b/android/app/src/main/res/layout/placeholder_image.xml
index 479ffb61a..0280655a0 100644
--- a/android/app/src/main/res/layout/placeholder_image.xml
+++ b/android/app/src/main/res/layout/placeholder_image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
+<com.google.android.material.imageview.ShapeableImageView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/image"
diff --git a/android/app/src/main/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml
index 1c9e34cee..d8959e6ff 100644
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -28,7 +28,7 @@
         android:text="@string/editor_add_select_location"
         android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
 
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         app:tint="@color/image_view"
         android:id="@+id/done"
         app:srcCompat="@drawable/ic_done"
diff --git a/android/app/src/main/res/layout/shadow_bottom.xml b/android/app/src/main/res/layout/shadow_bottom.xml
index fbbe97ed3..d7294cc28 100644
--- a/android/app/src/main/res/layout/shadow_bottom.xml
+++ b/android/app/src/main/res/layout/shadow_bottom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
+<com.google.android.material.imageview.ShapeableImageView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/android/app/src/main/res/layout/shadow_top.xml b/android/app/src/main/res/layout/shadow_top.xml
index 50e365575..1db915711 100644
--- a/android/app/src/main/res/layout/shadow_top.xml
+++ b/android/app/src/main/res/layout/shadow_top.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
+<com.google.android.material.imageview.ShapeableImageView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   xmlns:app="http://schemas.android.com/apk/res-auto"