diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index 8657507c2..c75af51d8 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -140,7 +140,7 @@ public class RoutingPlanController extends ToolbarController
     setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
     setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
     //    setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
-    setupRouterButton(R.id.transit, R.drawable.ic_transit, this::onTransitModeSelected);
+    setupRouterButton(R.id.transit, R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
     setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
     setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
   }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java b/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
index 6c84c67e2..521adfabf 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
@@ -8,10 +8,10 @@ public enum TransitStepType
   // A specific icon for different intermediate points is calculated dynamically in TransitStepView.
   INTERMEDIATE_POINT(R.drawable.ic_20px_route_planning_walk),
   PEDESTRIAN(R.drawable.ic_20px_route_planning_walk),
-  SUBWAY(R.drawable.ic_20px_route_planning_metro),
-  TRAIN(R.drawable.ic_20px_route_planning_train),
-  LIGHT_RAIL(R.drawable.ic_20px_route_planning_lightrail),
-  MONORAIL(R.drawable.ic_20px_route_planning_monorail),
+  SUBWAY(R.drawable.ic_route_planning_metro),
+  TRAIN(R.drawable.ic_route_planning_train),
+  LIGHT_RAIL(R.drawable.ic_route_planning_train),
+  MONORAIL(R.drawable.ic_route_planning_monorail),
   RULER(R.drawable.ic_ruler_route);
 
   @DrawableRes
diff --git a/android/app/src/main/res/drawable-hdpi/ic_transit.webp b/android/app/src/main/res/drawable-hdpi/ic_transit.webp
deleted file mode 100644
index 5a68ef97e..000000000
Binary files a/android/app/src/main/res/drawable-hdpi/ic_transit.webp and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_transit.webp b/android/app/src/main/res/drawable-mdpi/ic_transit.webp
deleted file mode 100644
index dfbdd6c94..000000000
Binary files a/android/app/src/main/res/drawable-mdpi/ic_transit.webp and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_transit.webp b/android/app/src/main/res/drawable-xhdpi/ic_transit.webp
deleted file mode 100644
index 2aa1b2827..000000000
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_transit.webp and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_transit.webp b/android/app/src/main/res/drawable-xxhdpi/ic_transit.webp
deleted file mode 100644
index 16449f1cb..000000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_transit.webp and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_transit.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_transit.webp
deleted file mode 100644
index 93442cbc6..000000000
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_transit.webp and /dev/null differ
diff --git a/android/app/src/main/res/drawable/ic_route_planning_metro.xml b/android/app/src/main/res/drawable/ic_route_planning_metro.xml
new file mode 100644
index 000000000..ed9a4b964
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_route_planning_metro.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="20dp"
+    android:viewportHeight="12"
+    android:viewportWidth="12"
+    android:width="20dp">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m7.143,2.286c1.578,0 2.857,1.279 2.857,2.857v4.571c-0.316,0 -0.571,-0.256 -0.571,-0.571v-3.886c0,-1.325 -1.075,-2.4 -2.4,-2.4h-2.057c-1.325,0 -2.4,1.075 -2.4,2.4v3.886c0,0.316 -0.256,0.571 -0.571,0.571v-4.571c0,-1.578 1.279,-2.857 2.857,-2.857zM7.294,4c0.535,0 0.975,0.421 0.999,0.955l0.159,3.5c0.023,0.512 -0.343,0.952 -0.837,1.032l-0.139,0.013 -2.93,0c-0.513,0 -0.936,-0.386 -0.993,-0.883l-0.006,-0.139 0.16,-3.523c0.024,-0.534 0.464,-0.955 0.999,-0.955zM4.6,8c-0.221,0 -0.4,0.179 -0.4,0.4s0.179,0.4 0.4,0.4 0.4,-0.179 0.4,-0.4 -0.179,-0.4 -0.4,-0.4zM7.4,8c-0.221,0 -0.4,0.179 -0.4,0.4s0.179,0.4 0.4,0.4 0.4,-0.179 0.4,-0.4 -0.179,-0.4 -0.4,-0.4zM7.122,4.75h-2.243c-0.268,0 -0.488,0.211 -0.499,0.478l-0.056,1.272c0,0.276 0.224,0.5 0.5,0.5l2.377,-0c0.276,-0.012 0.49,-0.246 0.477,-0.522l-0.056,-1.25c-0.012,-0.267 -0.232,-0.478 -0.5,-0.478z" />
+
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_route_planning_metro_40px.xml b/android/app/src/main/res/drawable/ic_route_planning_metro_40px.xml
new file mode 100644
index 000000000..94c6bcdca
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_route_planning_metro_40px.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="40dp"
+    android:viewportHeight="12"
+    android:viewportWidth="12"
+    android:width="40dp">
+
+    <path
+        android:fillColor="#fff"
+        android:fillType="nonZero"
+        android:pathData="m7.143,2.286c1.578,0 2.857,1.279 2.857,2.857v4.571c-0.316,0 -0.571,-0.256 -0.571,-0.571v-3.886c0,-1.325 -1.075,-2.4 -2.4,-2.4h-2.057c-1.325,0 -2.4,1.075 -2.4,2.4v3.886c0,0.316 -0.256,0.571 -0.571,0.571v-4.571c0,-1.578 1.279,-2.857 2.857,-2.857zM7.294,4c0.535,0 0.975,0.421 0.999,0.955l0.159,3.5c0.023,0.512 -0.343,0.952 -0.837,1.032l-0.139,0.013 -2.93,0c-0.513,0 -0.936,-0.386 -0.993,-0.883l-0.006,-0.139 0.16,-3.523c0.024,-0.534 0.464,-0.955 0.999,-0.955zM4.6,8c-0.221,0 -0.4,0.179 -0.4,0.4s0.179,0.4 0.4,0.4 0.4,-0.179 0.4,-0.4 -0.179,-0.4 -0.4,-0.4zM7.4,8c-0.221,0 -0.4,0.179 -0.4,0.4s0.179,0.4 0.4,0.4 0.4,-0.179 0.4,-0.4 -0.179,-0.4 -0.4,-0.4zM7.122,4.75h-2.243c-0.268,0 -0.488,0.211 -0.499,0.478l-0.056,1.272c0,0.276 0.224,0.5 0.5,0.5l2.377,-0c0.276,-0.012 0.49,-0.246 0.477,-0.522l-0.056,-1.25c-0.012,-0.267 -0.232,-0.478 -0.5,-0.478z" />
+
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_route_planning_monorail.xml b/android/app/src/main/res/drawable/ic_route_planning_monorail.xml
new file mode 100644
index 000000000..3e4b12e87
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_route_planning_monorail.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="M13.394,4.872C13.394,3.851 12.543,3 11.437,3L6.501,3C5.394,3 4.543,3.851 4.543,4.872L4.203,11.681L4.203,11.766C4.203,12.872 5.054,13.723 6.16,13.723L7.015,13.723L7.025,12.788C7.025,12.363 7.418,12.022 7.843,12.022L10.217,12.019C10.643,12.019 10.983,12.36 10.983,12.785L10.983,13.636L11.862,13.638L11.948,13.638C13.054,13.553 13.82,12.702 13.82,11.596L13.394,4.872ZM10.146,10.489C10.146,10.66 9.975,10.83 9.805,10.83L8.188,10.83C8.018,10.83 7.848,10.66 7.848,10.489L7.848,10.319C7.848,10.149 8.018,9.979 8.188,9.979L9.805,9.979C9.975,9.979 10.146,10.149 10.146,10.319L10.146,10.489ZM11.267,9.043L6.671,9.043C6.16,9.043 5.735,8.617 5.735,8.021L5.735,7.936L5.82,5.383C5.82,4.872 6.245,4.447 6.756,4.447L11.097,4.447C11.607,4.447 12.033,4.872 12.033,5.383L12.118,7.936C12.203,8.532 11.862,9.043 11.267,9.043Z" />
+
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="M9.266,13.003L8.672,13.003C8.295,13.003 8.012,13.27 8.012,13.611L8.012,14.462C8.012,14.802 8.295,15.057 8.672,15.057L9.332,15.057C9.709,15.057 9.992,14.802 9.992,14.462L9.992,13.611C9.998,13.237 9.697,12.999 9.266,13.003Z" />
+
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_route_planning_train.xml b/android/app/src/main/res/drawable/ic_route_planning_train.xml
new file mode 100644
index 000000000..cf8a3b511
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_route_planning_train.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="m9.033,18 l0.667,-1h-1.7l-2,3L6.63,20c0.669,0 1.293,-0.334 1.664,-0.891L8.367,19h7.267l0.073,0.109c0.371,0.556 0.995,0.891 1.664,0.891h0.63l-2,-3h-1.7l0.667,1h-5.933zM9.387,4h5.226c1.612,0 2.936,1.274 2.998,2.885l0.309,8.038c0.042,1.104 -0.818,2.033 -1.922,2.075C15.973,16.999 15.947,17 15.922,17h-7.843c-1.105,0 -2,-0.895 -2,-2 0,-0.026 0,-0.051 0.001,-0.077l0.309,-8.038c0.062,-1.611 1.386,-2.885 2.998,-2.885zM8.923,6.5C8.402,6.5 7.968,6.901 7.926,7.42l-0.24,3C7.684,10.447 7.683,10.473 7.683,10.5c0,0.552 0.448,1 1,1h6.634c0.027,0 0.053,-0.001 0.08,-0.003 0.551,-0.044 0.961,-0.526 0.917,-1.077l-0.24,-3c-0.042,-0.52 -0.475,-0.92 -0.997,-0.92h-6.154zM9,15c0.552,0 1,-0.448 1,-1 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1zM15,15c0.552,0 1,-0.448 1,-1 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1zM10.25,5c-0.138,0 -0.25,0.112 -0.25,0.25 0,0.138 0.112,0.25 0.25,0.25h3.5c0.138,0 0.25,-0.112 0.25,-0.25 0,-0.138 -0.112,-0.25 -0.25,-0.25z" />
+
+</vector>
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 3e5789fee..c042fe183 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -66,7 +66,7 @@
               android:layout_height="wrap_content"
               android:layout_marginEnd="@dimen/margin_half_plus"
               android:contentDescription="@string/subway"
-              tools:button="@drawable/ic_transit"
+              tools:button="@drawable/ic_route_planning_metro_40px"
               tools:buttonTint="?iconTintLight" />
 
           <app.organicmaps.widget.RoutingToolbarButton
diff --git a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp b/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp
deleted file mode 100644
index 04d68eb77..000000000
Binary files a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_metro.webp b/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_metro.webp
deleted file mode 100644
index e74402e79..000000000
Binary files a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_metro.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_monorail.webp b/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_monorail.webp
deleted file mode 100644
index 8fb256828..000000000
Binary files a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_monorail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_train.webp b/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_train.webp
deleted file mode 100644
index 6deb546af..000000000
Binary files a/android/sdk/src/main/res/drawable-hdpi/ic_20px_route_planning_train.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp b/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp
deleted file mode 100644
index a411d2d0c..000000000
Binary files a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_metro.webp b/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_metro.webp
deleted file mode 100644
index 6fce1dcf5..000000000
Binary files a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_metro.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_monorail.webp b/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_monorail.webp
deleted file mode 100644
index ee0389121..000000000
Binary files a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_monorail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_train.webp b/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_train.webp
deleted file mode 100644
index 348d5f8e0..000000000
Binary files a/android/sdk/src/main/res/drawable-mdpi/ic_20px_route_planning_train.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp b/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp
deleted file mode 100644
index cf8e1a220..000000000
Binary files a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_metro.webp b/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_metro.webp
deleted file mode 100644
index df0be2dd4..000000000
Binary files a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_metro.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp b/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp
deleted file mode 100644
index 977a7ded5..000000000
Binary files a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_train.webp b/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_train.webp
deleted file mode 100644
index 80d002403..000000000
Binary files a/android/sdk/src/main/res/drawable-xhdpi/ic_20px_route_planning_train.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp b/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp
deleted file mode 100644
index 6cf5e7936..000000000
Binary files a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp b/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp
deleted file mode 100644
index ffbd1f527..000000000
Binary files a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp b/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp
deleted file mode 100644
index 7c539d301..000000000
Binary files a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_train.webp b/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_train.webp
deleted file mode 100644
index 83b385625..000000000
Binary files a/android/sdk/src/main/res/drawable-xxhdpi/ic_20px_route_planning_train.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp b/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp
deleted file mode 100644
index e9fcf2241..000000000
Binary files a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp b/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp
deleted file mode 100644
index 72f5f4f67..000000000
Binary files a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp b/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp
deleted file mode 100644
index 1ede0100c..000000000
Binary files a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp and /dev/null differ
diff --git a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp b/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp
deleted file mode 100644
index 240b4aae4..000000000
Binary files a/android/sdk/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp and /dev/null differ