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 aa60c4de7..86e8a2125 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -20,9 +20,7 @@ import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.ScrollView;
-import android.widget.TextView;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -70,13 +68,13 @@ final class RoutingBottomMenuController implements View.OnClickListener
   @NonNull
   private final MaterialButton mStart;
   @NonNull
-  private final ImageView mAltitudeChart;
+  private final ShapeableImageView mAltitudeChart;
   @NonNull
   private final MaterialTextView mTime;
   @NonNull
   private final MaterialTextView mAltitudeDifference;
   @NonNull
-  private final TextView mTimeVehicle;
+  private final MaterialTextView mTimeVehicle;
   @Nullable
   private final MaterialTextView mArrival;
   @NonNull
@@ -102,9 +100,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
     View transitFrame = getViewById(activity, frame, R.id.transit_panel);
     MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
     MaterialButton start = (MaterialButton) getViewById(activity, frame, R.id.start);
-    ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
+    ShapeableImageView altitudeChart = (ShapeableImageView) getViewById(activity, frame, R.id.altitude_chart);
     MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
-    TextView timeVehicle = (TextView) getViewById(activity, frame, R.id.time_vehicle);
+    MaterialTextView timeVehicle = (MaterialTextView) getViewById(activity, frame, R.id.time_vehicle);
     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);
@@ -124,8 +122,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
   private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                       @NonNull View timeElevationLine, @NonNull View transitFrame,
                                       @NonNull MaterialTextView error, @NonNull MaterialButton start,
-                                      @NonNull ImageView altitudeChart, @NonNull MaterialTextView time,
-                                      @NonNull MaterialTextView altitudeDifference, @NonNull TextView timeVehicle,
+                                      @NonNull ShapeableImageView altitudeChart, @NonNull MaterialTextView time,
+                                      @NonNull MaterialTextView altitudeDifference, @NonNull MaterialTextView timeVehicle,
                                       @Nullable MaterialTextView arrival, @NonNull View actionFrame,
                                       @Nullable RoutingBottomMenuListener listener)
   {
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 f3434df04..70e3cd0aa 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
@@ -47,14 +47,14 @@
           tools:visibility="visible" />
     </LinearLayout>
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/altitude_chart"
       android:layout_height="wrap_content"
       android:layout_width="match_parent"
       android:layout_weight="1"
       android:layout_gravity="center_vertical" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/time_vehicle"
       android:layout_height="wrap_content"
       android:layout_width="match_parent"
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 0b31f7d9c..14f2dd549 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
@@ -56,7 +56,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:layout_gravity="top" >
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/time_vehicle"
           android:layout_height="wrap_content"
           android:layout_width="match_parent"
@@ -76,7 +76,7 @@
           android:textSize="@dimen/text_size_routing_plan_detail_arrival"/>
     </LinearLayout>
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/altitude_chart"
       android:layout_width="0dp"
       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 ab321b520..4206842f4 100644
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -57,11 +57,11 @@
           android:layout_height="wrap_content"
           android:orientation="vertical"
           android:layout_weight="1">
-            <ImageView
+            <com.google.android.material.imageview.ShapeableImageView
               android:id="@+id/altitude_chart"
               android:layout_height="wrap_content"
               android:layout_width="match_parent" />
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
               android:id="@+id/time_vehicle"
               android:layout_height="wrap_content"
               android:layout_width="match_parent"