diff --git a/OsmAnd/res/layout/context_menu_controls.xml b/OsmAnd/res/layout/context_menu_controls.xml
new file mode 100644
index 0000000000..0132153f4f
--- /dev/null
+++ b/OsmAnd/res/layout/context_menu_controls.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/map_controls_container"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="bottom"
+	tools:visibility="invisible">
+
+	<include
+		layout="@layout/map_ruler"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="start|bottom"
+		android:layout_marginStart="@dimen/fab_margin_right"
+		android:layout_marginLeft="@dimen/fab_margin_right"
+		android:layout_marginEnd="@dimen/fab_margin_right"
+		android:layout_marginRight="@dimen/fab_margin_right" />
+
+	<include
+		layout="@layout/map_hud_controls"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="end|bottom"
+		android:layout_marginStart="@dimen/fab_margin_right"
+		android:layout_marginLeft="@dimen/fab_margin_right"
+		android:layout_marginEnd="@dimen/fab_margin_right"
+		android:layout_marginRight="@dimen/fab_margin_right" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/follow_track_options.xml b/OsmAnd/res/layout/follow_track_options.xml
index 4523599e6c..0ca2466eb2 100644
--- a/OsmAnd/res/layout/follow_track_options.xml
+++ b/OsmAnd/res/layout/follow_track_options.xml
@@ -99,34 +99,7 @@
 
 	</LinearLayout>
 
-	<FrameLayout
-		android:id="@+id/map_controls_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		tools:visibility="invisible">
-
-		<include
-			layout="@layout/map_ruler"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="start|bottom"
-			android:layout_marginStart="@dimen/fab_margin_right"
-			android:layout_marginLeft="@dimen/fab_margin_right"
-			android:layout_marginEnd="@dimen/fab_margin_right"
-			android:layout_marginRight="@dimen/fab_margin_right" />
-
-		<include
-			layout="@layout/map_hud_controls"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="end|bottom"
-			android:layout_marginStart="@dimen/fab_margin_right"
-			android:layout_marginLeft="@dimen/fab_margin_right"
-			android:layout_marginEnd="@dimen/fab_margin_right"
-			android:layout_marginRight="@dimen/fab_margin_right" />
-
-	</FrameLayout>
+	<include layout="@layout/context_menu_controls" />
 
 	<LinearLayout
 		android:id="@+id/control_buttons"
diff --git a/OsmAnd/res/layout/track_appearance.xml b/OsmAnd/res/layout/track_appearance.xml
index 074c5f8a86..3356a7f3f3 100644
--- a/OsmAnd/res/layout/track_appearance.xml
+++ b/OsmAnd/res/layout/track_appearance.xml
@@ -90,34 +90,7 @@
 
 	</LinearLayout>
 
-	<FrameLayout
-		android:id="@+id/map_controls_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		tools:visibility="invisible">
-
-		<include
-			layout="@layout/map_ruler"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="start|bottom"
-			android:layout_marginStart="@dimen/fab_margin_right"
-			android:layout_marginLeft="@dimen/fab_margin_right"
-			android:layout_marginEnd="@dimen/fab_margin_right"
-			android:layout_marginRight="@dimen/fab_margin_right" />
-
-		<include
-			layout="@layout/map_hud_controls"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="end|bottom"
-			android:layout_marginStart="@dimen/fab_margin_right"
-			android:layout_marginLeft="@dimen/fab_margin_right"
-			android:layout_marginEnd="@dimen/fab_margin_right"
-			android:layout_marginRight="@dimen/fab_margin_right" />
-
-	</FrameLayout>
+	<include layout="@layout/context_menu_controls" />
 
 	<LinearLayout
 		android:id="@+id/control_buttons"
diff --git a/OsmAnd/res/layout/track_menu.xml b/OsmAnd/res/layout/track_menu.xml
index 2b512b161c..671a9332f1 100644
--- a/OsmAnd/res/layout/track_menu.xml
+++ b/OsmAnd/res/layout/track_menu.xml
@@ -191,6 +191,8 @@
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+	<include layout="@layout/context_menu_controls" />
+
 	<com.google.android.material.bottomnavigation.BottomNavigationView
 		android:id="@+id/bottom_navigation"
 		android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
index ff7a55180d..4d09bafbd5 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
@@ -259,6 +259,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 
 			if (isPortrait()) {
 				AndroidUiHelper.updateVisibility(getTopShadow(), true);
+				AndroidUiHelper.updateVisibility(view.findViewById(R.id.map_my_location_button), false);
 			} else {
 				int widthNoShadow = getLandscapeNoShadowWidth();
 				FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(widthNoShadow, ViewGroup.LayoutParams.WRAP_CONTENT);
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/MapQuickActionLayer.java
index fe4b73dfba..4ba977235e 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/MapQuickActionLayer.java
@@ -425,6 +425,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
 				measurementToolLayer.isInMeasurementMode() ||
                 mapMarkersLayer.isInPlanRouteMode() ||
                 gpxLayer.isInTrackAppearanceMode() ||
+                mapControlsLayer.isInTrackMenuMode() ||
                 mapRouteInfoMenu.isVisible() ||
                 MapRouteInfoMenu.chooseRoutesVisible ||
                 MapRouteInfoMenu.waypointsVisible ||