diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index 93a304c6a..faf2b85b2 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -28,6 +28,9 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
@@ -67,21 +70,21 @@ final class RoutingBottomMenuController implements View.OnClickListener
   @NonNull
   private final ImageView mAltitudeChart;
   @NonNull
-  private final TextView mTime;
+  private final MaterialTextView mTime;
   @NonNull
-  private final TextView mAltitudeDifference;
+  private final MaterialTextView mAltitudeDifference;
   @NonNull
   private final TextView mTimeVehicle;
   @Nullable
-  private final TextView mArrival;
+  private final MaterialTextView mArrival;
   @NonNull
   private final View mActionFrame;
   @NonNull
-  private final TextView mActionMessage;
+  private final MaterialTextView mActionMessage;
   @NonNull
   private final View mActionButton;
   @NonNull
-  private final ImageView mActionIcon;
+  private final ShapeableImageView mActionIcon;
   @NonNull
   private final DotDividerItemDecoration mTransitViewDecorator;
 
@@ -98,10 +101,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
     TextView error = (TextView) getViewById(activity, frame, R.id.error);
     Button start = (Button) getViewById(activity, frame, R.id.start);
     ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
-    TextView time = (TextView) getViewById(activity, frame, R.id.time);
+    MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
     TextView timeVehicle = (TextView) getViewById(activity, frame, R.id.time_vehicle);
-    TextView altitudeDifference = (TextView) getViewById(activity, frame, R.id.altitude_difference);
-    TextView arrival = (TextView) getViewById(activity, frame, R.id.arrival);
+    MaterialTextView altitudeDifference = (MaterialTextView) getViewById(activity, frame, R.id.altitude_difference);
+    MaterialTextView arrival = (MaterialTextView) getViewById(activity, frame, R.id.arrival);
     View actionFrame = getViewById(activity, frame, R.id.routing_action_frame);
 
     return new RoutingBottomMenuController(activity, altitudeChartFrame, timeElevationLine, transitFrame,
@@ -124,10 +127,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
                                       @NonNull TextView error,
                                       @NonNull Button start,
                                       @NonNull ImageView altitudeChart,
-                                      @NonNull TextView time,
-                                      @NonNull TextView altitudeDifference,
+                                      @NonNull MaterialTextView time,
+                                      @NonNull MaterialTextView altitudeDifference,
                                       @NonNull TextView timeVehicle,
-                                      @Nullable TextView arrival,
+                                      @Nullable MaterialTextView arrival,
                                       @NonNull View actionFrame,
                                       @Nullable RoutingBottomMenuListener listener)
   {
@@ -198,12 +201,12 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
     scrollToBottom(rv);
 
-    TextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
+    MaterialTextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
     totalTimeView.setText(RoutingController.formatRoutingTime(mContext, info.getTotalTime(),
                                                             R.dimen.text_size_routing_number));
     View dotView = mTransitFrame.findViewById(R.id.dot);
     View pedestrianIcon = mTransitFrame.findViewById(R.id.pedestrian_icon);
-    TextView distanceView = mTransitFrame.findViewById(R.id.total_distance);
+    MaterialTextView distanceView = mTransitFrame.findViewById(R.id.total_distance);
     UiUtils.showIf(info.getTotalPedestrianTimeInSec() > 0, dotView, pedestrianIcon, distanceView);
     distanceView.setText(info.getTotalPedestrianDistance() + " " + info.getTotalPedestrianDistanceUnits());
   }
diff --git a/android/app/src/main/res/layout-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
index d3734dbab..23758503b 100644
--- a/android/app/src/main/res/layout-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
@@ -23,7 +23,7 @@
       android:orientation="vertical"
       android:layout_marginEnd="@dimen/margin_base"
       android:layout_gravity="center_vertical" >
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/time"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
           tools:text="5 h 55 min • 1555km"
           tools:visibility="visible" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/altitude_difference"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout-land/routing_details.xml b/android/app/src/main/res/layout-land/routing_details.xml
index b98fde348..14b958aa8 100644
--- a/android/app/src/main/res/layout-land/routing_details.xml
+++ b/android/app/src/main/res/layout-land/routing_details.xml
@@ -6,14 +6,14 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/time"
     android:singleLine="true"
     android:ellipsize="end"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:text="5 h 55 min • 1555km"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/altitude_difference"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/altitude_chart_time_distance_height"
diff --git a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
index 6a6be0601..c61c04995 100644
--- a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
@@ -23,7 +23,7 @@
       android:orientation="vertical"
       android:layout_marginEnd="@dimen/margin_base"
       android:layout_gravity="center_vertical" >
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/time"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
           tools:text="5 h 55 min • 1555km"
           tools:visibility="visible" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/altitude_difference"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
           tools:text="5 h 55 min • 1555km"
           tools:visibility="visible" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/arrival"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout-w1020dp-land/routing_details.xml b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
index b9eaf89a0..683231a5e 100644
--- a/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
@@ -5,7 +5,7 @@
   android:id="@+id/numbers"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/time"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,7 +13,7 @@
     android:ellipsize="end"
     android:layout_marginBottom="4dp"
     tools:text="5 h 55 min • 1555km"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/arrival"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
     tools:text="Arrival 13:03"
     style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
     android:textSize="@dimen/text_size_routing_plan_detail_arrival"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/altitude_difference"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/altitude_chart_panel.xml b/android/app/src/main/res/layout/altitude_chart_panel.xml
index aab45a877..c1d8e8fe5 100644
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -21,7 +21,7 @@
       android:orientation="horizontal"
       android:layout_marginTop="@dimen/margin_half"
       android:layout_marginBottom="@dimen/margin_half">
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/time"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
           tools:text="5 h 55 min • 1555km"
           tools:visibility="visible" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/altitude_difference"
           android:layout_width="wrap_content"
           android:layout_height="@dimen/altitude_chart_time_distance_height"
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 564b3ade8..e093d172c 100644
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -218,7 +218,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearance"
         android:text="@string/elevation_profile_time" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/routing_action_panel.xml b/android/app/src/main/res/layout/routing_action_panel.xml
index 512fe02b6..496d8a313 100644
--- a/android/app/src/main/res/layout/routing_action_panel.xml
+++ b/android/app/src/main/res/layout/routing_action_panel.xml
@@ -15,14 +15,14 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:background="?clickableBackground">
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       app:srcCompat="@drawable/ic_search"
       app:tint="?colorAccent"
       android:layout_marginStart="@dimen/margin_base"
       android:layout_marginEnd="@dimen/margin_base"/>
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__message"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
       android:layout_marginBottom="@dimen/margin_half"
       android:layout_marginTop="@dimen/margin_half"
       android:background="?dividerHorizontal"/>
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/iv__icon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/routing_bottom_panel_transit.xml b/android/app/src/main/res/layout/routing_bottom_panel_transit.xml
index f36fe132b..2a8825958 100644
--- a/android/app/src/main/res/layout/routing_bottom_panel_transit.xml
+++ b/android/app/src/main/res/layout/routing_bottom_panel_transit.xml
@@ -10,7 +10,7 @@
   android:paddingEnd="@dimen/margin_base"
   android:paddingBottom="@dimen/margin_half"
   android:paddingTop="@dimen/margin_half_plus">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/total_time"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -18,7 +18,7 @@
     app:layout_constraintTop_toTopOf="parent"
     style="@style/MwmWidget.TextView.PlanDetail.Number.Time"
     tools:text="40 min"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/dot"
     style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
     android:layout_marginStart="@dimen/margin_quarter_plus"
@@ -28,7 +28,7 @@
     app:layout_constraintStart_toEndOf="@id/total_time"
     app:layout_constraintTop_toTopOf="parent"
     tools:ignore="HardcodedText"/>
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/pedestrian_icon"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
     app:layout_constraintBottom_toBottomOf="@id/total_time"
     app:layout_constraintStart_toEndOf="@id/dot"
     app:tint="?iconTint"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/total_distance"
     style="@style/MwmWidget.TextView.PlanDetail.Number.Secondary"
     android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/routing_details.xml b/android/app/src/main/res/layout/routing_details.xml
index 239204e31..50b91bff0 100644
--- a/android/app/src/main/res/layout/routing_details.xml
+++ b/android/app/src/main/res/layout/routing_details.xml
@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_marginBottom="@dimen/altitude_chart_time_distance_margin_bottom">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/altitude_difference"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/altitude_chart_time_distance_height"
@@ -19,7 +19,7 @@
     android:visibility="gone"
     tools:text="43 m"
     tools:visibility="visible"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/time"
     android:layout_width="wrap_content"
     android:maxLines="2"