diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 309b44258f..6d9a4c2cce 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -77,7 +77,7 @@
                 android:paddingLeft="@dimen/context_menu_padding_margin_default"
                 android:paddingRight="@dimen/context_menu_padding_margin_default"
                 android:visibility="gone"
-                android:horizontalSpacing="8dp"
+                android:horizontalSpacing="@dimen/context_menu_padding_margin_medium"
                 android:id="@+id/transport_stop_routes_grid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/transport_stop_route_item.xml b/OsmAnd/res/layout/transport_stop_route_item.xml
index 3b79283e34..a2b46dfd13 100644
--- a/OsmAnd/res/layout/transport_stop_route_item.xml
+++ b/OsmAnd/res/layout/transport_stop_route_item.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="@dimen/context_menu_transport_stop_item_height">
 
     <TextView
+        app:autoSizeTextType="uniform"
         android:textColor="@color/color_white"
         tools:text="3"
         android:gravity="center"
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 86f9f947b2..59e4ed37f2 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -71,6 +71,7 @@
 	<dimen name="context_menu_actions_buttons_height">84dp</dimen>
 	<dimen name="context_menu_subtitle_margin">5dp</dimen>
 	<dimen name="context_menu_direction_margin">27dp</dimen>
+	<dimen name="context_menu_transport_stop_item_height">24dp</dimen>
 
 	<dimen name="fab_size_with_shadow">90dp</dimen>
 	<dimen name="fab_margin_right">18dp</dimen>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 34f89baa56..b49adb1ef8 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -142,6 +142,7 @@
 	<dimen name="context_menu_actions_buttons_height">56dp</dimen>
 	<dimen name="context_menu_subtitle_margin">3dp</dimen>
 	<dimen name="context_menu_direction_margin">18dp</dimen>
+	<dimen name="context_menu_transport_stop_item_height">16dp</dimen>
 
 	<dimen name="fab_size_with_shadow">62dp</dimen>
     <dimen name="fab_margin_right">12dp</dimen>