diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
index 800611b5f..ddc93bbe1 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
@@ -4,8 +4,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
@@ -15,6 +13,10 @@ import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
@@ -109,8 +111,8 @@ public final class PlacePageButtons extends Fragment implements Observer<List<Pl
     LayoutInflater inflater = LayoutInflater.from(requireContext());
     View parent = inflater.inflate(R.layout.place_page_button, mButtonsContainer, false);
 
-    ImageView icon = parent.findViewById(R.id.icon);
-    TextView title = parent.findViewById(R.id.title);
+    ShapeableImageView icon = parent.findViewById(R.id.icon);
+    MaterialTextView title = parent.findViewById(R.id.title);
 
     title.setText(current.getTitle());
     parent.setContentDescription(getString(current.getTitle()));
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 50d0b3fde..f47e0e297 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
@@ -13,7 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -49,11 +48,11 @@ import app.organicmaps.widget.placepage.sections.PlacePageBookmarkFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageLinksFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageOpeningHoursFragment;
 import app.organicmaps.widget.placepage.sections.PlacePagePhoneFragment;
-import app.organicmaps.widget.placepage.sections.PlacePageProductsFragment;
 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.textview.MaterialTextView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -88,38 +87,38 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   // Preview.
   private ViewGroup mPreview;
   private MaterialToolbar mToolbar;
-  private TextView mTvTitle;
-  private TextView mTvSecondaryTitle;
-  private TextView mTvSubtitle;
+  private MaterialTextView mTvTitle;
+  private MaterialTextView mTvSecondaryTitle;
+  private MaterialTextView mTvSubtitle;
   private ArrowView mAvDirection;
-  private TextView mTvDistance;
-  private TextView mTvAddress;
+  private MaterialTextView mTvDistance;
+  private MaterialTextView mTvAddress;
   // Details.
-  private TextView mTvLatlon;
+  private MaterialTextView mTvLatlon;
   private View mWifi;
-  private TextView mTvWiFi;
+  private MaterialTextView mTvWiFi;
   private View mOperator;
-  private TextView mTvOperator;
+  private MaterialTextView mTvOperator;
   private View mNetwork;
-  private TextView mTvNetwork;
+  private MaterialTextView mTvNetwork;
   private View mLevel;
-  private TextView mTvLevel;
+  private MaterialTextView mTvLevel;
   private View mAtm;
-  private TextView mTvAtm;
+  private MaterialTextView mTvAtm;
   private View mCapacity;
-  private TextView mTvCapacity;
+  private MaterialTextView mTvCapacity;
   private View mWheelchair;
-  private TextView mTvWheelchair;
+  private MaterialTextView mTvWheelchair;
   private View mDriveThrough;
-  private TextView mTvDriveThrough;
+  private MaterialTextView mTvDriveThrough;
   private View mSelfService;
-  private TextView mTvSelfService;
+  private MaterialTextView mTvSelfService;
   private View mCuisine;
-  private TextView mTvCuisine;
+  private MaterialTextView mTvCuisine;
   private View mOutdoorSeating;
-  private TextView mTvOutdoorSeating;
+  private MaterialTextView mTvOutdoorSeating;
   private View mEntrance;
-  private TextView mTvEntrance;
+  private MaterialTextView mTvEntrance;
   private View mEditPlace;
   private View mAddOrganisation;
   private View mAddPlace;
@@ -129,7 +128,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   private CoordinatesFormat mCoordsFormat = CoordinatesFormat.LatLonDecimal;
   // Downloader`s stuff
   private DownloaderStatusIcon mDownloaderIcon;
-  private TextView mDownloaderInfo;
+  private MaterialTextView mDownloaderInfo;
   private int mStorageCallbackSlot;
   @Nullable
   private CountryItem mCurrentCountry;
@@ -161,7 +160,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   private PlacePageViewModel mViewModel;
   private MapObject mMapObject;
 
-  private static void refreshMetadataOrHide(@Nullable String metadata, @NonNull View metaLayout, @NonNull TextView metaTv)
+  private static void refreshMetadataOrHide(@Nullable String metadata, @NonNull View metaLayout, @NonNull MaterialTextView metaTv)
   {
     if (!TextUtils.isEmpty(metadata))
     {
@@ -481,9 +480,9 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
       mEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
       mAddOrganisation.setEnabled(Editor.nativeShouldEnableAddPlace());
       mAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
-      TextView mTvEditPlace = mEditPlace.findViewById(R.id.tv__editor);
-      TextView mTvAddBusiness = mAddPlace.findViewById(R.id.tv__editor);
-      TextView mTvAddPlace = mAddPlace.findViewById(R.id.tv__editor);
+      MaterialTextView mTvEditPlace = mEditPlace.findViewById(R.id.tv__editor);
+      MaterialTextView mTvAddBusiness = mAddPlace.findViewById(R.id.tv__editor);
+      MaterialTextView mTvAddPlace = mAddPlace.findViewById(R.id.tv__editor);
       final int editPlaceButtonColor = Editor.nativeShouldEnableEditPlace() ? ContextCompat.getColor(getContext(), UiUtils.getStyledResourceId(getContext(), androidx.appcompat.R.attr.colorAccent)) : getResources().getColor(R.color.button_accent_text_disabled);
       mTvEditPlace.setTextColor(editPlaceButtonColor);
       mTvAddBusiness.setTextColor(editPlaceButtonColor);
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
index 1e35949f5..f4df69956 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
@@ -3,7 +3,6 @@ package app.organicmaps.widget.placepage.sections;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -21,6 +20,8 @@ import java.util.List;
 import static app.organicmaps.editor.data.TimeFormatUtils.formatNonBusinessTime;
 import static app.organicmaps.editor.data.TimeFormatUtils.formatWeekdaysRange;
 
+import com.google.android.material.textview.MaterialTextView;
+
 public class PlaceOpeningHoursAdapter extends RecyclerView.Adapter<PlaceOpeningHoursAdapter.ViewHolder>
 {
   private List<WeekScheduleData> mWeekSchedule = Collections.emptyList();
@@ -161,9 +162,9 @@ public class PlaceOpeningHoursAdapter extends RecyclerView.Adapter<PlaceOpeningH
 
   public static class ViewHolder extends RecyclerView.ViewHolder
   {
-    private final TextView mWeekdays;
-    private final TextView mOpenTime;
-    private final TextView mNonBusinessTime;
+    private final MaterialTextView mWeekdays;
+    private final MaterialTextView mOpenTime;
+    private final MaterialTextView mNonBusinessTime;
 
     public ViewHolder(@NonNull View itemView)
     {
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
index 88ccf2345..146efd757 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -13,7 +13,6 @@ import android.view.ViewGroup;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -21,6 +20,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.Bookmark;
 import app.organicmaps.bookmarks.data.BookmarkManager;
@@ -37,7 +39,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
                                                                    EditBookmarkFragment.EditBookmarkListener
 {
   private View mFrame;
-  private TextView mTvBookmarkNote;
+  private MaterialTextView mTvBookmarkNote;
   @Nullable
   private WebView mWvBookmarkNote;
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
index 9892cdda9..bc7eb5b1d 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
@@ -5,7 +5,6 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -27,43 +26,45 @@ import java.util.List;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
+import com.google.android.material.textview.MaterialTextView;
+
 public class PlacePageLinksFragment extends Fragment implements Observer<MapObject>
 {
   private static final String TAG = PlacePageLinksFragment.class.getSimpleName();
 
   private View mFrame;
   private View mFacebookPage;
-  private TextView mTvFacebookPage;
+  private MaterialTextView mTvFacebookPage;
   private View mInstagramPage;
-  private TextView mTvInstagramPage;
+  private MaterialTextView mTvInstagramPage;
   private View mTwitterPage;
-  private TextView mTvTwitterPage;
+  private MaterialTextView mTvTwitterPage;
   private View mFediversePage;
-  private TextView mTvFediversePage;
+  private MaterialTextView mTvFediversePage;
   private View mBlueskyPage;
-  private TextView mTvBlueskyPage;
+  private MaterialTextView mTvBlueskyPage;
   private View mVkPage;
-  private TextView mTvVkPage;
+  private MaterialTextView mTvVkPage;
   private View mLinePage;
-  private TextView mTvLinePage;
+  private MaterialTextView mTvLinePage;
 
   private View mWebsite;
-  private TextView mTvWebsite;
+  private MaterialTextView mTvWebsite;
   private View mWebsiteMenu;
-  private TextView mTvWebsiteMenuSubsite;
+  private MaterialTextView mTvWebsiteMenuSubsite;
   private View mEmail;
-  private TextView mTvEmail;
+  private MaterialTextView mTvEmail;
   private View mWikimedia;
-  private TextView mTvWikimedia;
+  private MaterialTextView mTvWikimedia;
 
   private View mPanoramax;
-  private TextView mTvPanoramax;
+  private MaterialTextView mTvPanoramax;
 
   private PlacePageViewModel mViewModel;
   private MapObject mMapObject;
 
   private static void refreshMetadataOrHide(@Nullable String metadata, @NonNull View metaLayout,
-                                            @NonNull TextView metaTv)
+                                            @NonNull MaterialTextView metaTv)
   {
     if (!TextUtils.isEmpty(metadata))
     {
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
index 5ad5cf75e..8842fea8b 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
@@ -15,6 +14,9 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.Metadata;
@@ -34,9 +36,9 @@ import java.util.Locale;
 public class PlacePageOpeningHoursFragment extends Fragment implements Observer<MapObject>
 {
   private View mFrame;
-  private TextView mTodayLabel;
-  private TextView mTodayOpenTime;
-  private TextView mTodayNonBusinessTime;
+  private MaterialTextView mTodayLabel;
+  private MaterialTextView mTodayOpenTime;
+  private MaterialTextView mTodayNonBusinessTime;
   private RecyclerView mFullWeekOpeningHours;
   private PlaceOpeningHoursAdapter mOpeningHoursAdapter;
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
index 558568c09..b86c395ed 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
@@ -7,13 +7,15 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.Metadata;
@@ -29,7 +31,7 @@ public class PlacePageWikipediaFragment extends Fragment implements Observer<Map
   private View mWiki;
   private View mPlaceDescriptionViewContainer;
 
-  private TextView mPlaceDescriptionView;
+  private MaterialTextView mPlaceDescriptionView;
 
   private PlacePageViewModel mViewModel;
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
index af562d704..36c4ed2ea 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
@@ -7,10 +7,12 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 
@@ -61,7 +63,7 @@ public class PlacePhoneAdapter extends RecyclerView.Adapter<PlacePhoneAdapter.Vi
 
   public static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener
   {
-    private final TextView mPhone;
+    private final MaterialTextView mPhone;
 
     public ViewHolder(@NonNull View itemView)
     {
diff --git a/android/app/src/main/res/layout/place_page_add.xml b/android/app/src/main/res/layout/place_page_add.xml
index 83cb7dada..8a02fff0f 100644
--- a/android/app/src/main/res/layout/place_page_add.xml
+++ b/android/app/src/main/res/layout/place_page_add.xml
@@ -6,7 +6,7 @@
   style="@style/PlacePageItemFrame"
   tools:visibility="visible">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__editor"
     style="@style/PlacePageMetadataText.Button"
     android:text="@string/placepage_add_place_button"
diff --git a/android/app/src/main/res/layout/place_page_add_business.xml b/android/app/src/main/res/layout/place_page_add_business.xml
index 7d3b1f08c..f5f99350b 100644
--- a/android/app/src/main/res/layout/place_page_add_business.xml
+++ b/android/app/src/main/res/layout/place_page_add_business.xml
@@ -7,7 +7,7 @@
   android:visibility="visible"
   tools:visibility="visible">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__editor"
     style="@style/PlacePageMetadataText.Button"
     android:gravity="center"
diff --git a/android/app/src/main/res/layout/place_page_atm.xml b/android/app/src/main/res/layout/place_page_atm.xml
index 233ca7f1c..71febb6eb 100644
--- a/android/app/src/main/res/layout/place_page_atm.xml
+++ b/android/app/src/main/res/layout/place_page_atm.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_atm"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_atm_white" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_atm"
     style="@style/PlacePageMetadataText"
     tools:text="@string/type.amenity.atm" />
diff --git a/android/app/src/main/res/layout/place_page_bluesky.xml b/android/app/src/main/res/layout/place_page_bluesky.xml
index 43f521945..a289defed 100644
--- a/android/app/src/main/res/layout/place_page_bluesky.xml
+++ b/android/app/src/main/res/layout/place_page_bluesky.xml
@@ -9,13 +9,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_bluesky"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_bluesky_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_bluesky_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
index 57df32021..62a4fd16d 100644
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -7,7 +7,7 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__bookmark_notes"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -18,7 +18,7 @@
     android:textAppearance="?android:attr/textAppearance"
     tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__bookmark_edit"
       style="@style/PlacePageMetadataText.Button"
       android:gravity="center"
diff --git a/android/app/src/main/res/layout/place_page_button.xml b/android/app/src/main/res/layout/place_page_button.xml
index f21462439..b4b8b4741 100644
--- a/android/app/src/main/res/layout/place_page_button.xml
+++ b/android/app/src/main/res/layout/place_page_button.xml
@@ -7,13 +7,13 @@
   tools:layout_height="@dimen/place_page_buttons_height"
   tools:ignore="UseCompoundDrawables"
   tools:background="#40202020">
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/icon"
     style="@style/PlacePageButtonImage"
     android:contentDescription="@string/back"
     tools:src="@drawable/ic_share"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/title"
     style="@style/PlacePageButtonText"
     tools:text="@string/back"/>
diff --git a/android/app/src/main/res/layout/place_page_capacity.xml b/android/app/src/main/res/layout/place_page_capacity.xml
index 5e0f05070..51af664d5 100644
--- a/android/app/src/main/res/layout/place_page_capacity.xml
+++ b/android/app/src/main/res/layout/place_page_capacity.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_capacity"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_capacity_white" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_capacity"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_cuisine.xml b/android/app/src/main/res/layout/place_page_cuisine.xml
index 242134ec9..2e9b58014 100644
--- a/android/app/src/main/res/layout/place_page_cuisine.xml
+++ b/android/app/src/main/res/layout/place_page_cuisine.xml
@@ -8,14 +8,14 @@
   tools:visibility="visible"
   tools:ignore="UseCompoundDrawables">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="@dimen/margin_base"
     app:tint="?iconTint"
     app:srcCompat="@drawable/ic_cuisine"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_cuisine"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_description_layout.xml b/android/app/src/main/res/layout/place_page_description_layout.xml
index 9b0175b49..f33131135 100644
--- a/android/app/src/main/res/layout/place_page_description_layout.xml
+++ b/android/app/src/main/res/layout/place_page_description_layout.xml
@@ -9,7 +9,7 @@
   android:visibility="visible"
   tools:visibility="visible">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/poi_description"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
     tools:text="asdasdadadasdasdasdasdasdasdasdadas"
     tools:ignore="UnusedAttribute"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/more_btn"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_drive_through.xml b/android/app/src/main/res/layout/place_page_drive_through.xml
index aa58ab7e1..5a7b67707 100644
--- a/android/app/src/main/res/layout/place_page_drive_through.xml
+++ b/android/app/src/main/res/layout/place_page_drive_through.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_drive_through"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_drive_through_white" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_drive_through"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_editor.xml b/android/app/src/main/res/layout/place_page_editor.xml
index 4aefc83fd..5e6ba47df 100644
--- a/android/app/src/main/res/layout/place_page_editor.xml
+++ b/android/app/src/main/res/layout/place_page_editor.xml
@@ -5,7 +5,7 @@
   android:id="@+id/ll__place_editor"
   style="@style/PlacePageItemFrame"
   tools:visibility="visible">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__editor"
     style="@style/PlacePageMetadataText.Button"
     android:gravity="center"
diff --git a/android/app/src/main/res/layout/place_page_email.xml b/android/app/src/main/res/layout/place_page_email.xml
index 7e6d4b397..4feb01da5 100644
--- a/android/app/src/main/res/layout/place_page_email.xml
+++ b/android/app/src/main/res/layout/place_page_email.xml
@@ -8,13 +8,13 @@
   tools:background="#200000FF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_email"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_email"
     app:tint="?colorAccent" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_email"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_entrance.xml b/android/app/src/main/res/layout/place_page_entrance.xml
index b80fb55bc..7e8e31dcb 100644
--- a/android/app/src/main/res/layout/place_page_entrance.xml
+++ b/android/app/src/main/res/layout/place_page_entrance.xml
@@ -7,11 +7,11 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   tools:background="#40FF0000"
   tools:visibility="visible">
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_entrance"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_entrance"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_facebook.xml b/android/app/src/main/res/layout/place_page_facebook.xml
index fcb618fa2..2175af308 100644
--- a/android/app/src/main/res/layout/place_page_facebook.xml
+++ b/android/app/src/main/res/layout/place_page_facebook.xml
@@ -7,13 +7,13 @@
   style="@style/PlacePageItemFrame"
   tools:background="#20FF0000"
   tools:visibility="visible">
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_facebook"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_facebook_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_facebook_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_fat_shadow.xml b/android/app/src/main/res/layout/place_page_fat_shadow.xml
index e97543104..7a8fe3ac9 100644
--- a/android/app/src/main/res/layout/place_page_fat_shadow.xml
+++ b/android/app/src/main/res/layout/place_page_fat_shadow.xml
@@ -7,7 +7,7 @@
   <android.widget.Space
     android:layout_width="match_parent"
     android:layout_height="@dimen/margin_half"/>
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:srcCompat="@drawable/shadow_card"
diff --git a/android/app/src/main/res/layout/place_page_fediverse.xml b/android/app/src/main/res/layout/place_page_fediverse.xml
index c54d57fc1..66f40a0c8 100644
--- a/android/app/src/main/res/layout/place_page_fediverse.xml
+++ b/android/app/src/main/res/layout/place_page_fediverse.xml
@@ -9,13 +9,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_fediverse"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_mastodon_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_fediverse_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_instagram.xml b/android/app/src/main/res/layout/place_page_instagram.xml
index 3268463eb..afa79eed7 100644
--- a/android/app/src/main/res/layout/place_page_instagram.xml
+++ b/android/app/src/main/res/layout/place_page_instagram.xml
@@ -8,13 +8,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_instagram"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_instagram_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_instagram_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_latlon.xml b/android/app/src/main/res/layout/place_page_latlon.xml
index 99b9bc4e5..b7552da9a 100644
--- a/android/app/src/main/res/layout/place_page_latlon.xml
+++ b/android/app/src/main/res/layout/place_page_latlon.xml
@@ -8,12 +8,12 @@
   android:visibility="visible"
   tools:background="#20FF0000">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_latlon"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_coordinates" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_latlon"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_level.xml b/android/app/src/main/res/layout/place_page_level.xml
index 55c9324c6..cbf46e33b 100644
--- a/android/app/src/main/res/layout/place_page_level.xml
+++ b/android/app/src/main/res/layout/place_page_level.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_level"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_level_white" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_level"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_line.xml b/android/app/src/main/res/layout/place_page_line.xml
index 6aa53948a..4b64a5573 100644
--- a/android/app/src/main/res/layout/place_page_line.xml
+++ b/android/app/src/main/res/layout/place_page_line.xml
@@ -7,13 +7,13 @@
   style="@style/PlacePageItemFrame"
   tools:background="#20FF0000"
   tools:visibility="visible">
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_line"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_line_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_line_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_network.xml b/android/app/src/main/res/layout/place_page_network.xml
index 14048d81d..6d6166566 100644
--- a/android/app/src/main/res/layout/place_page_network.xml
+++ b/android/app/src/main/res/layout/place_page_network.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_network"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_network_white" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_network"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_open_in.xml b/android/app/src/main/res/layout/place_page_open_in.xml
index 1c3e532e3..f3b3ea501 100644
--- a/android/app/src/main/res/layout/place_page_open_in.xml
+++ b/android/app/src/main/res/layout/place_page_open_in.xml
@@ -8,13 +8,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_open_in"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_open_in"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_open_in"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
index 0ff4f9f60..8ed68a58d 100644
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/PlacePageItemFrame">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/icon"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
     app:srcCompat="@drawable/ic_operating_hours"
     app:tint="?iconTint"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/oh_today_label"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
     android:text="@string/today"
     tools:visibility="visible"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/oh_today_open_time"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
     android:textAlignment="viewEnd"
     tools:visibility="visible"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/oh_nonbusiness_time"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_opening_hours_item.xml b/android/app/src/main/res/layout/place_page_opening_hours_item.xml
index e5bf43aa8..ae1af61fb 100644
--- a/android/app/src/main/res/layout/place_page_opening_hours_item.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_item.xml
@@ -6,7 +6,7 @@
   style="@style/PlacePageOpeningHoursItem"
   android:visibility="visible">
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__opening_hours_weekdays"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
@@ -14,7 +14,7 @@
     android:textAppearance="@style/MwmTextAppearance.Body3"
     tools:text="Mo-Fr"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__opening_hours_time"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
@@ -24,7 +24,7 @@
     android:textAlignment="viewEnd"
     tools:text="08:00 - 19:00"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__opening_hours_nonbusiness_time"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_operator.xml b/android/app/src/main/res/layout/place_page_operator.xml
index 746c1f309..a1bf7da77 100644
--- a/android/app/src/main/res/layout/place_page_operator.xml
+++ b/android/app/src/main/res/layout/place_page_operator.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_operator"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_bank" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_operator"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_outdoor_seating.xml b/android/app/src/main/res/layout/place_page_outdoor_seating.xml
index ead0b4af7..112a8eb3e 100644
--- a/android/app/src/main/res/layout/place_page_outdoor_seating.xml
+++ b/android/app/src/main/res/layout/place_page_outdoor_seating.xml
@@ -8,12 +8,12 @@
   tools:background="#40FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_outdoor_seating"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_outdoor_seating"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_outdoor_seating"
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
diff --git a/android/app/src/main/res/layout/place_page_panoramax.xml b/android/app/src/main/res/layout/place_page_panoramax.xml
index e2b7172bd..5d6710ab6 100644
--- a/android/app/src/main/res/layout/place_page_panoramax.xml
+++ b/android/app/src/main/res/layout/place_page_panoramax.xml
@@ -9,13 +9,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_panoramax"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_panoramax"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_panoramax"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_phone_item.xml b/android/app/src/main/res/layout/place_page_phone_item.xml
index fa7b6c8f8..5413f0cdb 100644
--- a/android/app/src/main/res/layout/place_page_phone_item.xml
+++ b/android/app/src/main/res/layout/place_page_phone_item.xml
@@ -9,13 +9,13 @@
   android:orientation="horizontal"
   android:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_phone"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_phone"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_phone"
     android:textAlignment="viewStart"
     android:textDirection="ltr"
diff --git a/android/app/src/main/res/layout/place_page_placename.xml b/android/app/src/main/res/layout/place_page_placename.xml
index be06ed1b7..419a0dc2d 100644
--- a/android/app/src/main/res/layout/place_page_placename.xml
+++ b/android/app/src/main/res/layout/place_page_placename.xml
@@ -10,7 +10,7 @@
   tools:background="#2000FF00"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_name"
     style="@style/PlacePageMetadataIcon"
     android:layout_centerVertical="true"
@@ -22,7 +22,7 @@
     android:layout_height="4dp"
     android:layout_centerVertical="true"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_address"
     style="@style/PlacePageMetadataText"
     android:textAlignment="viewStart"
@@ -30,7 +30,7 @@
     android:layout_toEndOf="@id/iv__place_name"
     tools:text="Sample place"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_post_address"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
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 a4c37e431..996efc770 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -34,7 +34,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:layout_weight="1"
       android:orientation="vertical">
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__title"
         android:textAlignment="viewStart"
         android:layout_width="match_parent"
@@ -48,7 +48,7 @@
         tools:background="#C0800000"
         tools:ignore="UnusedAttribute"
         tools:text="Title" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__secondary_title"
         android:textAlignment="viewStart"
         android:layout_width="match_parent"
@@ -61,7 +61,7 @@
         tools:background="#C0800000"
         tools:ignore="UnusedAttribute"
         tools:text="Secondary Title" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__subtitle"
         android:textAlignment="viewStart"
         android:layout_width="match_parent"
@@ -71,7 +71,7 @@
         android:textAppearance="@style/MwmTextAppearance.Body3"
         tools:background="#300000F0"
         tools:text="Subtitle, very very very very very very very long" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__address"
         android:textAlignment="viewStart"
         android:layout_width="match_parent"
@@ -80,7 +80,7 @@
         android:textAppearance="@style/MwmTextAppearance.Body3"
         tools:background="#60000000"
         tools:text="Lenina str, 10" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__downloader_details"
         android:textAlignment="viewStart"
         android:layout_width="wrap_content"
@@ -159,7 +159,7 @@
           android:scaleType="center"
           app:srcCompat="@drawable/ic_direction_pagepreview"
           app:tint="?colorAccent" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__straight_distance"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_self_service.xml b/android/app/src/main/res/layout/place_page_self_service.xml
index 5bcc10f2a..f2bc1af33 100644
--- a/android/app/src/main/res/layout/place_page_self_service.xml
+++ b/android/app/src/main/res/layout/place_page_self_service.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_self_service"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_self_service" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_self_service"
     style="@style/PlacePageMetadataText"
     tools:text="Self-service" />
diff --git a/android/app/src/main/res/layout/place_page_twitter.xml b/android/app/src/main/res/layout/place_page_twitter.xml
index 1b3605948..2422954d4 100644
--- a/android/app/src/main/res/layout/place_page_twitter.xml
+++ b/android/app/src/main/res/layout/place_page_twitter.xml
@@ -8,13 +8,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_twitter"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_twitterx_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_twitter_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_vk.xml b/android/app/src/main/res/layout/place_page_vk.xml
index 60858bb83..a8af9e611 100644
--- a/android/app/src/main/res/layout/place_page_vk.xml
+++ b/android/app/src/main/res/layout/place_page_vk.xml
@@ -8,13 +8,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_vk"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_vk_white"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_vk_page"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_website.xml b/android/app/src/main/res/layout/place_page_website.xml
index f0f43ae26..e7cd66fc6 100644
--- a/android/app/src/main/res/layout/place_page_website.xml
+++ b/android/app/src/main/res/layout/place_page_website.xml
@@ -8,13 +8,13 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_website"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_website"
     app:tint="?colorAccent"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_website"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_website_menu.xml b/android/app/src/main/res/layout/place_page_website_menu.xml
index 14dd71307..379c9dade 100644
--- a/android/app/src/main/res/layout/place_page_website_menu.xml
+++ b/android/app/src/main/res/layout/place_page_website_menu.xml
@@ -8,7 +8,7 @@
   tools:background="#20FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_website_menu"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_website_menu"
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__place_website_menu"
       android:textAlignment="viewStart"
       android:layout_width="wrap_content"
@@ -27,7 +27,7 @@
       android:text="@string/view_menu"
       android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__place_website_menu_subtitle"
         android:textAlignment="viewStart"
         android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_wheelchair.xml b/android/app/src/main/res/layout/place_page_wheelchair.xml
index 7925b90da..fcaf69c22 100644
--- a/android/app/src/main/res/layout/place_page_wheelchair.xml
+++ b/android/app/src/main/res/layout/place_page_wheelchair.xml
@@ -8,12 +8,12 @@
   tools:background="#4000FFFF"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_wheelchair"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_wheelchair_white" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_wheelchair"
     style="@style/PlacePageMetadataText"
     tools:text="Wheelchair" />
diff --git a/android/app/src/main/res/layout/place_page_wifi.xml b/android/app/src/main/res/layout/place_page_wifi.xml
index 28cfdc439..43bef8197 100644
--- a/android/app/src/main/res/layout/place_page_wifi.xml
+++ b/android/app/src/main/res/layout/place_page_wifi.xml
@@ -8,12 +8,12 @@
   tools:background="#40FF0000"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_wifi"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_wifi"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_wifi"
     style="@style/PlacePageMetadataText"
     android:text="@string/yes"/>
diff --git a/android/app/src/main/res/layout/place_page_wikimedia.xml b/android/app/src/main/res/layout/place_page_wikimedia.xml
index 0a2dd8a03..96d1d2b16 100644
--- a/android/app/src/main/res/layout/place_page_wikimedia.xml
+++ b/android/app/src/main/res/layout/place_page_wikimedia.xml
@@ -7,13 +7,13 @@
   style="@style/PlacePageItemFrame"
   tools:visibility="visible">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/iv__place_wikimedia"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_wikimedia_commons_white"
     app:tint="?colorAccent" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_wikimedia"
     android:textAlignment="viewStart"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
index a398898e6..9d2b1e44e 100644
--- a/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
@@ -11,12 +11,12 @@
     style="@style/PlacePageItemFrame"
     android:visibility="visible"
     tools:background="#20FF0000">
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/iv__place_wiki"
       style="@style/PlacePageMetadataIcon"
       app:srcCompat="@drawable/ic_wiki"
       app:tint="?colorAccent" />
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__place_wiki"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/values/styles-place_page.xml b/android/app/src/main/res/values/styles-place_page.xml
index 5e89e69e4..216a112dc 100644
--- a/android/app/src/main/res/values/styles-place_page.xml
+++ b/android/app/src/main/res/values/styles-place_page.xml
@@ -14,8 +14,6 @@
     <item name="android:layout_height">0dp</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_marginBottom">@dimen/margin_eighth</item>
-    <item name="android:paddingTop">@dimen/margin_base</item>
-    <item name="android:paddingBottom">@dimen/margin_base</item>
     <item name="android:scaleType">center</item>
     <item name="android:color">?iconTint</item>
   </style>