diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java
index 8431df7244..57b87dcc8c 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java
@@ -1,25 +1,9 @@
 package net.osmand.binary;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.WireFormat;
 
-import gnu.trove.iterator.TLongObjectIterator;
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.list.array.TLongArrayList;
-import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.map.hash.TLongObjectHashMap;
 import net.osmand.PlatformUtil;
 import net.osmand.ResultMatcher;
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
@@ -34,6 +18,23 @@ import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 import net.osmand.util.OpeningHoursParser;
 
+import org.apache.commons.logging.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import gnu.trove.iterator.TLongObjectIterator;
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.list.array.TLongArrayList;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.map.hash.TLongObjectHashMap;
+
 public class BinaryMapRouteReaderAdapter {
 	protected static final Log LOG = PlatformUtil.getLog(BinaryMapRouteReaderAdapter.class);
 	private static final int SHIFT_COORDINATES = 4;
@@ -303,6 +304,7 @@ public class BinaryMapRouteReaderAdapter {
 		public int directionTrafficSignalsBackward = -1;
 		public int trafficSignals = -1;
 		public int stopSign = -1;
+		public int stopMinor = -1;
 		public int giveWaySign = -1;
 		
 		int nameTypeRule = -1;
@@ -363,6 +365,8 @@ public class BinaryMapRouteReaderAdapter {
 				destinationRefTypeRule = id;
 			} else if (tags.equals("highway") && val.equals("traffic_signals")){
 				trafficSignals = id;
+			} else if (tags.equals("stop") && val.equals("minor")) {
+				stopMinor = id;
 			} else if (tags.equals("highway") && val.equals("stop")){
 				stopSign = id;
 			} else if (tags.equals("highway") && val.equals("give_way")){
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
index f444a56b04..b6dc2f2176 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
@@ -519,6 +519,24 @@ public class RouteDataObject {
 		}
 		return pointTypes[ind];
 	}
+	
+	public void removePointType(int ind, int type) {
+		if (pointTypes != null || ind < pointTypes.length) {
+			int[] typesArr = pointTypes[ind];
+
+			for (int i = 0; i < typesArr.length; i++) {
+				if (typesArr[i] == type) {
+					int[] result = new int[typesArr.length - 1];
+					System.arraycopy(typesArr, 0, result, 0, i);
+					if (typesArr.length != i) {
+						System.arraycopy(typesArr, i + 1, result, i, typesArr.length - 1 - i);
+						pointTypes[ind] = result;
+						break;
+					}
+				}
+			}
+		}
+	}
 
 	public int[] getTypes() {
 		return types;
diff --git a/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
index 882231d8a6..f014a4fc8b 100644
--- a/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
+++ b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
@@ -436,7 +436,7 @@ public class OsmandRegions {
 			cx /= object.getPointsLength();
 			cy /= object.getPointsLength();
 			rd.regionCenter = new LatLon(MapUtils.get31LatitudeY((int) cy), MapUtils.get31LongitudeX((int) cx));
-			rd.boundingBox = findBoundingBox(object);
+			findBoundaries(rd, object);
 		}
 
 		rd.regionParentFullName = mapIndexFields.get(mapIndexFields.parentFullName, object);
@@ -462,13 +462,15 @@ public class OsmandRegions {
 		return rd;
 	}
 
-	private QuadRect findBoundingBox(BinaryMapDataObject object) {
+	private void findBoundaries(WorldRegion rd, BinaryMapDataObject object) {
 		if (object.getPointsLength() == 0) {
-			return new QuadRect(0, 0, 0, 0);
+			return;
 		}
 
+		List<LatLon> polygon = new ArrayList<>();
 		double currentX = object.getPoint31XTile(0);
 		double currentY = object.getPoint31YTile(0);
+		polygon.add(new LatLon(currentX, currentY));
 		double minX = currentX;
 		double maxX = currentX;
 		double minY = currentY;
@@ -488,6 +490,7 @@ public class OsmandRegions {
 				} else if (currentY < minY) {
 					minY = currentY;
 				}
+				polygon.add(new LatLon(currentX, currentY));
 			}
 		}
 
@@ -496,7 +499,8 @@ public class OsmandRegions {
 		double revertedMinY = MapUtils.get31LatitudeY((int) maxY);
 		double revertedMaxY = MapUtils.get31LatitudeY((int) minY);
 
-		return new QuadRect(minX, revertedMinY, maxX, revertedMaxY);
+		rd.boundingBox = new QuadRect(minX, revertedMinY, maxX, revertedMaxY);
+		rd.polygon = polygon;
 	}
 
 	private String getSearchIndex(BinaryMapDataObject object) {
diff --git a/OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java b/OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java
index b6fdb4f7d4..e3b2aa2a69 100644
--- a/OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java
+++ b/OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java
@@ -42,6 +42,7 @@ public class WorldRegion implements Serializable {
 	protected boolean regionMapDownload;
 	protected LatLon regionCenter;
 	protected QuadRect boundingBox;
+	protected List<LatLon> polygon;
 
 	public static class RegionParams {
 		protected String regionLeftHandDriving;
@@ -186,12 +187,23 @@ public class WorldRegion implements Serializable {
 	}
 
 	public boolean containsRegion(WorldRegion region) {
-		if (this.boundingBox != null && region.boundingBox != null) {
-			return this.boundingBox.contains(region.boundingBox);
+		if (containsBoundingBox(region.boundingBox)) {
+			// check polygon only if bounding box match
+			return containsPolygon(region.polygon);
 		}
 		return false;
 	}
 
+	private boolean containsBoundingBox(QuadRect rectangle) {
+		return (boundingBox != null && rectangle != null) &&
+				boundingBox.contains(rectangle);
+	}
+
+	private boolean containsPolygon(List<LatLon> another) {
+		return (polygon != null && another != null) &&
+				Algorithms.isFirstPolygonInsideSecond(another, polygon);
+	}
+
 	public boolean isContinent() {
 		if (superregion != null) {
 			String superRegionId = superregion.getRegionId();
diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
index 5e19d09658..cf86ca88ed 100644
--- a/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
@@ -153,35 +153,34 @@ public class OsmMapUtils {
 		}
 		boolean area = w.getFirstNodeId() == w.getLastNodeId();
 		// double check for area (could be negative all)
-		if(area) {
+		if (area) {
 			Node fn = w.getFirstNode();
 			Node ln = w.getLastNode();
-			if(fn != null && fn != null && MapUtils.getDistance(fn.getLatLon(), ln.getLatLon()) < 50) {
+			if (fn != null && fn != null && MapUtils.getDistance(fn.getLatLon(), ln.getLatLon()) < 50) {
 				area = true;
 			} else {
 				area = false;
 			}
 		}
 		LatLon ll = area ? getComplexPolyCenter(nodes, null) : getWeightCenterForNodes(nodes);
-		if(ll == null) {
+		if (ll == null) {
 			return null;
 		}
 		double flat = ll.getLatitude();
 		double flon = ll.getLongitude();
-		if(!area || !MapAlgorithms.containsPoint(nodes, ll.getLatitude(), ll.getLongitude())) {
+		if (!area || !MapAlgorithms.containsPoint(nodes, ll.getLatitude(), ll.getLongitude())) {
 			double minDistance = Double.MAX_VALUE;
 			for (Node n : nodes) {
 				if (n != null) {
 					double d = MapUtils.getDistance(n.getLatitude(), n.getLongitude(), ll.getLatitude(), ll.getLongitude());
-					if(d < minDistance) {
+					if (d < minDistance) {
 						flat = n.getLatitude();
 						flon = n.getLongitude();
 						minDistance = d;
 					}
 				}
-			}	
+			}
 		}
-		
 		return new LatLon(flat, flon);
 
 	}
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
index 26d984b2da..c6a5f1d393 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
@@ -176,11 +176,49 @@ public class RouteResultPreparation {
 		combineWayPointsForAreaRouting(ctx, result);
 		validateAllPointsConnected(result);
 		splitRoadsAndAttachRoadSegments(ctx, result, recalculation);
+		for (int i = 0; i < result.size(); i++) {
+			filterMinorStops(result.get(i));
+		}
 		calculateTimeSpeed(ctx, result);
-		
 		prepareTurnResults(ctx, result);
 		return result;
 	}
+	
+	public RouteSegmentResult filterMinorStops(RouteSegmentResult seg) {
+		List<Integer> stops = null;
+		boolean plus = seg.getStartPointIndex() < seg.getEndPointIndex();
+		int next;
+
+		for (int i = seg.getStartPointIndex(); i != seg.getEndPointIndex(); i = next) {
+			next = plus ? i + 1 : i - 1;
+			int[] pointTypes = seg.getObject().getPointTypes(i);
+			if (pointTypes != null) {
+				for (int j = 0; j < pointTypes.length; j++) {
+					if (pointTypes[j] == seg.getObject().region.stopMinor) {
+						if (stops == null) {
+							stops = new ArrayList<>();
+						}
+						stops.add(i);
+					}
+				}
+			}
+		}
+
+		if (stops != null) {
+			for (int stop : stops) {
+				List<RouteSegmentResult> attachedRoutes = seg.getAttachedRoutes(stop);
+				for (RouteSegmentResult attached : attachedRoutes) {
+					int attStopPriority = highwaySpeakPriority(attached.getObject().getHighway());
+					int segStopPriority = highwaySpeakPriority(seg.getObject().getHighway());
+					if (segStopPriority < attStopPriority) {
+						seg.getObject().removePointType(stop, seg.getObject().region.stopSign);
+						break;
+					}
+				}
+			}
+		}
+		return seg;
+	}
 
 	public void prepareTurnResults(RoutingContext ctx, List<RouteSegmentResult> result) {
 		for (int i = 0; i < result.size(); i ++) {
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java b/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
index c14d5cff07..df81a9ce18 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
@@ -8,7 +8,7 @@ public enum ObjectType {
 	// LOCATION
 	LOCATION(true), PARTIAL_LOCATION(false),
 	// UI OBJECTS
-	FAVORITE(true), FAVORITE_GROUP(false), WPT(true), RECENT_OBJ(true),
+	FAVORITE(true), FAVORITE_GROUP(false), WPT(true), RECENT_OBJ(true), GPX_TRACK(false),
 
 	// ONLINE SEARCH
 	ONLINE_SEARCH(true),
diff --git a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
index 36c0034a26..7aa4389f67 100644
--- a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
+++ b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
@@ -2,6 +2,7 @@ package net.osmand.util;
 
 import net.osmand.IProgress;
 import net.osmand.PlatformUtil;
+import net.osmand.data.LatLon;
 
 import org.apache.commons.logging.Log;
 import org.xmlpull.v1.XmlPullParser;
@@ -117,7 +118,7 @@ public class Algorithms {
 		}
 		return def;
 	}
-	
+
 	public static int parseIntSilently(String input, int def) {
 		if (input != null && input.length() > 0) {
 			try {
@@ -140,6 +141,35 @@ public class Algorithms {
 		return def;
 	}
 
+	public static boolean isFirstPolygonInsideSecond(List<LatLon> firstPolygon,
+	                                                 List<LatLon> secondPolygon) {
+		for (LatLon point : firstPolygon) {
+			if (!isPointInsidePolygon(point, secondPolygon)) {
+				// if at least one point is not inside the boundary, return false
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static boolean isPointInsidePolygon(LatLon point,
+	                                           List<LatLon> polygon) {
+		double pointX = point.getLongitude();
+		double pointY = point.getLatitude();
+		boolean result = false;
+		for (int i = 0, j = polygon.size() - 1; i < polygon.size(); j = i++) {
+			double x1 = polygon.get(i).getLongitude();
+			double y1 = polygon.get(i).getLatitude();
+			double x2 = polygon.get(j).getLongitude();
+			double y2 = polygon.get(j).getLatitude();
+			if ((y1 > pointY) != (y2 > pointY)
+					&& (pointX < (x2 - x1) * (pointY - y1) / (y2-y1) + x1)) {
+				result = !result;
+			}
+		}
+		return result;
+	}
+
 	public static String getFileNameWithoutExtension(File f) {
 		return getFileNameWithoutExtension(f.getName());
 	}
@@ -758,6 +788,10 @@ public class Algorithms {
 		return false;
 	}
 
+	public static boolean isInt(double d) {
+		return (d == Math.floor(d)) && !Double.isInfinite(d);
+	}
+
 	public static boolean isInt(String value) {
 		int length = value.length();
 		for (int i = 0; i < length; i++) {
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 01f760954b..a1c3af7e30 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -16,7 +16,6 @@
 	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
-	<uses-permission android:name="com.android.vending.BILLING" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
diff --git a/OsmAnd/build-common.gradle b/OsmAnd/build-common.gradle
index 38dce71283..d0dd3dba86 100644
--- a/OsmAnd/build-common.gradle
+++ b/OsmAnd/build-common.gradle
@@ -348,7 +348,7 @@ dependencies {
 	implementation 'org.immutables:gson:2.5.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'
 	implementation 'com.google.openlocationcode:openlocationcode:1.0.4'
-	implementation 'com.android.billingclient:billing:2.0.3'
+	implementation 'com.android.billingclient:billing:3.0.2'
 	// turn off for now
 	//implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
 	implementation 'com.squareup.picasso:picasso:2.71828'
diff --git a/OsmAnd/res/layout/colors_card.xml b/OsmAnd/res/layout/colors_card.xml
index bef11dc500..10b2483607 100644
--- a/OsmAnd/res/layout/colors_card.xml
+++ b/OsmAnd/res/layout/colors_card.xml
@@ -1,17 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<com.google.android.material.internal.FlowLayout
-		android:id="@+id/select_color"
-		android:layout_width="match_parent"
+	<net.osmand.plus.widgets.FlowLayout
+		android:id="@+id/select_custom_color"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding_small"
-		android:layout_marginLeft="@dimen/content_padding_small"
+		android:layout_marginStart="@dimen/list_content_padding"
+		android:layout_marginLeft="@dimen/list_content_padding"
+		android:layout_marginEnd="@dimen/list_content_padding"
+		android:layout_marginRight="@dimen/list_content_padding" />
+
+	<include
+		layout="@layout/simple_divider_item"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginStart="@dimen/list_content_padding"
+		android:layout_marginLeft="@dimen/list_content_padding"
 		android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
 		android:layout_marginBottom="@dimen/content_padding_half" />
 
+	<net.osmand.plus.widgets.FlowLayout
+		android:id="@+id/select_default_color"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/list_content_padding"
+		android:layout_marginLeft="@dimen/list_content_padding"
+		android:layout_marginEnd="@dimen/list_content_padding"
+		android:layout_marginRight="@dimen/list_content_padding" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/point_editor_button.xml b/OsmAnd/res/layout/point_editor_button.xml
index a5677280e9..5b1a130ac1 100644
--- a/OsmAnd/res/layout/point_editor_button.xml
+++ b/OsmAnd/res/layout/point_editor_button.xml
@@ -2,40 +2,30 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:paddingStart="0dp"
-	android:paddingLeft="0dp"
-	android:paddingEnd="@dimen/favorites_select_icon_button_right_padding"
-	android:paddingRight="@dimen/favorites_select_icon_button_right_padding"
-	android:paddingBottom="@dimen/context_menu_buttons_padding_bottom">
+	android:layout_height="wrap_content">
 
-	<FrameLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content">
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/outline"
+		android:layout_width="@dimen/favorites_icon_outline_size"
+		android:layout_height="@dimen/favorites_icon_outline_size"
+		android:visibility="invisible"
+		app:srcCompat="@drawable/bg_point_circle_contour" />
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/outline"
-			android:layout_width="@dimen/favorites_icon_outline_size"
-			android:layout_height="@dimen/favorites_icon_outline_size"
-			android:visibility="invisible"
-			app:srcCompat="@drawable/bg_point_circle_contour" />
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/background"
+		android:layout_width="@dimen/favorites_icon_size"
+		android:layout_height="@dimen/favorites_icon_size"
+		android:layout_gravity="center"
+		android:padding="@dimen/favorites_icon_padding"
+		app:srcCompat="@drawable/bg_point_circle" />
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/background"
-			android:layout_width="@dimen/favorites_icon_size"
-			android:layout_height="@dimen/favorites_icon_size"
-			android:padding="@dimen/favorites_icon_padding"
-			android:layout_gravity="center"
-			app:srcCompat="@drawable/bg_point_circle" />
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center"
+		android:clickable="false"
+		android:visibility="gone"
+		app:srcCompat="@drawable/mx_special_star_stroked" />
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/icon"
-			android:layout_width="@dimen/standard_icon_size"
-			android:layout_height="@dimen/standard_icon_size"
-			android:layout_gravity="center"
-			android:clickable="false"
-			android:visibility="gone"
-			app:srcCompat="@drawable/mx_special_star_stroked" 
-		/>
-	</FrameLayout>
 </FrameLayout>
diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml
index 679ca022fe..6beccf0dd7 100644
--- a/OsmAnd/res/layout/point_editor_fragment_new.xml
+++ b/OsmAnd/res/layout/point_editor_fragment_new.xml
@@ -84,6 +84,7 @@
 								android:drawableEnd="@drawable/btn_circle_transparent_full"
 								android:drawableRight="@drawable/btn_circle_transparent_full"
 								android:drawablePadding="@dimen/favorites_list_item_height"
+								android:imeOptions="actionDone"
 								android:inputType="textMultiLine"
 								android:maxLines="4"
 								android:minHeight="@dimen/favorites_list_item_height"
@@ -93,7 +94,6 @@
 								android:paddingRight="@dimen/content_padding_small"
 								android:scrollHorizontally="false"
 								android:textSize="@dimen/default_list_text_size"
-								android:imeOptions="actionDone"
 								tools:text="@string/lorem_ipsum" />
 
 						</com.google.android.material.textfield.TextInputLayout>
@@ -137,6 +137,7 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:gravity="start"
+							android:imeOptions="actionDone"
 							android:maxLines="4"
 							android:minHeight="@dimen/favorites_list_item_height"
 							android:paddingStart="@dimen/content_padding_small"
@@ -144,7 +145,6 @@
 							android:paddingEnd="@dimen/content_padding_small"
 							android:paddingRight="@dimen/content_padding_small"
 							android:textSize="@dimen/default_list_text_size"
-							android:imeOptions="actionDone"
 							tools:text="@string/lorem_ipsum" />
 
 					</com.google.android.material.textfield.TextInputLayout>
@@ -248,6 +248,7 @@
 					android:drawablePadding="8dp"
 					android:duplicateParentState="true"
 					android:gravity="center"
+					android:imeOptions="actionDone"
 					android:paddingStart="@dimen/content_padding_half"
 					android:paddingLeft="@dimen/content_padding_half"
 					android:paddingEnd="@dimen/content_padding_half"
@@ -255,7 +256,6 @@
 					android:text="@string/add_description"
 					android:textSize="@dimen/default_desc_text_size"
 					osmand:typeface="@string/font_roboto_medium"
-					android:imeOptions="actionDone"
 					tools:text="@string/add_description" />
 
 				<View
@@ -402,9 +402,11 @@
 					android:id="@+id/select_icon"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/content_padding_small"
-					android:layout_marginLeft="@dimen/content_padding_small"
+					android:layout_marginStart="@dimen/content_padding"
+					android:layout_marginLeft="@dimen/content_padding"
 					android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
+					android:layout_marginEnd="@dimen/content_padding"
+					android:layout_marginRight="@dimen/content_padding"
 					android:layout_marginBottom="@dimen/content_padding_half" />
 
 				<View
@@ -451,10 +453,9 @@
 					android:id="@+id/select_color"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/content_padding_small"
-					android:layout_marginLeft="@dimen/content_padding_small"
 					android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
-					android:layout_marginBottom="@dimen/content_padding_half" />
+					android:layout_marginBottom="@dimen/content_padding_half"
+					android:orientation="horizontal" />
 
 				<View
 					android:layout_width="match_parent"
@@ -500,9 +501,11 @@
 					android:id="@+id/select_shape"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/content_padding_small"
-					android:layout_marginLeft="@dimen/content_padding_small"
+					android:layout_marginStart="@dimen/content_padding"
+					android:layout_marginLeft="@dimen/content_padding"
 					android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
+					android:layout_marginEnd="@dimen/content_padding"
+					android:layout_marginRight="@dimen/content_padding"
 					android:layout_marginBottom="@dimen/content_padding_half"
 					android:gravity="start" />
 
diff --git a/OsmAnd/res/layout/preference_circle_item.xml b/OsmAnd/res/layout/preference_circle_item.xml
index 662b848f29..8fab8547a4 100644
--- a/OsmAnd/res/layout/preference_circle_item.xml
+++ b/OsmAnd/res/layout/preference_circle_item.xml
@@ -2,8 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:padding="7dp">
+	android:layout_height="wrap_content">
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/outline"
diff --git a/OsmAnd/res/layout/preference_color_select.xml b/OsmAnd/res/layout/preference_color_select.xml
index 97ad948f70..f1169c34aa 100644
--- a/OsmAnd/res/layout/preference_color_select.xml
+++ b/OsmAnd/res/layout/preference_color_select.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
 	<net.osmand.plus.widgets.FlowLayout
 		android:id="@+id/color_items"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_margin="4dp" />
+		android:layout_marginStart="@dimen/list_content_padding"
+		android:layout_marginLeft="@dimen/list_content_padding"
+		android:layout_marginEnd="@dimen/list_content_padding"
+		android:layout_marginRight="@dimen/list_content_padding" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_gpx_list_item.xml b/OsmAnd/res/layout/search_gpx_list_item.xml
new file mode 100644
index 0000000000..090513c7be
--- /dev/null
+++ b/OsmAnd/res/layout/search_gpx_list_item.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/searchListItemLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/dialog_button_ex_height"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/content_padding_half"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingTop="@dimen/content_padding_half"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingStart="@dimen/content_padding">
+
+        <androidx.appcompat.widget.AppCompatCheckBox
+            android:id="@+id/toggle_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/title_padding"
+            android:focusable="false"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:layout_marginEnd="@dimen/title_padding" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            osmand:srcCompat="@drawable/ic_action_polygom_dark"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:visibility="visible"
+            android:layout_marginEnd="@dimen/list_content_padding" />
+
+        <LinearLayout
+            android:id="@+id/name_and_read_section_container"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/gpx_text_top_margin"
+            android:paddingBottom="@dimen/gpx_text_top_margin"
+            android:layout_marginRight="@dimen/showAllButtonMarginRight"
+            android:layout_marginEnd="@dimen/showAllButtonMarginRight"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_list_text_size"
+                tools:text="@string/current_track"/>
+
+            <LinearLayout
+                android:id="@+id/read_section"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:orientation="horizontal"
+                android:visibility="visible"
+                android:gravity="center_vertical">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/distance_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/gpx_small_icon_margin"
+                    android:layout_marginEnd="@dimen/gpx_small_icon_margin"
+                    osmand:srcCompat="@drawable/ic_action_distance_16" />
+
+                <TextView
+                    android:id="@+id/distance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:maxLines="1"
+                    android:includeFontPadding="false"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"
+                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/points_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/gpx_small_icon_margin"
+                    android:layout_marginEnd="@dimen/gpx_small_icon_margin"
+                    osmand:srcCompat="@drawable/ic_action_waypoint_16" />
+
+                <TextView
+                    android:id="@+id/points_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:includeFontPadding="false"
+                    android:maxLines="1"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"
+                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/time_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/gpx_small_icon_margin"
+                    android:layout_marginEnd="@dimen/gpx_small_icon_margin"
+                    osmand:srcCompat="@drawable/ic_action_time_16" />
+
+                <TextView
+                    android:id="@+id/time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:maxLines="1"
+                    android:textColor="?android:textColorSecondary"
+                    android:includeFontPadding="false"
+                    android:textSize="@dimen/default_sub_text_size"
+                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/unknown_section"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/date_and_size_details"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:textColorSecondary"
+                    android:maxLines="1"
+                    android:textSize="@dimen/default_sub_text_size" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_sub_text_size"
+                android:visibility="gone"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/track_coloring_card.xml b/OsmAnd/res/layout/track_coloring_card.xml
index 2c7721f61d..0a7231f67a 100644
--- a/OsmAnd/res/layout/track_coloring_card.xml
+++ b/OsmAnd/res/layout/track_coloring_card.xml
@@ -21,8 +21,8 @@
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:paddingTop="@dimen/context_menu_padding_margin_tiny"
-		android:visibility="gone"
-		android:paddingBottom="@dimen/content_padding">
+		android:paddingBottom="@dimen/content_padding"
+		android:visibility="gone">
 
 		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/recycler_view"
@@ -41,13 +41,15 @@
 
 	</LinearLayout>
 
-	<com.google.android.material.internal.FlowLayout
+	<net.osmand.plus.widgets.FlowLayout
 		android:id="@+id/select_color"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding_small"
-		android:layout_marginLeft="@dimen/content_padding_small"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
 		android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
 		android:layout_marginBottom="@dimen/content_padding_half" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/track_split_interval.xml b/OsmAnd/res/layout/track_split_interval.xml
index ae823012cd..2fdcfc467c 100644
--- a/OsmAnd/res/layout/track_split_interval.xml
+++ b/OsmAnd/res/layout/track_split_interval.xml
@@ -5,57 +5,25 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<RadioGroup
-		android:id="@+id/split_type"
+	<TextView
+		android:id="@+id/description"
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/dialog_button_height"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginTop="@dimen/text_margin_small"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding_small"
-		android:background="?attr/btn_bg_border_inactive"
-		android:baselineAligned="false"
-		android:orientation="horizontal">
+		android:layout_height="wrap_content"
+		android:ellipsize="end"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+		android:text="@string/gpx_split_interval_descr"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding" />
 
-		<RadioButton
-			android:id="@+id/no_split"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"
-			android:background="?attr/btn_radio_button_left"
-			android:button="@android:color/transparent"
-			android:checked="true"
-			android:foreground="?attr/selectableItemBackground"
-			android:gravity="center"
-			android:text="@string/shared_string_none"
-			android:textColor="@drawable/radio_flat_text_selector_light" />
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/content_padding" />
 
-		<RadioButton
-			android:id="@+id/time_split"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"
-			android:background="?attr/btn_radio_button_center"
-			android:button="@android:color/transparent"
-			android:foreground="?attr/selectableItemBackground"
-			android:gravity="center"
-			android:text="@string/shared_string_time"
-			android:textColor="@drawable/radio_flat_text_selector_light" />
-
-		<RadioButton
-			android:id="@+id/distance_split"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"
-			android:background="?attr/btn_radio_button_right"
-			android:button="@android:color/transparent"
-			android:foreground="?attr/selectableItemBackground"
-			android:gravity="center"
-			android:text="@string/distance"
-			android:textColor="@drawable/radio_flat_text_selector_light"
-			android:textSize="@dimen/default_desc_text_size" />
-
-	</RadioGroup>
+	<include layout="@layout/custom_radio_buttons" />
 
 	<LinearLayout
 		android:id="@+id/slider_container"
@@ -77,7 +45,7 @@
 				android:layout_weight="1"
 				android:gravity="start"
 				android:lineSpacingExtra="@dimen/line_spacing_extra_description"
-				android:text="@string/gpx_split_interval"
+				android:text="@string/shared_string_interval"
 				android:textColor="?android:textColorPrimary"
 				android:textSize="@dimen/default_list_text_size" />
 
@@ -143,6 +111,7 @@
 		android:layout_marginStart="@dimen/content_padding"
 		android:layout_marginEnd="@dimen/content_padding"
 		android:layout_marginBottom="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_half"
 		android:lineSpacingExtra="@dimen/line_spacing_extra_description"
 		android:text="@string/gpx_split_interval_none_descr"
 		android:textColor="?android:textColorSecondary"
diff --git a/OsmAnd/res/layout/track_width_card.xml b/OsmAnd/res/layout/track_width_card.xml
index 3710ad43b4..e919df6e29 100644
--- a/OsmAnd/res/layout/track_width_card.xml
+++ b/OsmAnd/res/layout/track_width_card.xml
@@ -52,7 +52,6 @@
 			android:layout_height="wrap_content"
 			android:orientation="horizontal"
 			android:paddingStart="@dimen/content_padding"
-			android:paddingTop="@dimen/content_padding"
 			android:paddingEnd="@dimen/content_padding">
 
 			<net.osmand.plus.widgets.TextViewEx
@@ -72,11 +71,20 @@
 				android:layout_weight="1"
 				android:gravity="end"
 				android:lineSpacingExtra="@dimen/line_spacing_extra_description"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/default_list_text_size" />
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="1" />
 
 		</LinearLayout>
 
+		<com.google.android.material.slider.Slider
+			android:id="@+id/width_slider"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:stepSize="1" />
+
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -89,28 +97,23 @@
 				android:id="@+id/width_value_min"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="wrap_content"
+				android:layout_weight="1"
 				android:gravity="start"
 				android:lineSpacingExtra="@dimen/line_spacing_extra_description"
 				android:textColor="?android:textColorSecondary"
-				android:textSize="@dimen/default_list_text_size" />
-
-			<com.google.android.material.slider.Slider
-				android:id="@+id/width_slider"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
-				android:layout_weight="1"
-				android:stepSize="1" />
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="1" />
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/width_value_max"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="wrap_content"
+				android:layout_weight="1"
 				android:gravity="end"
 				android:lineSpacingExtra="@dimen/line_spacing_extra_description"
 				android:textColor="?android:textColorSecondary"
-				android:textSize="@dimen/default_list_text_size" />
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="24" />
 
 		</LinearLayout>
 
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index e374f5a869..eddda38785 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -2123,10 +2123,6 @@
     <string name="quick_action_interim_dialog">عرض مربع الحوار مؤقتاً</string>
     <string name="favorite_autofill_toast_text">" حفظ إلى "</string>
     <string name="favorite_empty_place_name">مكان</string>
-    <string name="quick_action_showhide_favorites_title">عرض/إخفاء المفضلة</string>
-    <string name="quick_action_favorites_show">عرض المفضلة</string>
-    <string name="quick_action_favorites_hide">إخفاء المفضلة</string>
-    <string name="quick_action_showhide_poi_title">عرض/إخفاء نقاط الاهتمام</string>
     <string name="quick_action_poi_show">عرض %1$s</string>
     <string name="quick_action_poi_hide">إخفاء %1$s</string>
     <string name="quick_action_add_category">إضافة فئة</string>
@@ -2241,9 +2237,6 @@
 \n • إضافة POI ورفعها مباشرة إلى الموقع (أو في وقت لاحق إن كنت غير متصل بالشبكة)
 \n</string>
     <string name="nothing_found_descr">عدل طلب البحث أو زد النطاق.</string>
-    <string name="quick_action_showhide_osmbugs_title">عرض/إخفاء ملاحظات OSM</string>
-    <string name="quick_action_osmbugs_show">إظهار ملاحظات OSM</string>
-    <string name="quick_action_osmbugs_hide">إخفاء ملاحظات OSM</string>
     <string name="sorted_by_distance">مرتبة حسب المسافة</string>
     <string name="shared_string_overview">نظرة عامة</string>
     <string name="quick_action_auto_zoom">التكبير التلقائي</string>
@@ -2880,10 +2873,7 @@
     <string name="shared_string_swap">تبديل</string>
     <string name="show_more">اعرض المزيد</string>
     <string name="tracks_on_map">المسارات على الخريطة</string>
-    <string name="quick_action_show_hide_gpx_tracks">إظهار/إخفاء مسارات GPX</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">إظهار أو إخفاء مسارات GPX المحددة على الخريطة.</string>
-    <string name="quick_action_gpx_tracks_hide">إخفاء المسارات</string>
-    <string name="quick_action_gpx_tracks_show">عرض المسارات</string>
     <string name="add_destination_query">الرجاء إضافة الوجهة أولاً</string>
     <string name="previous_route">الطريق السابق</string>
     <string name="add_start_and_end_points">إضافة نقاط بداية ونهاية</string>
@@ -3070,13 +3060,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">تفضيل الطرق غير المعبدة عند التوجيه.</string>
     <string name="layer_osm_edits">تحرير خرائط OSM</string>
     <string name="quick_action_contour_lines_descr">لإظهار أو إخفاء الخطوط الكنتورية على الخريطة.</string>
-    <string name="quick_action_contour_lines_show">إظهار الخطوط الكنتورية</string>
-    <string name="quick_action_contour_lines_hide">إخفاء الخطوط الكنتورية</string>
-    <string name="quick_action_show_hide_contour_lines">إظهار/إخفاء الخطوط الكنتورية</string>
     <string name="quick_action_hillshade_descr">لإظهار وإخفاء التضاريس على الخريطة.</string>
-    <string name="quick_action_hillshade_show">إظهار التضاريس</string>
-    <string name="quick_action_hillshade_hide">إخفاء التضاريس</string>
-    <string name="quick_action_show_hide_hillshade">إظهار/إخفاء التضاريس</string>
     <string name="tts_initialization_error">لا يمكن بدء تشغيل أداة تحويل النص إلى كلام.</string>
     <string name="export_profile">تصدير الوضع</string>
     <string name="exported_osmand_profile">وضع أوسماند: %1$s</string>
@@ -3557,9 +3541,6 @@
     <string name="add_description">إضافة وصف</string>
     <string name="delete_description">حذف الوصف</string>
     <string name="quick_action_terrain_descr">زر لإظهار طبقة التضاريس أو إخفائها على الخريطة.</string>
-    <string name="quick_action_terrain_show">إظهار التضاريس</string>
-    <string name="quick_action_terrain_hide">إخفاء التضاريس</string>
-    <string name="quick_action_show_hide_terrain">إظهارأو إخفاء التضاريس</string>
     <string name="download_slope_maps">المنحدرات</string>
     <string name="shared_string_hillshade">التضاريس</string>
     <string name="terrain_empty_state_text">تمكين لعرض المنحدرات أو خريطة التضاريس. يمكنك قراءة المزيد عن أنواع الخرائط هذه على موقعنا.</string>
@@ -3680,9 +3661,6 @@
 \n</string>
     <string name="shared_string_resume">إستئناف</string>
     <string name="additional_actions_descr">يمكنك الوصول إلى هذه الإجراءات عن طريق النقر على زر \"%1$s\".</string>
-    <string name="quick_action_transport_hide">إخفاء وسائل النقل العام</string>
-    <string name="quick_action_transport_show">إظهار وسائل النقل العام</string>
-    <string name="quick_action_show_hide_transport">إظهارأو إخفاء وسائل النقل العام</string>
     <string name="quick_action_transport_descr">زر لإظهار أو إخفاء وسائل النقل العام على الخريطة.</string>
     <string name="create_edit_poi">إنشاء أو تعديل نقطة الأهتمام POI</string>
     <string name="parking_positions">مكان الموقف</string>
@@ -3750,9 +3728,6 @@
     <string name="vessel_height_warning_link">ضبط ارتفاع السفينة</string>
     <string name="vessel_height_warning">يمكنك ضبط ارتفاع الحاوية لتجنب الجسور المنخفضة. ضع في اعتبارك أنه إذا كان الجسر متحركاً ، فسوف نستخدم ارتفاعه في الحالة المفتوحة.</string>
     <string name="vessel_width_limit_description">تحديد عرض السفينة لتجنب الجسور الضيقة</string>
-    <string name="quick_action_showhide_mapillary_title">إظهار/إخفاء مابيلاري</string>
-    <string name="quick_action_mapillary_hide">إخفاء مابيلاري</string>
-    <string name="quick_action_mapillary_show">إظهار مابيلاري</string>
     <string name="quick_action_showhide_mapillary_descr">إظهار أو إخفاء طبقة مابيلاري على الخريطة.</string>
     <string name="speed_camera_pois">POI كاميرا مراقبة السرعة</string>
     <string name="uninstall_speed_cameras">إلغاء تثبيت كاميرات السرعة</string>
diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index e800999147..63278da079 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -741,10 +741,6 @@
     <string name="quick_action_add_favorite">Favorit əlavə et</string>
     <string name="favorite_autofill_toast_text">" burda saxlandı: "</string>
     <string name="favorite_empty_place_name">Yer</string>
-    <string name="quick_action_showhide_favorites_title">Favoritləri göstər/gizlət</string>
-    <string name="quick_action_favorites_show">Favoritləri göstər</string>
-    <string name="quick_action_favorites_hide">Favoritləri gizlət</string>
-    <string name="quick_action_showhide_poi_title">POI-ni göstər/gizlət</string>
     <string name="quick_action_poi_show">%1$s-i göstər</string>
     <string name="quick_action_poi_hide">%1$s-i gizlət</string>
     <string name="quick_action_add_category">Kateqoriya əlavə et</string>
@@ -754,9 +750,6 @@
     <string name="quick_action_map_styles">Xəritə stilləri</string>
     <string name="increase_search_radius">Axtarış radiusunu artır</string>
     <string name="nothing_found_descr">Axtarış sorğusunu dəyişin və ya axtarış radiusunu artırın.</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM qeydlərini göstər və ya gizlət</string>
-    <string name="quick_action_osmbugs_show">OSM qeydlərini göstər</string>
-    <string name="quick_action_osmbugs_hide">OSM qeydlərini gizlət</string>
     <string name="quick_action_showhide_osmbugs_descr">Bu fəaliyyət düyməsinə toxunulduqda, xəritədə OSM qeydləri göstəriləcək və ya gizlədiləcək.</string>
     <string name="sorted_by_distance">Məsafəyə görə sırala</string>
     <string name="search_favorites">Favoritlərdə axtar</string>
@@ -2152,9 +2145,6 @@
     <string name="shared_string_uninstall">Sil</string>
     <string name="shared_string_tones">ton</string>
     <string name="shared_string_meters">metr</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary-ni göstər/gizlət</string>
-    <string name="quick_action_mapillary_hide">Mapillary-ni gizlət</string>
-    <string name="quick_action_mapillary_show">Mapillary-ni göstər</string>
     <string name="item_deleted">%1$s silindi</string>
     <string name="shared_string_uninstall_and_restart">Sil və yenidən başlat</string>
     <string name="search_download_wikipedia_maps">Vikipediya xəritələrini endir</string>
diff --git a/OsmAnd/res/values-b+ast/strings.xml b/OsmAnd/res/values-b+ast/strings.xml
index f1815fc169..787572e21b 100644
--- a/OsmAnd/res/values-b+ast/strings.xml
+++ b/OsmAnd/res/values-b+ast/strings.xml
@@ -539,7 +539,6 @@
     <string name="increase_search_radius">Aumentar el radiu de gueta</string>
     <string name="nothing_found">Nun s\'alcontró nada</string>
     <string name="nothing_found_descr">Modifica la consulta o aumenta\'l radiu de gueta.</string>
-    <string name="quick_action_showhide_osmbugs_title">Alternar notes d\'OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa les notes d\'OSM.</string>
     <string name="shared_string_plugin">Plugin</string>
     <string name="srtm_color_scheme">Esquema de colores</string>
@@ -1114,7 +1113,6 @@
     <string name="quick_action_switch_night_mode">Mou nocherniegu</string>
     <string name="quick_action_showhide_favorites_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa los puntos favoritos.</string>
     <string name="quick_action_showhide_poi_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa los PdI.</string>
-    <string name="quick_action_showhide_favorites_title">Amosar/anubrir Favoritos</string>
     <string name="quick_action_add_navigation">Navegación</string>
     <string name="quick_action_bug_descr">Esti mensaxe inclúise nel campu de comentarios.</string>
     <string name="quick_action_gpx_category_descr">Esbilla una estaya opcional.</string>
@@ -1308,7 +1306,6 @@
     <string name="update_all">Anovar too (%1$sMB)</string>
     <string name="quick_action_map_style">Camudar l\'estilu del mapa</string>
     <string name="quick_action_day_night_switch_mode">Cambiar al mou día/nueche</string>
-    <string name="quick_action_showhide_poi_title">Amosar/anubrir PdI</string>
     <string name="quick_action_add_create_items">Creación d\'elementos</string>
     <string name="quick_action_add_configure_map">Configuración del mapa</string>
     <string name="waypoint_one">Puntu 1</string>
diff --git a/OsmAnd/res/values-b+be+Latn/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml
index 5ae3b5317a..83b3e3f846 100644
--- a/OsmAnd/res/values-b+be+Latn/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@@ -2017,9 +2017,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="increase_search_radius">Pavialičyć radyus pošuku</string>
     <string name="nothing_found">Ničoha nie znojdziena</string>
     <string name="nothing_found_descr">Źmianicie pošukavy zapyt abo pavialičcie radyus pošuku.</string>
-    <string name="quick_action_showhide_osmbugs_title">Pakazać/schavać OSM-natatki</string>
-    <string name="quick_action_osmbugs_show">Pakazać OSM-natatki</string>
-    <string name="quick_action_osmbugs_hide">Schavać OSM-natatki</string>
     <string name="quick_action_showhide_osmbugs_descr">Nacisk na hetuju knopku pakaža ci schavaje OSM-natatki na mapie.</string>
     <string name="sorted_by_distance">Adsartavana pa adlehłaści</string>
     <string name="search_favorites">Pošuk upadabanych</string>
@@ -2156,10 +2153,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="quick_action_navigation_voice_off">Ukliučyć Holas</string>
     <string name="quick_action_add_first_intermediate">Dadać pieršy pramiežkavy punkt</string>
     <string name="quick_action_interim_dialog">Pakazać pramiežkavy dyjaloh</string>
-    <string name="quick_action_showhide_favorites_title">Pakazać/schavać upadabanyja</string>
-    <string name="quick_action_favorites_show">Pakazać upadabanyja</string>
-    <string name="quick_action_favorites_hide">Schavać upadabanyja</string>
-    <string name="quick_action_showhide_poi_title">Pakazać/schavać POI</string>
     <string name="quick_action_poi_show">Pakazać %1$s</string>
     <string name="quick_action_poi_hide">Schavać %1$s</string>
     <string name="quick_action_add_category">Dadać katehoryu</string>
@@ -2823,10 +2816,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="shared_string_swap">Pamianiać</string>
     <string name="show_more">Pakazać boĺš</string>
     <string name="tracks_on_map">Adliustroŭvajemyja sliady</string>
-    <string name="quick_action_show_hide_gpx_tracks">Pakazać/schavać GPX-sliady</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Nacisk na knopku dziejannia pakaža ci schavaje abranyja GPX-sliady na mapie</string>
-    <string name="quick_action_gpx_tracks_hide">Schavać GPX-sliady</string>
-    <string name="quick_action_gpx_tracks_show">Pakazać GPX-sliady</string>
     <string name="add_destination_query">Spačatku dadajcie punkt pryznačennia</string>
     <string name="previous_route">Papiaredni maršrut</string>
     <string name="add_home">Dadać dom</string>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index 242e4465ce..d9c186a2d7 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -912,9 +912,6 @@
     <string name="increase_search_radius">Pytanski radius powjetšić</string>
     <string name="nothing_found">Žadyn pytanski wuslědk</string>
     <string name="nothing_found_descr">Změń pytanje abo powjetš jeho radius.</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-noticy pokazać/schować</string>
-    <string name="quick_action_osmbugs_show">OSM-noticy pokazać</string>
-    <string name="quick_action_osmbugs_hide">OSM-noticy schować</string>
     <string name="sorted_by_distance">Sortěrowane po zdalenosći</string>
     <string name="search_favorites">W faworitach pytać</string>
     <string name="hillshade_menu_download_descr">Sćehń reliefowu kartu, zo by so relief pokazał.</string>
@@ -1021,10 +1018,6 @@
     <string name="add_point_before">Předchadny dypk dodać</string>
     <string name="add_point_after">Přichodny dypk dodać</string>
     <string name="quick_action_start_stop_navigation">Nawigaciju zahajić/přetorhnyć</string>
-    <string name="quick_action_showhide_favorites_title">Fawority pokazać/schować</string>
-    <string name="quick_action_favorites_show">Fawority pokazać</string>
-    <string name="quick_action_favorites_hide">Fawority schować</string>
-    <string name="quick_action_showhide_poi_title">POI pokazać/schować</string>
     <string name="quick_action_poi_show">%1$s pokazać</string>
     <string name="quick_action_poi_hide">%1$s schować</string>
     <string name="quick_action_add_category">Kategoriju dodać</string>
@@ -1581,12 +1574,6 @@
     <string name="update_all_maps">Wšě karty aktualizować</string>
     <string name="update_all_maps_q">Chceš woprawdźe wšě (%1$d) karty aktualizować\?</string>
     <string name="layer_osm_edits">Změny na OSM</string>
-    <string name="quick_action_contour_lines_show">Pokazaj wysokostne linije</string>
-    <string name="quick_action_contour_lines_hide">Schowaj wysokostne linije</string>
-    <string name="quick_action_show_hide_contour_lines">Wysokostne linije pokazać/schować</string>
-    <string name="quick_action_hillshade_show">Pokazaj relief</string>
-    <string name="quick_action_hillshade_hide">Schowaj relief</string>
-    <string name="quick_action_show_hide_hillshade">Relief pokazać/schować</string>
     <string name="export_profile">Profil eksportować</string>
     <string name="exported_osmand_profile">OsmAnd-profil: %1$s</string>
     <string name="overwrite_profile_q">Profil \'%1$s\' hižo eksistuje. Chceš jón přepisać\?</string>
diff --git a/OsmAnd/res/values-b+kab/strings.xml b/OsmAnd/res/values-b+kab/strings.xml
index 89deec4af6..d10a9afb04 100644
--- a/OsmAnd/res/values-b+kab/strings.xml
+++ b/OsmAnd/res/values-b+kab/strings.xml
@@ -1044,8 +1044,6 @@
     <string name="quick_action_add_configure_map">Swel…</string>
     <string name="quick_action_poi_hide">Ffer %1$S</string>
     <string name="quick_action_poi_show">Sken %1$S</string>
-    <string name="quick_action_favorites_hide">Inurifen</string>
-    <string name="quick_action_favorites_show">Sken inurifen</string>
     <string name="quick_actions_delete">Kkes tigawt</string>
     <string name="quick_action_edit_action">Tigawt</string>
     <string name="quick_action_navigation_voice_on">Taɣect:</string>
@@ -1254,9 +1252,6 @@
     <string name="select_distance_route_will_recalc">Fren ameccaq ugar n wanida ara d-yettwasiden ubrid.</string>
     <string name="recalculate_route_distance_promo">Abrid ad yettwasiḍen ticki ameccaq gar ubrid akked wadig-ik yugar azal i d-yettwammlen.</string>
     <string name="download_slope_maps">Iberdan isnawanen</string>
-    <string name="quick_action_show_hide_terrain">Sken/ffer akal</string>
-    <string name="quick_action_terrain_hide">Ffer akal</string>
-    <string name="quick_action_terrain_show">Sken akal</string>
     <string name="quick_action_terrain_descr">Taqeffalt i uskan neɣ tuffra n tissi n wakal n tkarḍa.</string>
     <string name="delete_description">Kkes aglam</string>
     <string name="select_group">Fren agraw</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 1f45267fa8..d1ee6e9d85 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2137,10 +2137,6 @@
     <string name="quick_actions_delete">Выдаліць дзеянне</string>
     <string name="quick_actions_delete_text">Сапраўды выдаліць дзеянне \"%s\"\?</string>
     <string name="favorite_empty_place_name">Месца</string>
-    <string name="quick_action_showhide_favorites_title">Паказаць/схаваць улюбёныя мясціны</string>
-    <string name="quick_action_favorites_show">Паказаць улюбёныя мясціны</string>
-    <string name="quick_action_favorites_hide">Схаваць улюбёныя мясціны</string>
-    <string name="quick_action_showhide_poi_title">Паказаць/схаваць POI</string>
     <string name="quick_action_poi_show">Паказаць %1$s</string>
     <string name="quick_action_poi_hide">Схаваць %1$s</string>
     <string name="quick_action_add_category">Дадаць катэгорыю</string>
@@ -2310,9 +2306,6 @@
     <string name="increase_search_radius">Павялічыць радыус пошуку</string>
     <string name="nothing_found">Нічога не знойдзена</string>
     <string name="nothing_found_descr">Змяніць пошукавы запыт альбо павялічыць радыус пошуку.</string>
-    <string name="quick_action_showhide_osmbugs_title">Паказаць/схаваць OSM-нататкі</string>
-    <string name="quick_action_osmbugs_show">Паказаць OSM-нататкі</string>
-    <string name="quick_action_osmbugs_hide">Схаваць OSM-нататкі</string>
     <string name="quick_action_showhide_osmbugs_descr">Кнопка для паказу / хавання OSM-нататак на мапе.</string>
     <string name="sorted_by_distance">Адсартавана па адлегласці</string>
     <string name="search_favorites">Пошук ва ўлюбёных мясцінах</string>
@@ -2892,10 +2885,7 @@
     <string name="shared_string_swap">Памяняць</string>
     <string name="show_more">Паказаць больш</string>
     <string name="tracks_on_map">Адлюстроўваемыя сляды</string>
-    <string name="quick_action_show_hide_gpx_tracks">Паказаць/схаваць сляды</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Кнопка для адлюстравання/хавання абраных слядоў на мапе.</string>
-    <string name="quick_action_gpx_tracks_hide">Схаваць сляды</string>
-    <string name="quick_action_gpx_tracks_show">Паказаць сляды</string>
     <string name="use_osm_live_public_transport_description">Уключыць грамадскі транспарт для змен OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Грамадскі транспарт OsmAnd Live</string>
     <string name="transfers_size">%1$d перасадак</string>
@@ -3314,13 +3304,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Аддаваць перавагу дарогам без пакрыцця.</string>
     <string name="layer_osm_edits">Змены OSM</string>
     <string name="quick_action_contour_lines_descr">Кнопка для адлюстравання/хавання контурных ліній на мапе.</string>
-    <string name="quick_action_contour_lines_show">Паказаць контурныя лініі</string>
-    <string name="quick_action_contour_lines_hide">Схаваць контурныя лініі</string>
-    <string name="quick_action_show_hide_contour_lines">Паказаць/схаваць контурныя лініі</string>
     <string name="quick_action_hillshade_descr">Кнопка для адлюстравання/хавання зацянення рэльефу на мапе.</string>
-    <string name="quick_action_hillshade_show">Паказаць зацяненне рэльефу</string>
-    <string name="quick_action_hillshade_hide">Схаваць зацяненне рэльефу</string>
-    <string name="quick_action_show_hide_hillshade">Паказаць/схаваць зацяненне рэльефу</string>
     <string name="tts_initialization_error">Немагчыма запусціць механізм пераўтварэння тэксту ў гаворку.</string>
     <string name="export_profile">Экспарт профілю</string>
     <string name="exported_osmand_profile">Профіль OsmAnd: %1$s</string>
@@ -3432,14 +3416,10 @@
     <string name="add_edit_favorite">Дадаць ці рэдагаваць улюбёнае</string>
     <string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
     <string name="back_to_editing">Вярнуцца да рэдагавання</string>
-    <string name="quick_action_transport_show">Паказаць грамадскі транспарт</string>
     <string name="quick_action_transport_descr">Кнопка для паказу ці хавання грамадскага транспарту на мапе.</string>
     <string name="shared_string_add_profile">Дадаць профіль</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схілы</string>
-    <string name="quick_action_show_hide_terrain">Паказаць ці схаваць рэльеф</string>
-    <string name="quick_action_terrain_hide">Схаваць рэльеф</string>
-    <string name="quick_action_terrain_show">Паказаць рэльеф</string>
     <string name="delete_description">Выдаліць апісанне</string>
     <string name="add_description">Дадаць апісанне</string>
     <string name="select_group">Абраць групу</string>
@@ -3514,14 +3494,9 @@
     <string name="search_poi_types_descr">Можна спалучаць тыпы POI з розных катэгорый. Націсніце \"Пераключыць\", каб абраць усе ці націсніце злева, каб абраць катэгорыю.</string>
     <string name="change_application_profile">Змяніць профіль праграмы</string>
     <string name="index_item_world_basemap_detailed">Аглядная мапа свету (падрабязная)</string>
-    <string name="quick_action_transport_hide">Схаваць грамадскі транспарт</string>
-    <string name="quick_action_show_hide_transport">Паказаць ці схаваць грамадскі транспарт</string>
     <string name="recalculate_route_in_deviation">Пералічыць маршрут у выпадку адхілення</string>
     <string name="shared_string_uninstall">Выдаліць</string>
     <string name="vessel_width_limit_description">Вызначце шырыню судна, каб пазбягаць вузкіх мастоў</string>
-    <string name="quick_action_showhide_mapillary_title">Паказаць/схаваць Mapillary</string>
-    <string name="quick_action_mapillary_hide">Схаваць Mapillary</string>
-    <string name="quick_action_mapillary_show">Паказаць Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Пераключальнік для паказу альбо хавання пласта Mapillary.</string>
     <string name="routing_attr_length_description">Пазначце даўжыню транспартнага сродку, дазволеную для руху па маршрутах.</string>
     <string name="routing_attr_length_name">Ліміт даўжыні</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 868d2d9386..215fbfee06 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -2063,9 +2063,6 @@
     <string name="recalculate_route_distance_promo">Маршрутът ще бъде преизчислен, ако разстоянието от маршрута до текущото местоположение е повече от избраната стойност.</string>
     <string name="n_items_of_z">%1$s от %2$s</string>
     <string name="download_slope_maps">Склонове</string>
-    <string name="quick_action_show_hide_terrain">Показване/скриване на терена</string>
-    <string name="quick_action_terrain_hide">Скриване на терена</string>
-    <string name="quick_action_terrain_show">Показване на терена</string>
     <string name="quick_action_terrain_descr">Бутон за показване или скриване на терена върху картата.</string>
     <string name="delete_description">Изтриване на описанието</string>
     <string name="add_description">Добавете описание</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 5bcd59d0b8..a48a93b61f 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2113,10 +2113,6 @@
     <string name="quick_action_duplicate">El nom de l\'acció directa està duplicat</string>
     <string name="quick_action_showhide_favorites_descr">Un commutador per mostrar o amagar els punts Preferits en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un commutador per mostrar o amagar els PDIs en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostra/amaga Preferits</string>
-    <string name="quick_action_favorites_show">Mostra Preferits</string>
-    <string name="quick_action_favorites_hide">Amaga Preferits</string>
-    <string name="quick_action_showhide_poi_title">Mostra/amaga PDI</string>
     <string name="quick_action_poi_show">Mostra %1$s</string>
     <string name="quick_action_poi_hide">Amaga %1$s</string>
     <string name="quick_action_add_category">Afegeix una categoria</string>
@@ -2382,9 +2378,6 @@
     <string name="srtm_purchase_header">Compreu i instal·leu el connector \'Corbes de nivell\' per visualitzar una gradació vertical d\'àrees.</string>
     <string name="srtm_menu_download_descr">Baixeu el mapa \'Corbes de nivell\' per utilitzar-les en aquesta zona.</string>
     <string name="hide_from_zoom_level">Amaga començant pel nivell d\'escala</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostra o amaga notes OSM</string>
-    <string name="quick_action_osmbugs_show">Mostra notes OSM</string>
-    <string name="quick_action_osmbugs_hide">Amaga notes OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botó que mostra o amaga notes OSM al mapa.</string>
     <string name="sorted_by_distance">Ordenat per distància</string>
     <string name="search_favorites">Cerca a Preferits</string>
@@ -2839,10 +2832,7 @@
     <string name="step_by_step">Totes les cruïlles</string>
     <string name="routeInfo_road_types_name">Tipus de carretera</string>
     <string name="exit_at">Sortida a</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostra/amaga traces</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botó per mostrar o amagar les traces seleccionades al mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Amaga les traces</string>
-    <string name="quick_action_gpx_tracks_show">Mostra les traces</string>
     <string name="sit_on_the_stop">Pugeu a la parada</string>
     <string name="use_osm_live_public_transport_description">Activa les modificacions del transport públic amb OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transport públic a OsmAnd Live</string>
@@ -3213,13 +3203,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefereix carreteres sense asfaltar a les asfaltades al generar rutes.</string>
     <string name="layer_osm_edits">Edicions a OSM</string>
     <string name="quick_action_contour_lines_descr">Botó per a mostrar o amagar les corbes de nivell en el mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostra les corbes de nivell</string>
-    <string name="quick_action_contour_lines_hide">Amaga les corbes de nivell</string>
-    <string name="quick_action_show_hide_contour_lines">Mostra/amaga les corbes de nivell</string>
     <string name="quick_action_hillshade_descr">Botó per a mostrar o amagar l\'ombrejat de relleu al mapa.</string>
-    <string name="quick_action_hillshade_show">Mostra l\'ombrejat de relleu</string>
-    <string name="quick_action_hillshade_hide">Amaga l\'ombrejat de relleu</string>
-    <string name="quick_action_show_hide_hillshade">Mostra/amaga l\'ombrejat de relleu</string>
     <string name="tts_initialization_error">No es pot iniciar el sistema text a veu.</string>
     <string name="utm_format_descr">L\'OsmAnd utilitza l\'estàndard UTM, que és molt similar però no idèntic al format UTM NATO.</string>
     <string name="coordinates_format_info">El format seleccionat s\'aplicarà a tota l\'aplicació.</string>
@@ -3461,9 +3445,6 @@
     <string name="add_description">Afegiu una descripció</string>
     <string name="delete_description">Suprimeix la descripció</string>
     <string name="quick_action_terrain_descr">Un botó per mostrar o amagar la capa de terreny al mapa.</string>
-    <string name="quick_action_terrain_show">Mostra el terreny</string>
-    <string name="quick_action_terrain_hide">Amaga el terreny</string>
-    <string name="quick_action_show_hide_terrain">Mostra o amaga el relleu</string>
     <string name="shared_string_hillshade">Ombrejat del relleu</string>
     <string name="shared_string_legend">Llegenda</string>
     <string name="shared_string_zoom_levels">Nivells de zoom</string>
@@ -3560,9 +3541,6 @@
     <string name="vessel_height_warning">Podeu indicar l\'alçada del vaixell per evitar ponts baixos. Penseu que si el pont és mòbil, li aplicarem l\'alçada de quan estigui obert.</string>
     <string name="vessel_height_limit_description">Indiqueu l\'alçada del vaixell per evitar ponts baixos. Penseu que si el pont és mòbil, li aplicarem l\'alçada de quan estigui obert.</string>
     <string name="vessel_width_limit_description">Indiqueu l\'amplada del vaixell per evitar ponts ajustats</string>
-    <string name="quick_action_showhide_mapillary_title">Mostra/amaga Mapil·lary</string>
-    <string name="quick_action_mapillary_hide">Amaga Mapillary</string>
-    <string name="quick_action_mapillary_show">Mostra Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un commutador per mostrar o amagar la capa de Mapillary al mapa.</string>
     <string name="routing_attr_length_description">Especifiqueu la llargada del vehicle que han de permetre les vies.</string>
     <string name="routing_attr_length_name">Llargada màxima</string>
@@ -3636,8 +3614,6 @@
     <string name="subscription_osmandlive_item">Subscripció - OsmAnd Live</string>
     <string name="osmand_purchases_item">Compres OsmAnd</string>
     <string name="navigation_profiles_item">Perfils de navegació</string>
-    <string name="quick_action_transport_hide">Amaga el transport públic</string>
-    <string name="quick_action_show_hide_transport">Mostra o amaga el transport públic</string>
     <string name="quick_action_transport_descr">Botó que mostra o oculta el transport públic al mapa.</string>
     <string name="create_edit_poi">Crea o edita PDI</string>
     <string name="parking_positions">Posicions d’aparcament</string>
@@ -3744,7 +3720,6 @@
 \n • S\'han corregit problemes en la importació/exportació de la configuració dels perfils
 \n
 \n</string>
-    <string name="quick_action_transport_show">Mostra el transport públic</string>
     <string name="shared_string_add_profile">Afegeix un perfil</string>
     <string name="change_application_profile">Canvia el perfil de l\'aplicació</string>
     <string name="index_item_world_basemap_detailed">Mapa general del món (detallat)</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 94db359827..b03ed5cf61 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -2117,10 +2117,6 @@
     <string name="quick_action_duplicate">Duplicitní název rychlé akce</string>
     <string name="quick_action_showhide_favorites_descr">Tlačítko pro zobrazení nebo skrytí Oblíbených míst na mapě.</string>
     <string name="quick_action_showhide_poi_descr">Tlačítko pro zobrazení nebo skrytí bodů zájmu na mapě.</string>
-    <string name="quick_action_showhide_favorites_title">Zobrazit/skrýt Oblíbená místa</string>
-    <string name="quick_action_favorites_show">Zobrazit oblíbená místa</string>
-    <string name="quick_action_favorites_hide">Skrýt Oblíbená místa</string>
-    <string name="quick_action_showhide_poi_title">Zobrazit/skrýt POI</string>
     <string name="quick_action_poi_show">Zobrazit %1$s</string>
     <string name="quick_action_poi_hide">Skrýt %1$s</string>
     <string name="quick_action_add_category">Přidat kategorii</string>
@@ -2227,8 +2223,6 @@
     <string name="quick_action_add_destination">Zadat cíl</string>
     <string name="quick_action_replace_destination">Nahradit cíl</string>
     <string name="quick_action_add_first_intermediate">Přidat první mezicíl</string>
-    <string name="quick_action_osmbugs_show">Zobrazit OSM poznámky</string>
-    <string name="quick_action_osmbugs_hide">Skrýt OSM poznámky</string>
     <string name="quick_action_showhide_osmbugs_descr">Tlačítko pro zobrazení nebo skrytí OpenStreetMap poznámek na mapě.</string>
     <string name="sorted_by_distance">Seřazeno podle vzdálenosti</string>
     <string name="search_favorites">Hledat v Oblíbených</string>
@@ -2276,7 +2270,6 @@
     <string name="increase_search_radius">Zvětšit okruh hledání</string>
     <string name="nothing_found">Nic nalezeno</string>
     <string name="nothing_found_descr">Změňte vyhledávací dotaz nebo zvětšete okruh hledání.</string>
-    <string name="quick_action_showhide_osmbugs_title">Zobrazit nebo skrýt OSM poznámky</string>
     <string name="shared_string_permissions">Oprávnění</string>
     <string name="import_gpx_failed_descr">Nepodařilo se naimportovat soubor. Prosím zkontrolujte, zda má OsmAnd oprávnění ke čtení souboru.</string>
     <string name="distance_moving">Vzdálenost opravená</string>
@@ -2843,10 +2836,7 @@
     <string name="routeInfo_road_types_name">Typy silnic</string>
     <string name="exit_at">Výjezd na</string>
     <string name="shared_string_swap">Vyměnit</string>
-    <string name="quick_action_show_hide_gpx_tracks">Zobrazit/skrýt stopy</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Tlačítko pro zobrazení nebo skrytí vybraných stop na mapě.</string>
-    <string name="quick_action_gpx_tracks_hide">Skrýt stopy</string>
-    <string name="quick_action_gpx_tracks_show">Zobrazit stopy</string>
     <string name="transfers_size">%1$d přenosů</string>
     <string name="add_start_and_end_points">Přidat počáteční a cílový bod</string>
     <string name="route_add_start_point">Přidat počáteční bod</string>
@@ -3255,9 +3245,6 @@
     <string name="recalculate_route_distance_promo">Trasa bude přepočítána, pokud vzdálenost od trasy k aktuální poloze je větší než zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
     <string name="download_slope_maps">Svahy</string>
-    <string name="quick_action_show_hide_terrain">Zobrazit nebo skrýt terén</string>
-    <string name="quick_action_terrain_hide">Skrýt terén</string>
-    <string name="quick_action_terrain_show">Zobrazit terén</string>
     <string name="quick_action_terrain_descr">Tlačítko pro zobrazení nebo skrytí vrstvy terénu na mapě.</string>
     <string name="delete_description">Smazat popis</string>
     <string name="add_description">Přidat popis</string>
@@ -3459,9 +3446,6 @@
     <string name="video_notes">Video poznámky</string>
     <string name="vessel_height_limit_description">Nastavte výšku plavidla, abyste se vyhnuli nízkým mostům. Mějte na paměti, že u pohyblivých mostů se zohledňuje jejich výška v otevřeném stavu.</string>
     <string name="vessel_width_limit_description">Nastavte šířku plavidla, abyste se vyhnuli úzkým mostům</string>
-    <string name="quick_action_showhide_mapillary_title">Zobrazit/skrýt Mapillary</string>
-    <string name="quick_action_mapillary_hide">Skrýt Mapillary</string>
-    <string name="quick_action_mapillary_show">Zobrazit Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Přepínač pro zobrazení nebo skrytí mapové vrstvy Mapillary.</string>
     <string name="routing_attr_length_description">Zadejte délku vozidla, která musí být na trase povolená.</string>
     <string name="routing_attr_length_name">Omezení délky</string>
@@ -3639,9 +3623,6 @@
     <string name="ui_customization_short_descr">Položky v úvodním panelu a kontextovém menu</string>
     <string name="ui_customization">Nastavení uživatelského rozhraní</string>
     <string name="shared_string_drawer">Úvodní panel</string>
-    <string name="quick_action_transport_hide">Skrýt veřejnou dopravu</string>
-    <string name="quick_action_transport_show">Zobrazit veřejnou dopravu</string>
-    <string name="quick_action_show_hide_transport">Zobrazit nebo skrýt veřejnou dopravu</string>
     <string name="quick_action_transport_descr">Tlačítko pro zobrazení nebo skrytí veřejné dopravy na mapě.</string>
     <string name="create_edit_poi">Vytvořit nebo upravit bod zájmu</string>
     <string name="parking_positions">Parkovací místa</string>
@@ -3758,13 +3739,7 @@
 \n
 \n</string>
     <string name="apply_preference_to_all_profiles">Tuto změnu můžete aplikovat na všechny profily nebo jen na vybraný profil.</string>
-    <string name="quick_action_show_hide_hillshade">Zobrazit/skrýt stínování svahů</string>
-    <string name="quick_action_hillshade_hide">Skrýt stínování svahů</string>
-    <string name="quick_action_hillshade_show">Zobrazit stínování svahů</string>
     <string name="quick_action_hillshade_descr">Tlačítko pro zobrazení nebo skrytí stínování svahů na mapě.</string>
-    <string name="quick_action_show_hide_contour_lines">Zobrazit/skrýt vrstevnice</string>
-    <string name="quick_action_contour_lines_hide">Skrýt vrstevnice</string>
-    <string name="quick_action_contour_lines_show">Zobrazit vrstevnice</string>
     <string name="quick_action_contour_lines_descr">Tlačítko pro zobrazení nebo skrytí vrstevnic na mapě.</string>
     <string name="tts_initialization_error">Nepodařilo se spustit modul převodu textu na řeč.</string>
     <string name="rendering_value_white_name">Bílá</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index c176ef70df..0361352ed0 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2123,10 +2123,6 @@
     <string name="quick_action_duplicate">Dublet genvejsnavn</string>
     <string name="quick_action_showhide_favorites_descr">En til/fra-knap til at vise eller skjule Favoritpunkter på kortet.</string>
     <string name="quick_action_showhide_poi_descr">En til/fra-knap til at vise eller skjule interessepunkter på kortet.</string>
-    <string name="quick_action_showhide_favorites_title">Vis/skjul Favoritter</string>
-    <string name="quick_action_favorites_show">Vis Favoritter</string>
-    <string name="quick_action_favorites_hide">Skjul Favoritter</string>
-    <string name="quick_action_showhide_poi_title">Vis/skjul intetessepunkt (IP)</string>
     <string name="quick_action_poi_show">Vis %1$s</string>
     <string name="quick_action_poi_hide">Skjul %1$s</string>
     <string name="quick_action_add_category">Tilføj en kategori</string>
@@ -2394,9 +2390,6 @@
     <string name="hide_from_zoom_level">Skjul fra zoom-niveau</string>
     <string name="sorted_by_distance">Sorteret efter afstand</string>
     <string name="search_favorites">Søg i Favoritter</string>
-    <string name="quick_action_showhide_osmbugs_title">Vis eller skjul OSM-noter</string>
-    <string name="quick_action_osmbugs_show">Vis OSM-noter</string>
-    <string name="quick_action_osmbugs_hide">Skjul OSM-noter</string>
     <string name="quick_action_showhide_osmbugs_descr">Knap til at vise eller skjule OSM-noter på kortet.</string>
     <string name="restart_search">Start søgning igen</string>
     <string name="increase_search_radius">Øg søgeradius</string>
@@ -2849,10 +2842,7 @@
     <string name="routeInfo_road_types_name">Vejtyper</string>
     <string name="exit_at">Stå af ved</string>
     <string name="sit_on_the_stop">Stig på ved stoppested</string>
-    <string name="quick_action_show_hide_gpx_tracks">Vis/skjul GPX spor</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">En knap til at vise eller skjule valgte GPX-spor på kortet.</string>
-    <string name="quick_action_gpx_tracks_hide">Skjul GPX spor</string>
-    <string name="quick_action_gpx_tracks_show">Vis GPX spor</string>
     <string name="add_destination_query">Angiv en destination først</string>
     <string name="use_osm_live_public_transport_description">Aktivér offentlig transport for OsmAnd Live ændringer.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live offentlig transport</string>
@@ -3267,13 +3257,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Foretræk ikke-asfalterede veje fremfor asfalterede veje.</string>
     <string name="layer_osm_edits">OSM redigeringer</string>
     <string name="quick_action_contour_lines_descr">Knap der viser eller skjuler højdekurver på kortet.</string>
-    <string name="quick_action_contour_lines_show">Vis højdekurver</string>
-    <string name="quick_action_contour_lines_hide">Skjul højdekurver</string>
-    <string name="quick_action_show_hide_contour_lines">Vis/skjul højdekurver</string>
     <string name="quick_action_hillshade_descr">En knap der viser eller skjuler reliefskygger på kortet.</string>
-    <string name="quick_action_hillshade_show">Vis reliefskygger</string>
-    <string name="quick_action_hillshade_hide">Skjul reliefskygger</string>
-    <string name="quick_action_show_hide_hillshade">Vis/skjul reliefskygger</string>
     <string name="rendering_value_white_name">Hvid</string>
     <string name="tts_initialization_error">Tekst-til-tale-programmet kan ikke startes.</string>
     <string name="simulate_your_location_gpx_descr">Simuler positionen ved hjælp af et optaget GPX-spor.</string>
@@ -3436,9 +3420,6 @@
     <string name="recalculate_route_distance_promo">Ruten genberegnes, hvis afstanden fra ruten til den aktuelle placering er større end den valgte værdi.</string>
     <string name="n_items_of_z">%1$s af %2$s</string>
     <string name="download_slope_maps">Skråninger</string>
-    <string name="quick_action_show_hide_terrain">Vis/skjul terræn</string>
-    <string name="quick_action_terrain_hide">Skjul terræn</string>
-    <string name="quick_action_terrain_show">Vis terræn</string>
     <string name="quick_action_terrain_descr">En knap der viser eller skjuler terrænlag på kortet.</string>
     <string name="delete_description">Slet beskrivelse</string>
     <string name="add_description">Tilføj beskrivelse</string>
@@ -3560,9 +3541,6 @@
     <string name="navigation_profiles_item">Navigationsprofiler</string>
     <string name="tracker_item">OsmAnd Tracker</string>
     <string name="osmand_purchases_item">OsmAnd køb</string>
-    <string name="quick_action_transport_hide">Skjul offentlig transport</string>
-    <string name="quick_action_transport_show">Vis offentlig transport</string>
-    <string name="quick_action_show_hide_transport">Vis/skjul offentlig transport</string>
     <string name="quick_action_transport_descr">En knap til at vise eller skjule offentlig transport på kortet.</string>
     <string name="create_edit_poi">Opret/rediger IP</string>
     <string name="parking_positions">Parkeringsplads</string>
@@ -3606,9 +3584,6 @@
     <string name="details_dialog_decr">Vis eller skjul yderligere kort-detaljer</string>
     <string name="shared_string_night_map">Natkort</string>
     <string name="add_online_source">Tilføj onlinekilde</string>
-    <string name="quick_action_showhide_mapillary_title">Vis/skjul Mapillary</string>
-    <string name="quick_action_mapillary_hide">Skjul Mapillary</string>
-    <string name="quick_action_mapillary_show">Vis Mapillary</string>
     <string name="quick_action_remove_next_destination">Slet næste destinationspunkt</string>
     <string name="use_volume_buttons_as_zoom">Lydstyrkeknapper som zoom</string>
     <string name="please_provide_point_name_error">Angiv et navn til punktet</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 931f8aaa37..f0370b0558 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2111,11 +2111,9 @@
     <string name="shared_string_action_name">Aktionsname</string>
     <string name="quick_action_add_marker_descr">Eine Schaltfläche zum Hinzufügen einer Kartenmarkierung in der Bildschirmmitte.</string>
     <string name="favorite_empty_place_name">Ort</string>
-    <string name="quick_action_showhide_favorites_title">Favoriten ein-/ausblenden</string>
     <string name="quick_action_take_audio_note_descr">Eine Schaltfläche, um eine Audio-Notiz in der Bildschirmmitte einzufügen.</string>
     <string name="quick_action_take_video_note_descr">Eine Schaltfläche, um eine Video-Notiz in der Bildschirmmitte einzufügen.</string>
     <string name="quick_action_take_photo_note_descr">Eine Schaltfläche, um eine Foto-Notiz in der Bildschirmmitte einzufügen.</string>
-    <string name="quick_action_showhide_poi_title">POI ein-/ausblenden</string>
     <string name="quick_action_poi_show">%1$s anzeigen</string>
     <string name="quick_action_poi_hide">%1$s ausblenden</string>
     <string name="quick_action_add_category">Kategorie hinzufügen</string>
@@ -2139,8 +2137,6 @@
     <string name="quick_action_map_source_action">Kartenquelle hinzufügen</string>
     <string name="quick_action_map_source_switch">Die Kartenquelle wurde in „%s“ geändert.</string>
     <string name="quick_action_btn_tutorial_title">Schaltflächenposition ändern</string>
-    <string name="quick_action_favorites_show">Favoriten anzeigen</string>
-    <string name="quick_action_favorites_hide">Favoriten ausblenden</string>
     <string name="quick_action_category_descr">Kategorie, in der der Favorit gespeichert werden soll:</string>
     <string name="quick_action_gpx_category_descr">Wählen Sie eine beliebige Kategorie.</string>
     <string name="configure_screen_quick_action">Schnellaktion</string>
@@ -2386,9 +2382,6 @@
     <string name="routing_attr_allow_private_name">Privatzugang erlauben</string>
     <string name="routing_attr_allow_private_description">Zugang zu Privatgrund erlauben.</string>
     <string name="srtm_color_scheme">Farbschema</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-Hinweise ein- oder ausblenden</string>
-    <string name="quick_action_osmbugs_show">OSM-Hinweise einblenden</string>
-    <string name="quick_action_osmbugs_hide">OSM-Hinweise ausblenden</string>
     <string name="quick_action_showhide_osmbugs_descr">Schaltfläche zum Ein- oder Ausblenden von OSM-Hinweisen auf der Karte.</string>
     <string name="sorted_by_distance">Nach Entfernung sortiert</string>
     <string name="search_favorites">In Favoriten suchen</string>
@@ -2853,10 +2846,7 @@
     <string name="by_transport_type">Von %1$s</string>
     <string name="step_by_step">Schritt für Schritt</string>
     <string name="routeInfo_road_types_name">Straßentypen</string>
-    <string name="quick_action_show_hide_gpx_tracks">Tracks ein-/ausblenden</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Eine Schaltfläche zum Ein- oder Ausblenden ausgewählter Tracks auf der Karte.</string>
-    <string name="quick_action_gpx_tracks_hide">Tracks ausblenden</string>
-    <string name="quick_action_gpx_tracks_show">Tracks einblenden</string>
     <string name="exit_at">Aussteigen bei</string>
     <string name="sit_on_the_stop">Zusteigen an Haltestelle</string>
     <string name="use_osm_live_public_transport_description">Aktivierung von OsmAnd Live für Änderungen bei öffentlichen Verkehrsmitteln.</string>
@@ -3271,13 +3261,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Bei der Navigation unbefestigte Straßen gegenüber befestigten bevorzugen.</string>
     <string name="layer_osm_edits">OSM-Bearbeitungen</string>
     <string name="quick_action_contour_lines_descr">Schaltfläche zum Ein- und Ausblenden von Höhenlinien auf der Karte.</string>
-    <string name="quick_action_contour_lines_show">Höhenlinien anzeigen</string>
-    <string name="quick_action_contour_lines_hide">Höhenlinien ausblenden</string>
-    <string name="quick_action_show_hide_contour_lines">Höhenlinien ein-/ausblenden</string>
     <string name="quick_action_hillshade_descr">Schaltfläche zum Ein- oder Ausblenden der Reliefdarstellung.</string>
-    <string name="quick_action_hillshade_show">Relief anzeigen</string>
-    <string name="quick_action_hillshade_hide">Relief ausblenden</string>
-    <string name="quick_action_show_hide_hillshade">Relief ein-/ausblenden</string>
     <string name="tts_initialization_error">Text-to-Speech-Engine kann nicht gestartet werden.</string>
     <string name="simulate_your_location_gpx_descr">Simulation Ihrer Position mit einem aufgezeichneten GPX-Track.</string>
     <string name="export_profile">Profil exportieren</string>
@@ -3496,9 +3480,6 @@
     <string name="add_description">Beschreibung hinzufügen</string>
     <string name="delete_description">Beschreibung löschen</string>
     <string name="quick_action_terrain_descr">Eine Schaltfläche zum Ein- und Ausblenden der Geländeebene auf der Karte.</string>
-    <string name="quick_action_terrain_show">Gelände einblenden</string>
-    <string name="quick_action_terrain_hide">Gelände ausblenden</string>
-    <string name="quick_action_show_hide_terrain">Gelände ein- oder ausblenden</string>
     <string name="shared_string_hillshade">Relief</string>
     <string name="shared_string_zoom_levels">Zoomstufen</string>
     <string name="shared_string_transparency">Transparenz</string>
@@ -3614,9 +3595,6 @@
 \n</string>
     <string name="shared_string_resume">Fortfahren</string>
     <string name="additional_actions_descr">Sie können auf diese Aktionen zugreifen, indem Sie auf die Schaltfläche \"%1$s\" tippen.</string>
-    <string name="quick_action_transport_hide">Öffentliche Verkehrsmittel ausblenden</string>
-    <string name="quick_action_transport_show">Öffentliche Verkehrsmittel anzeigen</string>
-    <string name="quick_action_show_hide_transport">Öffentliche Verkehrsmittel anzeigen oder ausblenden</string>
     <string name="quick_action_transport_descr">Schaltfläche zum Ein- oder Ausblenden der öffentlichen Verkehrsmittel auf der Karte.</string>
     <string name="create_edit_poi">POI erstellen oder bearbeiten</string>
     <string name="parking_positions">Parkpositionen</string>
@@ -3689,9 +3667,6 @@
     <string name="vessel_height_warning">Sie können die Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Denken Sie daran, wenn die Brücke beweglich ist, werden wir ihre Höhe im offenen Zustand verwenden.</string>
     <string name="vessel_height_limit_description">Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Beachten Sie: Wenn die Brücke beweglich ist, verwendet die Berechnung ihre Höhe im geöffneten Zustand.</string>
     <string name="vessel_width_limit_description">Stellen Sie die Schiffsbreite ein, um schmale Brücken zu vermeiden</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary ein-/ausblenden</string>
-    <string name="quick_action_mapillary_hide">Mapillary ausblenden</string>
-    <string name="quick_action_mapillary_show">Mapillary anzeigen</string>
     <string name="quick_action_showhide_mapillary_descr">Eine Umschaltfläche zum Ein- oder Ausblenden des Mapillary-Layers auf der Karte.</string>
     <string name="uninstall_speed_cameras">Blitzer deinstallieren</string>
     <string name="shared_string_legal">Rechtliches</string>
@@ -4035,4 +4010,4 @@
     <string name="shared_string_sec">sek</string>
     <string name="activity_type_racing_name">Rennsport</string>
     <string name="announcement_time_prepare_long">Erste Ankündigung (größere Distanz)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 901ae967d1..73b9f244c5 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1532,9 +1532,6 @@
     <string name="online_photos">Φωτογραφίες με σύνδεση</string>
     <string name="shared_string_add_photos">Προσθήκη φωτογραφιών</string>
     <string name="nothing_found">Δεν βρέθηκε τίποτα</string>
-    <string name="quick_action_showhide_osmbugs_title">Εμφάνιση ή απόκρυψη σημειώσεων OSM</string>
-    <string name="quick_action_osmbugs_show">Εμφάνιση σημειώσεων OSM</string>
-    <string name="quick_action_osmbugs_hide">Απόκρυψη σημειώσεων OSM</string>
     <string name="shared_string_to">Προς</string>
     <string name="rendering_attr_hidePOILabels_name">Ετικέτες POI</string>
     <string name="shared_string_without_name">Χωρίς όνομα</string>
@@ -2635,10 +2632,6 @@
     <string name="quick_action_duplicate">Διπλό όνομα γρήγορης ενέργειας</string>
     <string name="quick_action_showhide_favorites_descr">Εναλλαγή εμφάνισης ή απόκρυψης των αγαπημένων σημείων στον χάρτη.</string>
     <string name="quick_action_showhide_poi_descr">Εναλλαγή εμφάνισης ή απόκρυψης ΣΕ στον χάρτη.</string>
-    <string name="quick_action_showhide_favorites_title">Εμφάνιση/απόκρυψη αγαπημένων</string>
-    <string name="quick_action_favorites_show">Εμφάνιση αγαπημένων</string>
-    <string name="quick_action_favorites_hide">Απόκρυψη αγαπημένων</string>
-    <string name="quick_action_showhide_poi_title">Εμφάνιση/απόκρυψη ΣΕ</string>
     <string name="quick_action_poi_show">Εμφάνιση %1$s</string>
     <string name="quick_action_poi_hide">Απόκρυψη %1$s</string>
     <string name="quick_action_add_category">Προσθήκη κατηγορίας</string>
@@ -2901,10 +2894,7 @@
     <string name="shared_string_swap">Αλλαγή</string>
     <string name="show_more">Εμφάνιση περισσοτέρων</string>
     <string name="tracks_on_map">Εμφανιζόμενα ίχνη</string>
-    <string name="quick_action_show_hide_gpx_tracks">Εμφάνιση/απόκρυψη ιχνών GPX</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Πλήκτρο εμφάνισης ή απόκρυψης επιλεγμένων ιχνών GPX στον χάρτη.</string>
-    <string name="quick_action_gpx_tracks_hide">Απόκρυψη ιχνών GPX</string>
-    <string name="quick_action_gpx_tracks_show">Εμφάνιση ιχνών GPX</string>
     <string name="add_destination_query">Παρακαλούμε ορίστε τον προορισμό πρώτα</string>
     <string name="previous_route">Προηγούμενη διαδρομή</string>
     <string name="add_home">Προσθήκη κατοικίας</string>
@@ -3273,13 +3263,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Να προτιμώνται μη στρωμένοι δρόμοι για δρομολόγηση.</string>
     <string name="layer_osm_edits">Επεξεργασίες OSM</string>
     <string name="quick_action_contour_lines_descr">Πλήκτρο εμφάνισης ή απόκρυψης ισοϋψών γραμμών στον χάρτη.</string>
-    <string name="quick_action_contour_lines_show">Εμφάνιση ισοϋψών γραμμών</string>
-    <string name="quick_action_contour_lines_hide">Απόκρυψη ισοϋψών γραμμών</string>
-    <string name="quick_action_show_hide_contour_lines">Εμφάνιση/Απόκρυψη ισοϋψών γραμμών</string>
     <string name="quick_action_hillshade_descr">Εμφάνιση ή απόκρυψη πλήκτρου σκίασης αναγλύφου στον χάρτη.</string>
-    <string name="quick_action_hillshade_show">Εμφάνιση σκίασης ανάγλυφου</string>
-    <string name="quick_action_hillshade_hide">Απόκρυψη σκίασης ανάγλυφου</string>
-    <string name="quick_action_show_hide_hillshade">Εμφάνιση/Απόκρυψη σκίασης ανάγλυφου</string>
     <string name="tts_initialization_error">Αδυναμία εκκίνησης μηχανής κειμένου σε ομιλία.</string>
     <string name="simulate_your_location_gpx_descr">Προσομοίωση της θέσης σας χρησιμοποιώντας καταγεγραμμένη διαδρομή GPX.</string>
     <string name="export_profile">Εξαγωγή κατατομής (προφίλ)</string>
@@ -3497,9 +3481,6 @@
     <string name="vessel_height_warning">Μπορείτε να ορίσετε ύψος σκάφους για να αποφύγετε χαμηλές γέφυρες. Σημειώστε ότι εάν η γέφυρα είναι κινητή, θα χρησιμοποιηθεί το ύψος της ανοικτής κατάστασης.</string>
     <string name="vessel_height_limit_description">Ορίστε ύψος σκάφος για αποφυγή χαμηλών γεφυρών. Σημειώστε ότι εάν η γέφυρα είναι κινητή, θα χρησιμοποιηθεί το ύψος της στην ανοικτή κατάσταση.</string>
     <string name="vessel_width_limit_description">Ορίστε πλάτος σκάφους για αποφυγή στενών γεφυρών</string>
-    <string name="quick_action_showhide_mapillary_title">Εμφάνιση/Απόκρυψη Mapillary</string>
-    <string name="quick_action_mapillary_hide">Απόκρυψη Mapillary</string>
-    <string name="quick_action_mapillary_show">Εμφάνιση Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Εναλλαγή εμφάνισης ή απόκρυψης της στρώσης Mapillary του χάρτη.</string>
     <string name="routing_attr_length_description">Καθορίστε μήκος οχήματος που επιτρέπεται στους δρόμους.</string>
     <string name="routing_attr_length_name">Όριο μήκους</string>
@@ -3601,9 +3582,6 @@
 \n • Διόρθωση σφαλμάτων με RTL
 \n
 \n</string>
-    <string name="quick_action_transport_hide">Απόκρυψη δημόσιων συγκοινωνιών</string>
-    <string name="quick_action_transport_show">Εμφάνιση δημόσιων συγκοινωνιών</string>
-    <string name="quick_action_show_hide_transport">Εμφάνιση/απόκρυψη δημόσιων συγκοινωνιών</string>
     <string name="quick_action_transport_descr">Πλήκτρο εμφάνισης ή απόκρυψης δημόσιων συγκοινωνιών στον χάρτη.</string>
     <string name="create_edit_poi">Δημιουργία / Επεξεργασία ΣΕ</string>
     <string name="parking_positions">Θέσεις στάθμευσης</string>
@@ -3715,9 +3693,6 @@
     <string name="recalculate_route_distance_promo">Η διαδρομή θα επανυπολογιστεί εάν η απόσταση από τη διαδρομή στην τρέχουσα θέση είναι μεγαλύτερη από την επιλεγμένη τιμή.</string>
     <string name="n_items_of_z">%1$s από %2$s</string>
     <string name="download_slope_maps">Πλαγιές</string>
-    <string name="quick_action_show_hide_terrain">Εμφάνιση / απόκρυψη εδάφους</string>
-    <string name="quick_action_terrain_hide">Απόκρυψη εδάφους</string>
-    <string name="quick_action_terrain_show">Εμφάνιση εδάφους</string>
     <string name="quick_action_terrain_descr">Ένα πλήκτρο εμφάνισης ή απόκρυψης της στρώσης εδάφους στον χάρτη.</string>
     <string name="delete_description">Διαγραφή περιγραφής</string>
     <string name="add_description">Προσθήκη περιγραφής</string>
diff --git a/OsmAnd/res/values-en-rGB/strings.xml b/OsmAnd/res/values-en-rGB/strings.xml
index 97aedb7ad8..dd1352998f 100644
--- a/OsmAnd/res/values-en-rGB/strings.xml
+++ b/OsmAnd/res/values-en-rGB/strings.xml
@@ -96,9 +96,6 @@
     <string name="quick_action_add_marker_descr">Tapping the action button will add a map marker at the screen centre location.</string>
     <string name="quick_action_add_gpx_descr">Tapping the action button will add a GPX waypoint at the screen centre location.</string>
     <string name="quick_action_showhide_favorites_descr">Tapping the action button will show or hide the favourite points on the map.</string>
-    <string name="quick_action_showhide_favorites_title">Show/hide favourites</string>
-    <string name="quick_action_favorites_show">Show Favourites</string>
-    <string name="quick_action_favorites_hide">Hide Favourites</string>
     <string name="quick_action_category_descr">Category to save the Favourite in:</string>
     <string name="analyze_on_map">Analyse on map</string>
     <string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index f8442229c2..4527d0bd13 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2117,10 +2117,6 @@
     <string name="quick_action_duplicate">Duplikata nomo de rapida ago</string>
     <string name="quick_action_showhide_favorites_descr">Butono por montri/kaŝi ŝatatajn ejojn sur la mapo.</string>
     <string name="quick_action_showhide_poi_descr">Butono por montri/kaŝi interesejojn sur la mapo.</string>
-    <string name="quick_action_showhide_favorites_title">Montri/kaŝi ŝatatajn</string>
-    <string name="quick_action_favorites_show">Montri ŝatatajn</string>
-    <string name="quick_action_favorites_hide">Kaŝi ŝatatajn</string>
-    <string name="quick_action_showhide_poi_title">Montri/kaŝi interesejojn</string>
     <string name="quick_action_poi_show">Montri %1$s</string>
     <string name="quick_action_poi_hide">Kaŝi %1$s</string>
     <string name="quick_action_add_category">Aldoni kategorion</string>
@@ -2386,9 +2382,6 @@
     <string name="hide_from_zoom_level">Kaŝi komence de skal‑nivelo</string>
     <string name="sorted_by_distance">Ordigitaj laŭ distanco</string>
     <string name="search_favorites">Serĉi en ŝatataj</string>
-    <string name="quick_action_showhide_osmbugs_title">Montri aŭ kaŝi OSM-rimarkojn</string>
-    <string name="quick_action_osmbugs_show">Montri OSM-rimarkojn</string>
-    <string name="quick_action_osmbugs_hide">Kaŝi OSM-rimarkojn</string>
     <string name="quick_action_showhide_osmbugs_descr">Butono por montri/kaŝi OSM‑rimarkojn sur la mapo.</string>
     <string name="restart_search">Rekomenci serĉon</string>
     <string name="increase_search_radius">Pliigi serĉan radiuson</string>
@@ -2842,10 +2835,7 @@
     <string name="routeInfo_road_types_name">Specoj de vojoj</string>
     <string name="exit_at">Eliru ĉe</string>
     <string name="sit_on_the_stop">Atendu ĉe haltejo</string>
-    <string name="quick_action_show_hide_gpx_tracks">Montri/kaŝi spurojn</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Butono por montri/kaŝi elektitajn spurojn sur la mapo.</string>
-    <string name="quick_action_gpx_tracks_hide">Kaŝi spurojn</string>
-    <string name="quick_action_gpx_tracks_show">Montri spurojn</string>
     <string name="use_osm_live_public_transport_description">Aktivigi publikan transporton por ŝanĝoj OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Publika transporto OsmAnd Live</string>
     <string name="public_transport_warning_descr_blog">Pliaj informoj pri kiel OsmAnd difinas kursojn estas legeblaj ĉe nia taglibro.</string>
@@ -3261,13 +3251,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferi vojojn sen firma pavimo.</string>
     <string name="layer_osm_edits">OSM‑redaktoj</string>
     <string name="quick_action_contour_lines_descr">Butono por montri/kaŝi nivelkurbojn sur la mapo.</string>
-    <string name="quick_action_contour_lines_show">Montri nivelkurbojn</string>
-    <string name="quick_action_contour_lines_hide">Kaŝi nivelkurbojn</string>
-    <string name="quick_action_show_hide_contour_lines">Montri/kaŝi nivelkurbojn</string>
     <string name="quick_action_hillshade_descr">Butono por montri/kaŝi nivelombrumon (reliefon) sur la mapo.</string>
-    <string name="quick_action_hillshade_show">Montri nivelombrumon</string>
-    <string name="quick_action_hillshade_hide">Kaŝi nivelombrumon</string>
-    <string name="quick_action_show_hide_hillshade">Montri/kaŝi nivelombrumon</string>
     <string name="default_speed_dialog_msg">Antaŭkalkulas tempon de alveno por vojoj de nekonata speco kaj limigas rapidon por ĉiuj vojoj (povas influi kurs‑difinadon).</string>
     <string name="tts_initialization_error">Ne povas ekigi parolsintezilon.</string>
     <string name="export_profile">Elporti profilon</string>
@@ -3493,9 +3477,6 @@
     <string name="shared_string_legend">Mapklarigo</string>
     <string name="shared_string_hillshade">Nivelombrumo</string>
     <string name="n_items_of_z">%1$s el %2$s</string>
-    <string name="quick_action_show_hide_terrain">Montri aŭ kaŝi teren‑formon</string>
-    <string name="quick_action_terrain_hide">Kaŝi teren‑formon</string>
-    <string name="quick_action_terrain_show">Montri teren‑formon</string>
     <string name="quick_action_terrain_descr">Butono por montri/kaŝi tavolon de formo de tereno sur la mapo.</string>
     <string name="delete_description">Forigi priskribon</string>
     <string name="add_description">Aldoni priskribon</string>
@@ -3608,9 +3589,6 @@
 \n
 \n</string>
     <string name="additional_actions_descr">Vi povas ekigi tiujn agojn per frapeti la butonon “%1$s”.</string>
-    <string name="quick_action_transport_hide">Kaŝi publikan transporton</string>
-    <string name="quick_action_transport_show">Montri publikan transporton</string>
-    <string name="quick_action_show_hide_transport">Montri aŭ kaŝi publikan transporton</string>
     <string name="quick_action_transport_descr">Butono por montri/kaŝi publikan transporton sur la mapo.</string>
     <string name="create_edit_poi">Krei aŭ redakti interesejon</string>
     <string name="add_edit_favorite">Aldoni aŭ forigi ŝatatan ejojn</string>
@@ -3679,9 +3657,6 @@
     <string name="vessel_height_warning">Vi povas enigi alton de via akvoveturilo por eviti malaltajn pontojn. Estu konscia, ke se ponto estas movebla, la alto en ĝia malfermita stato estos uzata.</string>
     <string name="vessel_height_limit_description">Enigu alton de akvoveturilo por eviti malaltajn pontojn. Estu konscia, ke se ponto estas movebla, la alto en ĝia malfermita stato estos uzata.</string>
     <string name="vessel_width_limit_description">Enigu larĝon de akvoveturilo por eviti mallarĝajn pontojn</string>
-    <string name="quick_action_showhide_mapillary_title">Montri/kaŝi Mapillary</string>
-    <string name="quick_action_mapillary_hide">Kaŝi Mapillary</string>
-    <string name="quick_action_mapillary_show">Montri Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Ŝaltilo por montri aŭ kaŝi tavolon de Mapillary sur la mapo.</string>
     <string name="uninstall_speed_cameras">Malinstali informojn pri rapidkontroliloj</string>
     <string name="shared_string_legal">Leĝaj</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 5ab5e53945..479822fdd6 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2120,10 +2120,6 @@
     <string name="quick_action_duplicate">Nombre de la acción rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que muestra u oculta los puntos favoritos en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que muestra u oculta los PDI en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar u ocultar Favoritos</string>
-    <string name="quick_action_favorites_show">Mostrar Favoritos</string>
-    <string name="quick_action_favorites_hide">Ocultar Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar u ocultar PDI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Añadir una categoría</string>
@@ -2388,9 +2384,6 @@
     <string name="hillshade_menu_download_descr">Descarga la capa superpuesta del mapa «Sombreado» para mostrar el sombreado vertical.</string>
     <string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string>
     <string name="hide_from_zoom_level">Ocultar desde el nivel de zoom</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
-    <string name="quick_action_osmbugs_show">Mostrar notas de OSM</string>
-    <string name="quick_action_osmbugs_hide">Ocultar notas de OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Un botón que muestra u oculta las notas de OSM en el mapa.</string>
     <string name="sorted_by_distance">Ordenados por distancia</string>
     <string name="search_favorites">Buscar en Favoritos</string>
@@ -2846,10 +2839,7 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
     <string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
     <string name="transfers_size">%1$d transbordo(s)</string>
@@ -3265,13 +3255,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefiere los caminos sin pavimentar a los pavimentados para el trazado de rutas.</string>
     <string name="layer_osm_edits">Ediciones de OSM</string>
     <string name="quick_action_contour_lines_descr">Un botón que muestra u oculta las curvas de nivel en el mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostrar curvas de nivel</string>
-    <string name="quick_action_contour_lines_hide">Ocultar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar u ocultar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que muestra u oculta el sombreado de las colinas en el mapa.</string>
-    <string name="quick_action_hillshade_show">Mostrar el sombreado</string>
-    <string name="quick_action_hillshade_hide">Ocultar el sombreado</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar u ocultar el sombreado</string>
     <string name="tts_initialization_error">Imposible iniciar el motor de habla sintetizada.</string>
     <string name="simulate_your_location_gpx_descr">Simular la ubicación usando una traza GPX grabada.</string>
     <string name="export_profile">Exportar perfil</string>
@@ -3495,9 +3479,6 @@
     <string name="terrain_empty_state_text">Permite ver el sombreado o el mapa de pendientes. Puedes leer más sobre estos tipos de mapas en nuestro sitio.</string>
     <string name="shared_string_hillshade">Sombreado</string>
     <string name="download_slope_maps">Pendientes</string>
-    <string name="quick_action_show_hide_terrain">Mostrar u ocultar terreno</string>
-    <string name="quick_action_terrain_hide">Ocultar terreno</string>
-    <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Un botón que muestra u oculta la capa del terreno en el mapa.</string>
     <string name="delete_description">Borrar descripción</string>
     <string name="add_description">Añadir descripción</string>
@@ -3612,9 +3593,6 @@
 \n
 \n</string>
     <string name="additional_actions_descr">Puedes acceder a estas acciones pulsando el botón «%1$s».</string>
-    <string name="quick_action_transport_hide">Ocultar transporte público</string>
-    <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar u ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botón que muestra u oculta el transporte público en el mapa.</string>
     <string name="create_edit_poi">Crear o editar PDI</string>
     <string name="parking_positions">Puestos de estacionamiento</string>
@@ -3697,9 +3675,6 @@
     <string name="shared_string_legal">Legal</string>
     <string name="keep_active">Mantener</string>
     <string name="shared_string_uninstall">Desinstalar</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar u ocultar Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
-    <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón que alterna la capa de Mapillary en el mapa.</string>
     <string name="shared_string_bearing">Rumbo</string>
     <string name="item_deleted">%1$s borrado</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index a231dfc79f..d645598dec 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2120,10 +2120,6 @@
     <string name="quick_action_duplicate">Nombre de la acción rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que muestra u oculta los puntos favoritos en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que muestra u oculta los PDI en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar u ocultar Favoritos</string>
-    <string name="quick_action_favorites_show">Mostrar Favoritos</string>
-    <string name="quick_action_favorites_hide">Ocultar Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar u ocultar PDI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Añadir una categoría</string>
@@ -2388,9 +2384,6 @@
     <string name="hillshade_menu_download_descr">Descarga la capa superpuesta del mapa «Sombreado» para mostrar el sombreado vertical.</string>
     <string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string>
     <string name="hide_from_zoom_level">Ocultar desde el nivel de zoom</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
-    <string name="quick_action_osmbugs_show">Mostrar notas de OSM</string>
-    <string name="quick_action_osmbugs_hide">Ocultar notas de OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Un botón que muestra u oculta las notas de OSM en el mapa.</string>
     <string name="sorted_by_distance">Ordenados por distancia</string>
     <string name="search_favorites">Buscar en Favoritos</string>
@@ -2846,10 +2839,7 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
     <string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
     <string name="transfers_size">%1$d transbordo(s)</string>
@@ -3264,13 +3254,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefiere los caminos sin pavimentar a los pavimentados para el trazado de rutas.</string>
     <string name="layer_osm_edits">Ediciones de OSM</string>
     <string name="quick_action_contour_lines_descr">Un botón que muestra u oculta las curvas de nivel en el mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostrar curvas de nivel</string>
-    <string name="quick_action_contour_lines_hide">Ocultar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar u ocultar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que muestra u oculta el sombreado de las colinas en el mapa.</string>
-    <string name="quick_action_hillshade_show">Mostrar el sombreado</string>
-    <string name="quick_action_hillshade_hide">Ocultar el sombreado</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar u ocultar el sombreado</string>
     <string name="tts_initialization_error">Imposible iniciar el motor de habla sintetizada.</string>
     <string name="simulate_your_location_gpx_descr">Simular la ubicación usando una traza GPX grabada.</string>
     <string name="export_profile">Exportar perfil</string>
@@ -3496,9 +3480,6 @@
     <string name="recalculate_route_distance_promo">La ruta será recalculada si la distancia a la ubicación actual es mayor que el valor elegido.</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pendientes</string>
-    <string name="quick_action_show_hide_terrain">Mostrar u ocultar terreno</string>
-    <string name="quick_action_terrain_hide">Ocultar terreno</string>
-    <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Un botón que muestra u oculta la capa del terreno en el mapa.</string>
     <string name="delete_description">Borrar descripción</string>
     <string name="add_description">Añadir descripción</string>
@@ -3612,9 +3593,6 @@
 \n</string>
     <string name="shared_string_resume">Reanudar</string>
     <string name="additional_actions_descr">Puedes acceder a estas acciones pulsando el botón «%1$s».</string>
-    <string name="quick_action_transport_hide">Ocultar transporte público</string>
-    <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar u ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botón que muestra u oculta el transporte público en el mapa.</string>
     <string name="create_edit_poi">Crear o editar PDI</string>
     <string name="parking_positions">Puestos de estacionamiento</string>
@@ -3695,9 +3673,6 @@
 \nPulsa en «%2$s», para borrar todos los datos relacionados con los radares de velocidad (alertas, notificaciones y PDI) hasta reinstalar OsmAnd completamente.</string>
     <string name="keep_active">Mantener</string>
     <string name="shared_string_uninstall">Desinstalar</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar u ocultar Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
-    <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón que alterna la capa de Mapillary en el mapa.</string>
     <string name="shared_string_bearing">Rumbo</string>
     <string name="item_deleted">%1$s borrado</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index b0b779d318..844b83ed03 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2117,10 +2117,6 @@
     <string name="quick_action_duplicate">Nombre de la acción rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que muestra u oculta los Favoritos en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que muestra u oculta los PDI en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar/ocultar Favoritos</string>
-    <string name="quick_action_favorites_show">Mostrar Favoritos</string>
-    <string name="quick_action_favorites_hide">Ocultar Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar/ocultar PDI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Añadir una categoría</string>
@@ -2382,9 +2378,6 @@
     <string name="routing_attr_allow_private_description">Permite acceder a áreas privadas.</string>
     <string name="display_zoom_level">Nivel de zoom de pantalla: %1$s</string>
     <string name="route_is_too_long_v2">Para largas distancias: Añada destinos intermedios si no se encuentra ninguna ruta en 10 minutos.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
-    <string name="quick_action_osmbugs_show">Mostrar notas de OSM</string>
-    <string name="quick_action_osmbugs_hide">Ocultar notas de OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botón para mostrar u ocultar las notas de OSM en el mapa.</string>
     <string name="sorted_by_distance">Ordenados por distancia</string>
     <string name="search_favorites">Buscar en Favoritos</string>
@@ -2843,10 +2836,7 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajarse en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trazas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
     <string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
     <string name="transfers_size">%1$d transbordo(s)</string>
@@ -3258,13 +3248,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefiere carreteras sin pavimentar sobre las pavimentadas para el enrutamiento.</string>
     <string name="layer_osm_edits">Ediciones de OSM</string>
     <string name="quick_action_contour_lines_descr">Un botón que muestra u oculta las curvas de nivel en el mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostrar curvas de nivel</string>
-    <string name="quick_action_contour_lines_hide">Ocultar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar/ocultar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que muestra u oculta la sombra de una colina en el mapa.</string>
-    <string name="quick_action_hillshade_show">Mostrar el sombreado</string>
-    <string name="quick_action_hillshade_hide">Ocultar el sombreado</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar/ocultar el sombreado</string>
     <string name="tts_initialization_error">Imposible iniciar el motor de habla sintetizada.</string>
     <string name="export_profile">Exportar perfil</string>
     <string name="exported_osmand_profile">Perfil de OsmAnd: %1$s</string>
@@ -3464,9 +3448,6 @@
     <string name="recalculate_route_in_deviation">Recalcular ruta en caso de desvío</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Cuestas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar o esconder terreno</string>
-    <string name="quick_action_terrain_hide">Esconder terreno</string>
-    <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Un botón para mostrar o esconder una capa de terreno en el mapa.</string>
     <string name="delete_description">Borra descripción</string>
     <string name="add_description">Añade descripción</string>
@@ -3513,9 +3494,6 @@
     <string name="map_markers_item">Marcadores de mapa</string>
     <string name="favorites_item">Favoritos</string>
     <string name="navigation_profiles_item">Perfiles de navegación</string>
-    <string name="quick_action_show_hide_transport">Mostrar u ocultar transporte público</string>
-    <string name="quick_action_transport_hide">Ocultar transporte público</string>
-    <string name="quick_action_transport_show">Mostrar transporte público</string>
     <string name="create_edit_poi">Crear o editar POI</string>
     <string name="add_edit_favorite">Agregar o editar Favorito</string>
     <string name="shared_string_add_profile">Agregar perfil</string>
@@ -3692,9 +3670,6 @@
     <string name="vessel_height_warning">Puedes establecer la altura del navío para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
     <string name="vessel_height_limit_description">Fija la altura del navío para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
     <string name="vessel_width_limit_description">Fija el ancho del navío para evitar puentes estrechos</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
-    <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un conmutador para mostrar u ocultar la capa de Mapillary en el mapa.</string>
     <string name="routing_attr_length_description">Especifica la longitud del vehículo que se permitirá en las rutas.</string>
     <string name="routing_attr_length_name">Límite de longitud</string>
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index 7061f624dc..a258173a70 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -162,9 +162,6 @@
     <string name="improve_coverage_install_mapillary_desc">Paigalda Mapillary piltide lisamiseks sellesse asukohta kaardil.</string>
     <string name="no_photos_descr">Siin puuduvad fotod.</string>
     <string name="restart_search">Taaskäivita otsing</string>
-    <string name="quick_action_showhide_osmbugs_title">Lülita OSM märkmed sisse või välja</string>
-    <string name="quick_action_osmbugs_show">Näita OSM märkmed</string>
-    <string name="quick_action_osmbugs_hide">Peida OSM Notes</string>
     <string name="thank_you_for_feedback">Täname sind tagasiside eest</string>
     <string name="poi_cannot_be_found">Sõlme või teed ei leidunud.</string>
     <string name="search_no_results_feedback">Otsingutulemused puuduvad\?
@@ -601,10 +598,7 @@
     <string name="step_by_step">Pöörangupõhine</string>
     <string name="exit_at">Välju</string>
     <string name="sit_on_the_stop">Sisene peatuses</string>
-    <string name="quick_action_show_hide_gpx_tracks">Kuva/peida rajad</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud radade kaardil kuvamiseks või peitmiseks.</string>
-    <string name="quick_action_gpx_tracks_hide">Peida rajad</string>
-    <string name="quick_action_gpx_tracks_show">Kuva rajad</string>
     <string name="add_destination_query">Palun määra esmalt sihtkoht</string>
     <string name="use_osm_live_public_transport_description">Luba ühistransport OsmAnd Live muudatustele.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live ühistransport</string>
@@ -991,13 +985,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Teekonna koostamisel eelista katteta teid pinnatud teedele.</string>
     <string name="layer_osm_edits">OSM muudatused</string>
     <string name="quick_action_contour_lines_descr">Nupp kõrgusjoonte kuvamiseks või peitmiseks kaardil.</string>
-    <string name="quick_action_contour_lines_show">Kuva kõrgusjooned</string>
-    <string name="quick_action_contour_lines_hide">Peida kõrgusjooned</string>
-    <string name="quick_action_show_hide_contour_lines">Kuva/peida kõrgusjooned</string>
     <string name="quick_action_hillshade_descr">Nupp künkavarjutuste kuvamiseks või peitmiseks kaardil.</string>
-    <string name="quick_action_hillshade_show">Kuva künkavarjutus</string>
-    <string name="quick_action_hillshade_hide">Peida künkavarjutus</string>
-    <string name="quick_action_show_hide_hillshade">Kuva/peida künkavarjutus</string>
     <string name="tts_initialization_error">Kõnesünteesi mootorit ei saa käivitada.</string>
     <string name="export_profile">Ekspordi profiil</string>
     <string name="exported_osmand_profile">OsmAnd profiil: %1$s</string>
@@ -3127,10 +3115,6 @@
     <string name="favorite_empty_place_name">Koht</string>
     <string name="quick_action_duplicates">Dubleerimise vältimiseks nimetati kiirtegevus ümber %1$s.</string>
     <string name="quick_action_duplicate">Kiirtegevuse nime duplikaat</string>
-    <string name="quick_action_showhide_favorites_title">Kuva/peida lemmikud</string>
-    <string name="quick_action_favorites_show">Kuva lemmikud</string>
-    <string name="quick_action_favorites_hide">Peida lemmikud</string>
-    <string name="quick_action_showhide_poi_title">Kuva/peida HP</string>
     <string name="quick_action_poi_show">Kuva %1$s</string>
     <string name="quick_action_poi_hide">Peida %1$s</string>
     <string name="quick_action_add_category">Lisa kategooria</string>
@@ -3441,9 +3425,6 @@
     <string name="recalculate_route_distance_promo">Teekonna ümberarvutus, kui kaugus teekonnast praegusesse asukohta on suurem valitud väärtusest.</string>
     <string name="n_items_of_z">%1$s %2$s-st</string>
     <string name="download_slope_maps">Nõlvad</string>
-    <string name="quick_action_show_hide_terrain">Kuva või peida maastik</string>
-    <string name="quick_action_terrain_hide">Peida maastik</string>
-    <string name="quick_action_terrain_show">Kuva maastik</string>
     <string name="quick_action_terrain_descr">Nupp maastikukihi kuvamiseks või peitmiseks kaardil.</string>
     <string name="delete_description">Kustuta kirjeldus</string>
     <string name="add_description">Lisa kirjeldus</string>
@@ -3528,9 +3509,6 @@
     <string name="select_wikipedia_article_langs">Valige kaardil olevad Vikipeedia artiklite keeled. Artikli lugemise ajal kasuta ükskõik millist saadaolevat keelt.</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="search_poi_types">Otsi huvipunktide tüüpe</string>
-    <string name="quick_action_transport_hide">Peida ühistranspordi teave</string>
-    <string name="quick_action_transport_show">Näita ühistranspordi teavet</string>
-    <string name="quick_action_show_hide_transport">Kuva või peida ühistransport</string>
     <string name="quick_action_transport_descr">Nupp, mis kuvab või peidab ühistranspordiandmed kaardil.</string>
     <string name="create_edit_poi">Lisa või muuda huvipunkti</string>
     <string name="shared_string_night_map">Öine kaart</string>
@@ -3541,9 +3519,6 @@
     <string name="vessel_height_warning">Madalate sildade vältimiseks saad kirjeldada laeva kõrguse. Palun arvesta, et liikuva silla puhul me kasutame seda kõrgust ka siis, kui sild on avatud.</string>
     <string name="vessel_height_limit_description">Madalate sildade vältimiseks kirjelda laeva kõrgus. Palun arvesta, et liikuva silla puhul me kasutame seda kõrgust ka siis, kui sild on avatud.</string>
     <string name="vessel_width_limit_description">Lühikeste sildade vältimiseks kirjelda laeva laius</string>
-    <string name="quick_action_showhide_mapillary_title">Näita või peida Mapillary andmed</string>
-    <string name="quick_action_mapillary_hide">Peida Mapillary andmed</string>
-    <string name="quick_action_mapillary_show">Näita Mapillary andmeid</string>
     <string name="quick_action_showhide_mapillary_descr">Nupp, mis näitab või peidab kaardil Mapillary kihti.</string>
     <string name="shared_string_uninstall_and_restart">Eemalda ja taaskäivita</string>
     <string name="app_mode_inline_skates">Rulluisud</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 44936b286b..ef6c04acb4 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2125,10 +2125,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_add_parking_descr">Pantailaren erdian aparkaleku bat gehitzeko botoia.</string>
     <string name="favorite_autofill_toast_text">" hona gorde da: "</string>
     <string name="favorite_empty_place_name">Tokia</string>
-    <string name="quick_action_showhide_favorites_title">Erakutsi/ezkutatu gogokoak</string>
-    <string name="quick_action_favorites_show">Erakutsi gogokoak</string>
-    <string name="quick_action_favorites_hide">Ezkutatu gogokoak</string>
-    <string name="quick_action_showhide_poi_title">Erakutsi/ezkutatu POI</string>
     <string name="quick_action_poi_show">Erakutsi %1$s</string>
     <string name="quick_action_poi_hide">Ezkutatu %1$s</string>
     <string name="quick_action_add_category">Gehitu kategoria bat</string>
@@ -2269,9 +2265,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="increase_search_radius">Handitu bilaketaren erradioa</string>
     <string name="nothing_found">Ez da ezer aurkitu</string>
     <string name="nothing_found_descr">Aldatu bilaketa edo handitu erradioa.</string>
-    <string name="quick_action_showhide_osmbugs_title">Erakutsi edo ezkutatu OSM oharrak</string>
-    <string name="quick_action_osmbugs_show">Erakutsi OSM oharrak</string>
-    <string name="quick_action_osmbugs_hide">Ezkutatu OSM oharrak</string>
     <string name="quick_action_showhide_osmbugs_descr">Mapan OSM oharrak erakutsi edo ezkutatzeko botoia.</string>
     <string name="sorted_by_distance">Distantziaren arabera ordenatuta</string>
     <string name="search_favorites">Bilatu gogokoetan</string>
@@ -2846,7 +2839,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_swap">Aldatu</string>
     <string name="show_more">Erakutsi gehiago</string>
     <string name="tracks_on_map">Bistaratutako lorratzak</string>
-    <string name="quick_action_show_hide_gpx_tracks">Erakutsi/ezkutatu lorratzak</string>
     <string name="add_intermediate">Gehitu tarteko puntua</string>
     <string name="transfers_size">%1$d transferentzia</string>
     <string name="add_start_and_end_points">Gehitu irteera eta helburua</string>
@@ -2884,8 +2876,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="rendering_attr_highway_class_steps_name">Eskailera</string>
     <string name="rendering_attr_highway_class_path_name">Bidea</string>
     <string name="rendering_attr_undefined_name">Zehaztu gabea</string>
-    <string name="quick_action_gpx_tracks_hide">Ezkutatu lorratzak</string>
-    <string name="quick_action_gpx_tracks_show">Erakutsi lorratzak</string>
     <string name="add_destination_query">Gehitu helburua aurretik</string>
     <string name="previous_route">Aurreko ibilbidea</string>
     <string name="shared_string_degrees">Graduak</string>
@@ -3265,13 +3255,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Hobetsi asfaltatu gabeko bideak ibilbideetan.</string>
     <string name="layer_osm_edits">OSM edizioak</string>
     <string name="quick_action_contour_lines_descr">Sestra-kurbak mapan erakusteko edo ezkutatzeko botoia.</string>
-    <string name="quick_action_contour_lines_show">Erakutsi sestra-kurbak</string>
-    <string name="quick_action_contour_lines_hide">Ezkutatu sestra-kurbak</string>
-    <string name="quick_action_show_hide_contour_lines">Erakutsi/ezkutatu sestra-kurbak</string>
     <string name="quick_action_hillshade_descr">Erliebe-itzalak mapan erakutsi edo ezkutatzeko botoia.</string>
-    <string name="quick_action_hillshade_show">Erakutsi erliebe-itzalak</string>
-    <string name="quick_action_hillshade_hide">Ezkutatu erliebe-itzalak</string>
-    <string name="quick_action_show_hide_hillshade">Erakutsi/ezkutatu erliebe-itzalak</string>
     <string name="tts_initialization_error">Ezin da testu-ahots motorra abiarazi.</string>
     <string name="simulate_your_location_gpx_descr">Simulatu zure posizioa grabatutako GPX lorratz bat erabiliz.</string>
     <string name="export_profile">Esportatu profila</string>
@@ -3489,9 +3473,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="add_description">Gehitu deskripzioa</string>
     <string name="delete_description">Ezabatu deskripzioa</string>
     <string name="quick_action_terrain_descr">Mapako terreno geruza erakutsi edo ezkutatzeko botoia.</string>
-    <string name="quick_action_terrain_show">Erakutsi terrenoa</string>
-    <string name="quick_action_terrain_hide">Ezkutatu terrenoa</string>
-    <string name="quick_action_show_hide_terrain">Erakutsi edo ezkutatu terrenoa</string>
     <string name="download_slope_maps">Maldak</string>
     <string name="shared_string_hillshade">Erliebea</string>
     <string name="terrain_empty_state_text">Gaitu erliebea edo malda mapa ikusteko. Mapa mota hauei buruz gehiago irakur dezakezu gure gunean</string>
@@ -3553,9 +3534,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="osmand_purchases_item">OsmAnd erosketak</string>
     <string name="legend_item_description">Maparen sinbologiari gida.</string>
     <string name="navigation_profiles_item">Nabigazio profilak</string>
-    <string name="quick_action_transport_hide">Ezkutatu garraio publikoa</string>
-    <string name="quick_action_transport_show">Erakutsi garraio publikoa</string>
-    <string name="quick_action_show_hide_transport">Erakutsi edo ezkutatu garraio publikoa</string>
     <string name="tracker_item">OsmAnd aztarnaria</string>
     <string name="shared_string_resume">Jarraitu</string>
     <string name="ui_customization_description">Pertsonalizatu \"Tiradera\", \"Konfiguratu mapa\" eta \"Laster-menua\" ataletan dauden elementu kopurua.
@@ -3675,9 +3653,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_meters">metro</string>
     <string name="details_dialog_decr">Erakutsi edo ezkutatu maparen xehetasun gehigarriak</string>
     <string name="shared_string_night_map">Gauerako mapa</string>
-    <string name="quick_action_showhide_mapillary_title">Erakutsi/ezkutatu Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ezkutatu Mapillary</string>
-    <string name="quick_action_mapillary_show">Erakutsi Mapillary</string>
     <string name="shared_string_done">Egina</string>
     <string name="quick_action_remove_next_destination">Ezabatu hurrengo norako puntua.</string>
     <string name="use_volume_buttons_as_zoom">Bolumen botoiak zoom egiteko</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 6c5174e96c..01a39b1c6a 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -2180,10 +2180,6 @@
     <string name="quick_action_duplicate">نام تکراری برای کنش فوری</string>
     <string name="quick_action_showhide_favorites_descr">دکمه‌ای برای پنهان/آشکارکردن علاقه‌مندی‌ها روی نقشه.</string>
     <string name="quick_action_showhide_poi_descr">دکمه‌ای برای پنهان/آشکارکردن POIها روی نقشه.</string>
-    <string name="quick_action_showhide_favorites_title">آشکار/پنهان‌کردن علاقه‌مندی‌ها</string>
-    <string name="quick_action_favorites_show">نشان‌دادن علاقه‌مندی‌ها</string>
-    <string name="quick_action_favorites_hide">مخفی‌کردن علاقه‌مندی‌ها</string>
-    <string name="quick_action_showhide_poi_title">آشکار/پنهان‌کردن POIها</string>
     <string name="quick_action_poi_show">نشان‌دادن %1$s</string>
     <string name="quick_action_poi_hide">پنهان‌کردن %1$s</string>
     <string name="quick_action_add_category">افزودن دسته</string>
@@ -2288,9 +2284,6 @@
     <string name="private_access_routing_req">مقصد شما در ناحیه‌ای با دسترسی خصوصی قرار دارد. دسترسی به جاده‌های خصوصی برای این سفر مجاز شود؟</string>
     <string name="restart_search">شروع مجدد جست‌وجو</string>
     <string name="nothing_found">چیزی پیدا نشد</string>
-    <string name="quick_action_showhide_osmbugs_title">آشکار/پنهان‌کردن یادداشت‌های OSM</string>
-    <string name="quick_action_osmbugs_show">آشکارکردن یادداشت‌های OSM</string>
-    <string name="quick_action_osmbugs_hide">پنهان‌کردن یادداشت‌های OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">دکمه‌ای برای آشکار/پنهان کردن یادداشت‌های OSM بر روی نقشه.</string>
     <string name="sorted_by_distance">مرتب‌شده بر اساس مسافت</string>
     <string name="search_favorites">جست‌وجو در علاقه‌مندی‌ها</string>
@@ -2866,10 +2859,7 @@
     <string name="routeInfo_road_types_name">نوع جاده‌ها</string>
     <string name="exit_at">ایستگاه پیاده‌شدن</string>
     <string name="sit_on_the_stop">ایستگاه سوارشدن</string>
-    <string name="quick_action_show_hide_gpx_tracks">آشکار/پنهان کردن ردها</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">دکمه‌ای برای آشکار/پنهان کردن ردهای انتخابی بر روی نقشه.</string>
-    <string name="quick_action_gpx_tracks_hide">پنهان‌کردن ردها</string>
-    <string name="quick_action_gpx_tracks_show">آشکارکردن ردها</string>
     <string name="use_osm_live_public_transport_description">حمل‌ونقل عمومی با استفاده از به‌روزرسانی‌های OsmAnd Live فعال شود.</string>
     <string name="use_osm_live_public_transport">حمل‌ونقل عمومی با OsmAnd Live</string>
     <string name="transfers_size">%1$d انتقال</string>
@@ -3284,13 +3274,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">در مسیریابی، جاده‌های روسازی‌نشده را به روسازی‌شده ترجیح می‌دهد.</string>
     <string name="layer_osm_edits">ویرایش‌های OSM</string>
     <string name="quick_action_contour_lines_descr">دکمه‌ای برای آشکار/پنهان کردن منحنی‌های میزان روی نقشه.</string>
-    <string name="quick_action_contour_lines_show">نشان‌دادن منحنی‌های میزان</string>
-    <string name="quick_action_contour_lines_hide">پنهان‌کردن منحنی‌های میزان</string>
-    <string name="quick_action_show_hide_contour_lines">آشکار/پنهان کردن منحنی‌های میزان</string>
     <string name="quick_action_hillshade_descr">دکمه‌ای برای آشکار/پنهان کردن سایه‌روشن‌ها روی نقشه.</string>
-    <string name="quick_action_hillshade_show">نشان‌دادن سایه‌روشن‌ها</string>
-    <string name="quick_action_hillshade_hide">پنهان‌کردن سایه‌روشن‌ها</string>
-    <string name="quick_action_show_hide_hillshade">آشکار/پنهان کردن سایه‌روشن‌ها</string>
     <string name="tts_initialization_error">شروع موتور متن به گفتار ناموفق بود.</string>
     <string name="simulate_your_location_gpx_descr">موقعیت خود را با استفاده از یک رد GPX ضبط‌شده شبیه‌سازی کنید.</string>
     <string name="exported_osmand_profile">پروفایل OsmAnd:‏ %1$s</string>
@@ -3523,9 +3507,6 @@
     <string name="shared_string_hillshade">سایه‌روشن</string>
     <string name="n_items_of_z">%1$s از %2$s</string>
     <string name="download_slope_maps">شیب‌ها</string>
-    <string name="quick_action_show_hide_terrain">آشکار یا پنهان کردن ناهمواری‌ها</string>
-    <string name="quick_action_terrain_hide">پنهان‌کردن ناهمواری‌ها</string>
-    <string name="quick_action_terrain_show">نمایش ناهمواری‌ها</string>
     <string name="quick_action_terrain_descr">دکمه‌ای برای آشکار یا پنهان کردن لایهٔ ناهمواری‌ها روی نقشه.</string>
     <string name="shared_string_circle">دایره</string>
     <string name="delete_description">حذف توضیحات</string>
@@ -3638,9 +3619,6 @@
     <string name="create_edit_poi">ایجاد یا ویرایش POI</string>
     <string name="add_edit_favorite">افزودن یا ویرایش علاقه‌مندی</string>
     <string name="additional_actions_descr">برای دسترسی به این کنش‌ها می‌توانید روی دکمهٔ «%1$s» بزنید.</string>
-    <string name="quick_action_transport_hide">مخفی‌کردن حمل‌ونقل عمومی</string>
-    <string name="quick_action_transport_show">نمایش حمل‌ونقل عمومی</string>
-    <string name="quick_action_show_hide_transport">آشکار یا پنهان کردن حمل‌ونقل عمومی</string>
     <string name="quick_action_transport_descr">دکمه‌ای برای آشکار یا پنهان کردن حمل‌ونقل عمومی روی نقشه.</string>
     <string name="quick_action_switch_profile_descr">با لمس دکمهٔ عملیاتی بین پروفایل‌های انتخاب‌شده جابه‌جا شوید.</string>
     <string name="shared_string_add_profile">افزودن پروفایل</string>
@@ -3710,9 +3688,6 @@
     <string name="vessel_height_warning">می‌توانید ارتفاع کشتی را برای پرهیز از پل‌های کوتاه وارد کنید. به یاد داشته باشید که اگر پل متحرک است، در حالت باز نیز ارتفاع کشتی را در نظر می‌گیریم.</string>
     <string name="vessel_height_limit_description">ارتفاع کشتی را برای پرهیز از پل‌های کوتاه وارد کنید. به یاد داشته باشید که اگر پل متحرک است، در حالت باز نیز ارتفاع کشتی را در نظر می‌گیریم.</string>
     <string name="vessel_width_limit_description">عرض کشتی را برای پرهیز از پل های باریک وارد کنید</string>
-    <string name="quick_action_showhide_mapillary_title">آشکار/پنهان کردن مپیلاری</string>
-    <string name="quick_action_mapillary_show">آشکارکردن مپیلاری</string>
-    <string name="quick_action_mapillary_hide">پنهان‌کردن مپیلاری</string>
     <string name="quick_action_showhide_mapillary_descr">دکمه‌ای برای آشکار/پنهان کردن لایهٔ مپیلاری روی نقشه.</string>
     <string name="uninstall_speed_cameras">حذف نصب دوربین‌های سرعت</string>
     <string name="shared_string_uninstall_and_restart">حذف نصب و شروع دوباره</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 3801bf19b4..e2ecb5d234 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -1920,10 +1920,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="quick_action_poi_list">KP lista</string>
     <string name="quick_action_bug_message">Viesti</string>
     <string name="quick_action_add_configure_map">Konfiguroi kartta</string>
-    <string name="quick_action_showhide_favorites_title">Näytä/piilota suosikit</string>
-    <string name="quick_action_favorites_show">Näytä suosikit</string>
-    <string name="quick_action_favorites_hide">Piilota suosikit</string>
-    <string name="quick_action_showhide_poi_title">Näytä/piilota KP:t</string>
     <string name="quick_action_poi_show">Näytä %1$s</string>
     <string name="quick_action_poi_hide">Piilota %1$s</string>
     <string name="quick_action_add_category">Lisää luokka</string>
@@ -2002,9 +1998,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="mapillary">Mapillary</string>
     <string name="restart_search">Käynnistä haku uudelleen</string>
     <string name="nothing_found">Mitään ei löytynyt</string>
-    <string name="quick_action_showhide_osmbugs_title">Näytä/piilota OSM-huomautukset</string>
-    <string name="quick_action_osmbugs_show">Näytä OSM-huomautukset</string>
-    <string name="quick_action_osmbugs_hide">Piilota OSM-huomautukset</string>
     <string name="sorted_by_distance">Lajiteltu etäisyyden perusteella</string>
     <string name="search_favorites">Etsi suosikeista</string>
     <string name="hide_from_zoom_level">Piilota zoomaustasosta</string>
@@ -2275,7 +2268,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_swap">Muuta</string>
     <string name="show_more">Näytä lisää</string>
     <string name="tracks_on_map">Näytetyt jäljet</string>
-    <string name="quick_action_show_hide_gpx_tracks">Näytä/piilota GPX jäljet</string>
     <string name="configure_profile_info">Profiilin asetukset:</string>
     <string name="configure_profile">Määritä profiili</string>
     <string name="switch_profile">Vaihda profiilia</string>
@@ -2304,12 +2296,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_by_default">Oletuksena</string>
     <string name="track_storage_directory">Jälkien tallennuskansio</string>
     <string name="layer_osm_edits">OSM-muokkaukset</string>
-    <string name="quick_action_contour_lines_show">Näytä korkeuskäyrät</string>
-    <string name="quick_action_contour_lines_hide">Piilota korkeuskäyrät</string>
-    <string name="quick_action_show_hide_contour_lines">Näytä/piilota korkeuskäyrät</string>
-    <string name="quick_action_hillshade_show">Näytä rinnevarjostus</string>
-    <string name="quick_action_hillshade_hide">Piilota rinnevarjostus</string>
-    <string name="quick_action_show_hide_hillshade">Näytä/piilota rinnevarjostus</string>
     <string name="export_profile">Vie profiili</string>
     <string name="exported_osmand_profile">OsmAnd profiili: %1$s</string>
     <string name="overwrite_profile_q">\'%1$s\' on jo olemassa. Korvataanko\?</string>
@@ -2329,8 +2315,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_gpx_track">Jälki</string>
     <string name="shared_string_gpx_tracks">Jäljet</string>
     <string name="choose_track_file_to_follow">Valitse seurattava jälki tiedosto</string>
-    <string name="quick_action_gpx_tracks_hide">Piilota GPX jäljet</string>
-    <string name="quick_action_gpx_tracks_show">Näytä GPX jäljet</string>
     <string name="app_mode_skiing">Hiihto</string>
     <string name="base_profile_descr_ski">Hiihto</string>
     <string name="routing_profile_ski">Hiihto</string>
@@ -2602,8 +2586,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="icon_group_service">Palvelu</string>
     <string name="icon_group_emergency">Hätätapaus</string>
     <string name="icon_group_transport">Liikenne</string>
-    <string name="quick_action_transport_show">Näytä julkinen liikenne</string>
-    <string name="quick_action_transport_hide">Piilota julkinen liikenne</string>
     <string name="icon_group_symbols">Symbolit</string>
     <string name="replace_point_descr">Korvaa toinen kohde tällä.</string>
     <string name="shared_string_folders">Kansiot</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 7eec7e78e9..4dda03c224 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2099,10 +2099,6 @@
     <string name="favorite_empty_place_name">Emplacement</string>
     <string name="quick_action_duplicates">Ce nom existe déjà, l\'action rapide a été renommée en %1$s.</string>
     <string name="quick_action_duplicate">Nom d\'action rapide en double</string>
-    <string name="quick_action_showhide_favorites_title">Afficher / masquer les favoris</string>
-    <string name="quick_action_favorites_show">Afficher les favoris</string>
-    <string name="quick_action_favorites_hide">Masquer les favoris</string>
-    <string name="quick_action_showhide_poi_title">Afficher / masquer les points d\'intérêt</string>
     <string name="quick_action_poi_show">Afficher %1$s</string>
     <string name="quick_action_poi_hide">Masquer %1$s</string>
     <string name="quick_action_add_category">Ajouter une catégorie</string>
@@ -2305,9 +2301,6 @@
     <string name="hillshade_purchase_header">Téléchargez le greffon \'Courbes de niveaux\' pour mieux visualiser le relief.</string>
     <string name="hide_from_zoom_level">Masquer à partir du niveau de zoom</string>
     <string name="hillshade_menu_download_descr">Téléchargez la sur-couche \'Ombrage du relief\' pour mieux visualiser le relief.</string>
-    <string name="quick_action_showhide_osmbugs_title">Afficher ou masquer les notes OSM</string>
-    <string name="quick_action_osmbugs_show">Afficher les notes OSM</string>
-    <string name="quick_action_osmbugs_hide">Masquer les notes OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Bouton pour afficher ou masquer les notes OSM sur la carte.</string>
     <string name="sorted_by_distance">Trier par distance</string>
     <string name="search_favorites">Rechercher dans les favoris</string>
@@ -2834,9 +2827,6 @@
     <string name="step_by_step">Instructions pas à pas</string>
     <string name="routeInfo_road_types_name">Types de route</string>
     <string name="exit_at">Sortir à</string>
-    <string name="quick_action_show_hide_gpx_tracks">Afficher / masquer les traces</string>
-    <string name="quick_action_gpx_tracks_hide">Masquer les traces</string>
-    <string name="quick_action_gpx_tracks_show">Afficher les traces</string>
     <string name="use_osm_live_public_transport_description">Activer les modifications de transports publics en temps réel avec OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transports publics OsmAnd Live</string>
     <string name="sit_on_the_stop">Panneau d\'affichage à l\'arrêt</string>
@@ -3253,13 +3243,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Privilégier les routes non pavées pour l\'itinéraire.</string>
     <string name="layer_osm_edits">Modifications OSM</string>
     <string name="quick_action_contour_lines_descr">Bouton affichant ou masquant les courbes de niveaux sur la carte.</string>
-    <string name="quick_action_contour_lines_show">Afficher les courbes de niveaux</string>
-    <string name="quick_action_contour_lines_hide">Masquer les courbes de niveaux</string>
-    <string name="quick_action_show_hide_contour_lines">Afficher / masquer les courbes de niveaux</string>
     <string name="quick_action_hillshade_descr">Bouton affichant ou masquant l\'ombrage du relief sur la carte.</string>
-    <string name="quick_action_hillshade_show">Afficher l\'ombrage du relief</string>
-    <string name="quick_action_hillshade_hide">Masquer l\'ombrage du relief</string>
-    <string name="quick_action_show_hide_hillshade">Afficher / masquer l\'ombrage du relief</string>
     <string name="tts_initialization_error">Impossible de démarrer le moteur de synthèse vocale.</string>
     <string name="simulate_your_location_gpx_descr">Simulez votre position à l\'aide d\'une trace GPX enregistrée.</string>
     <string name="export_profile">Exporter le profil</string>
@@ -3486,9 +3470,6 @@
     <string name="terrain_empty_state_text">Active l\'affichage de l\'ombrage du relief et l\'inclinaison. Vous pouvez en savoir plus sur ces types de cartes sur notre site.</string>
     <string name="shared_string_hillshade">Ombrage du relief</string>
     <string name="download_slope_maps">Pentes</string>
-    <string name="quick_action_show_hide_terrain">Affiche ou masque le terrain</string>
-    <string name="quick_action_terrain_hide">Masquer le terrain</string>
-    <string name="quick_action_terrain_show">Afficher le terrain</string>
     <string name="quick_action_terrain_descr">Un bouton pour afficher ou masquer la couche terrain sur la carte.</string>
     <string name="delete_description">Supprimer la description</string>
     <string name="add_description">Ajouter une description</string>
@@ -3600,9 +3581,6 @@
 \n
 \n</string>
     <string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton \"%1$s\".</string>
-    <string name="quick_action_transport_hide">Masquer les transports publics</string>
-    <string name="quick_action_transport_show">Afficher les transports publics</string>
-    <string name="quick_action_show_hide_transport">Affiche ou masque les transports publics</string>
     <string name="quick_action_transport_descr">Bouton pour afficher ou masquer les transports publics sur la carte.</string>
     <string name="create_edit_poi">Créer ou modifier un PI</string>
     <string name="parking_positions">Emplacements de stationnement</string>
@@ -3671,9 +3649,6 @@
     <string name="vessel_height_warning">Vous pouvez définir la hauteur du navire pour éviter les ponts bas. Souvenez-vous que si le pont est mobile, nous utiliserons sa hauteur en position ouverte.</string>
     <string name="vessel_height_limit_description">Définir la hauteur du navire afin d\'éviter les ponts bas. Souvenez-vous que si le pont est mobile, nous utiliserons sa hauteur en position ouverte.</string>
     <string name="vessel_width_limit_description">Définir la largeur du navire pour éviter les ponts étroits</string>
-    <string name="quick_action_showhide_mapillary_title">Afficher/masquer Mapillary</string>
-    <string name="quick_action_mapillary_hide">Masquer Mapillary</string>
-    <string name="quick_action_mapillary_show">Afficher Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Bouton pour afficher ou masquer la couche Mapillary sur la carte.</string>
     <string name="speed_cameras_legal_descr">Dans certains pays ou régions, l\'utilisation d\'avertisseurs de radars est interdit par la loi.
 \n
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 31607c9fc5..f12b12da6c 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -2087,10 +2087,6 @@ Lon %2$s</string>
     <string name="quick_action_duplicate">Duplicidade do nome da acción rápida</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que amosa ou agocha os Favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que amosa ou agocha os PDI no mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Amosar/Agochar os Favoritos</string>
-    <string name="quick_action_favorites_show">Amosar Favoritos</string>
-    <string name="quick_action_favorites_hide">Agochar os Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Amosar/Agochar os PDI</string>
     <string name="quick_action_poi_show">Amosar %1$s</string>
     <string name="quick_action_poi_hide">Agochar %1$s</string>
     <string name="quick_action_add_category">Engadir unha categoría</string>
@@ -2228,9 +2224,6 @@ Lon %2$s</string>
     <string name="restart_search">Reiniciar procura</string>
     <string name="increase_search_radius">Aumentar o raio de procura</string>
     <string name="nothing_found">Non se atopou ren</string>
-    <string name="quick_action_showhide_osmbugs_title">Amosar ou agochar as notas do OSM</string>
-    <string name="quick_action_osmbugs_show">Amosar notas do OSM</string>
-    <string name="quick_action_osmbugs_hide">Agochar notas do OSM</string>
     <string name="sorted_by_distance">Ordenado por distancia</string>
     <string name="search_favorites">Procurar nos Favoritos</string>
     <string name="shared_string_road">Estrada</string>
@@ -2853,10 +2846,7 @@ Lon %2$s</string>
     <string name="shared_string_swap">Trocar</string>
     <string name="show_more">Amosar máis</string>
     <string name="tracks_on_map">Pistas amosadas</string>
-    <string name="quick_action_show_hide_gpx_tracks">Amosar/agochar pistas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que amosa ou agocha as pistas escollidas no mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Agochar pistas</string>
-    <string name="quick_action_gpx_tracks_show">Amosar pistas</string>
     <string name="transfers_size">%1$d transferencias</string>
     <string name="add_start_and_end_points">Engadir orixe e destino</string>
     <string name="route_add_start_point">Engadir punto de comezo</string>
@@ -3271,13 +3261,7 @@ Lon %2$s</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferir as estradas sen pavimentar aos pavimentados para o trazado de rutas.</string>
     <string name="layer_osm_edits">Edicións do OSM</string>
     <string name="quick_action_contour_lines_descr">Un botón que amosa ou agocha as curvas de nivel no mapa.</string>
-    <string name="quick_action_contour_lines_show">Amosar curvas de nivel</string>
-    <string name="quick_action_contour_lines_hide">Agochar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Amosar/agochar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que amosa ou agocha a sombra dos outeiros no mapa.</string>
-    <string name="quick_action_hillshade_show">Amosar sombreados</string>
-    <string name="quick_action_hillshade_hide">Agochar sombreados</string>
-    <string name="quick_action_show_hide_hillshade">Amosar/agochar sombreados</string>
     <string name="tts_initialization_error">Non é posíbel comezar o motor de síntese de voz.</string>
     <string name="simulate_your_location_gpx_descr">Simular a túa posición empregando unha pista GPX gravada.</string>
     <string name="export_profile">Exportar o perfil</string>
@@ -3552,9 +3536,6 @@ Lon %2$s</string>
     <string name="recalculate_route_distance_promo">A ruta será recalculada se a distancia á localización actual é maior que o valor escollido.</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pendentes</string>
-    <string name="quick_action_show_hide_terrain">Amosar ou agochar terreo</string>
-    <string name="quick_action_terrain_hide">Agochar terreo</string>
-    <string name="quick_action_terrain_show">Amosar terreo</string>
     <string name="quick_action_terrain_descr">Un botón que amosa ou agocha a capa do terreo no mapa.</string>
     <string name="delete_description">Eliminar descrición</string>
     <string name="add_description">Engadir descrición</string>
@@ -3619,9 +3600,6 @@ Lon %2$s</string>
 \n</string>
     <string name="shared_string_resume">Retomar</string>
     <string name="additional_actions_descr">Podes acceder a estas accións premendo no botón “%1$s”.</string>
-    <string name="quick_action_transport_hide">Agochar transporte público</string>
-    <string name="quick_action_transport_show">Amosar transporte público</string>
-    <string name="quick_action_show_hide_transport">Amosar ou agochar transporte público</string>
     <string name="quick_action_transport_descr">Botón que amosa ou agocha o transporte público no mapa.</string>
     <string name="create_edit_poi">Crear ou editar PDI</string>
     <string name="parking_positions">Posicións de aparcamento</string>
@@ -3691,10 +3669,7 @@ Lon %2$s</string>
     <string name="vessel_height_warning">Podes definir a altura da embarcación para evitar pontes baixas. Lémbrate se a ponte é móbil, empregaremos a súa altura no estado aberto.</string>
     <string name="vessel_height_limit_description">Define o alto da embarcación para evitar pontes baixas. Lémbrate se a ponte é móbil, empregaremos a súa altura no estado aberto.</string>
     <string name="vessel_width_limit_description">Estabelecer o largo da embarcación para evitar pontes estreitas</string>
-    <string name="quick_action_showhide_mapillary_title">Amosar/agochar o Mapillary</string>
-    <string name="quick_action_mapillary_hide">Agochar o Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón para amosar ou agochar a capa do Mapillary no mapa.</string>
-    <string name="quick_action_mapillary_show">Amosar o Mapillary</string>
     <string name="uninstall_speed_cameras">Desinstalar radares de velocidade</string>
     <string name="shared_string_legal">Legal</string>
     <string name="speed_camera_pois">PDI de radares de velocidade</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 47a3917779..fe6e171440 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -2112,10 +2112,6 @@
     <string name="quick_action_duplicate">A gyorsművelet neve kétszer szerepel</string>
     <string name="quick_action_showhide_favorites_descr">Gomb, amely a térképen megjeleníti vagy elrejti a Kedvenc helyeket.</string>
     <string name="quick_action_showhide_poi_descr">Gomb, amely a térképen megjeleníti vagy elrejti az érdekes pontokat (POI-kat).</string>
-    <string name="quick_action_showhide_favorites_title">Kedvencek megjelenítése/elrejtése</string>
-    <string name="quick_action_favorites_show">Kedvencek megjelenítése</string>
-    <string name="quick_action_favorites_hide">Kedvencek elrejtése</string>
-    <string name="quick_action_showhide_poi_title">POI-k megjelenítése/elrejtése</string>
     <string name="quick_action_poi_show">%1$s megjelenítése</string>
     <string name="quick_action_poi_hide">%1$s elrejtése</string>
     <string name="quick_action_add_category">Kategória hozzáadása</string>
@@ -2239,9 +2235,6 @@
     <string name="select_street">Utca kijelölése</string>
     <string name="shared_string_in_name">itt: %1$s</string>
     <string name="type_address">Cím megadása</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-jegyzetek megjelenítése / elrejtése</string>
-    <string name="quick_action_osmbugs_show">OSM-jegyzetek megjelenítése</string>
-    <string name="quick_action_osmbugs_hide">OSM-jegyzetek elrejtése</string>
     <string name="quick_action_showhide_osmbugs_descr">Gomb, amely a térképen megjeleníti vagy elrejti az OSM-jegyzeteket.</string>
     <string name="sorted_by_distance">Távolság szerinti sorrendben</string>
     <string name="search_favorites">Keresés a Kedvencekben</string>
@@ -2797,10 +2790,7 @@
     <string name="step_by_step">Részletes navigáció</string>
     <string name="routeInfo_road_types_name">Úttípusok</string>
     <string name="exit_at">Szálljon le itt:</string>
-    <string name="quick_action_show_hide_gpx_tracks">Nyomvonalak megjelenítése/elrejtése</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Gomb, amely a térképen megjeleníti vagy elrejti a nyomvonalakat.</string>
-    <string name="quick_action_gpx_tracks_hide">Nyomvonalak elrejtése</string>
-    <string name="quick_action_gpx_tracks_show">Nyomvonalak megjelenítése</string>
     <string name="add_destination_query">Először adjon meg egy célpontot</string>
     <string name="use_osm_live_public_transport_description">Tömegközlekedés engedélyezése OsmAnd Live frissítésekkel.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live tömegközlekedés</string>
@@ -3095,12 +3085,6 @@
     <string name="shared_string_memory_kb_desc">%1$s kB</string>
     <string name="update_all_maps">Összes térkép frissítése</string>
     <string name="update_all_maps_q">Biztos, hogy az összes (%1$d) térképet frissíti\?</string>
-    <string name="quick_action_contour_lines_show">Szintvonalak megjelenítése</string>
-    <string name="quick_action_contour_lines_hide">Szintvonalak elrejtése</string>
-    <string name="quick_action_show_hide_contour_lines">Szintvonalak megjelenítése/elrejtése</string>
-    <string name="quick_action_hillshade_show">Domborzatárnyékolás megjelenítése</string>
-    <string name="quick_action_hillshade_hide">Domborzatárnyékolás elrejtése</string>
-    <string name="quick_action_show_hide_hillshade">Domborzatárnyékolás megjelenítése/elrejtése</string>
     <string name="track_storage_directory">Nyomvonal tárolási mappája</string>
     <string name="track_storage_directory_descrp">A nyomvonalak tárolhatók a \'rec\' mappában, illetve havi vagy napi bontás szerinti mappákban.</string>
     <string name="store_tracks_in_rec_directory">Nyomvonalak felvétele a \'rec\' mappába</string>
@@ -3414,9 +3398,6 @@
     <string name="recalculate_route_distance_promo">Az útvonal újraszámításra kerül, amennyiben az útvonal és a jelenlegi helyzet közötti távolság nagyobb, mint a kiválasztott érték.</string>
     <string name="n_items_of_z">%1$s a %2$s-ból</string>
     <string name="download_slope_maps">Lejtők</string>
-    <string name="quick_action_show_hide_terrain">Domborzat megjelenítése vagy elrejtése</string>
-    <string name="quick_action_terrain_hide">Domborzat elrejtése</string>
-    <string name="quick_action_terrain_show">Domborzat megjelenítése</string>
     <string name="quick_action_terrain_descr">Váltógomb, amely a térképen megjeleníti vagy elrejti a domborzati réteget.</string>
     <string name="delete_description">Leírás törlése</string>
     <string name="add_description">Leírás hozzáadása</string>
@@ -3511,9 +3492,6 @@
     <string name="additional_actions_descr">Ezekhez a műveletekhez a \"%1$s\" gombra koppintva férhet hozzá.</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="download_unsupported_action">Nem támogatott művelet: %1$s</string>
-    <string name="quick_action_transport_hide">Tömegközlekedés elrejtése</string>
-    <string name="quick_action_transport_show">Tömegközlekedés megjelenítése</string>
-    <string name="quick_action_show_hide_transport">Tömegközlekedés megjelenítése vagy elrejtése</string>
     <string name="create_edit_poi">POI készítése vagy módosítása</string>
     <string name="parking_positions">Parkolási pozíció</string>
     <string name="add_edit_favorite">Kedvenc hozzáadása vagy módosítása</string>
@@ -3602,9 +3580,6 @@
     <string name="vessel_height_limit_description">Adja meg a hajómagasságot az alacsony hidak elkerüléséhez. Ne feledje, amennyiben a híd mozdítható, a nyitott állapotú magasságát vesszük figyelembe.</string>
     <string name="vessel_height_warning">Megadhatja a hajómagasságot az alacsony hidak elkerüléséhez. Ne feledje, amennyiben a híd mozdítható, a nyitott állapotú magasságát vesszük figyelembe.</string>
     <string name="vessel_width_limit_description">Adja meg a hajószélességet a keskeny hidak elkerüléséhez</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary megjelenítése/elrejtése</string>
-    <string name="quick_action_mapillary_hide">Mapillary elrejtése</string>
-    <string name="quick_action_mapillary_show">Mapillary megjelenítése</string>
     <string name="quick_action_showhide_mapillary_descr">Váltógomb, amely a térképen megjeleníti vagy elrejti a Mapillary réteget.</string>
     <string name="uninstall_speed_cameras">Traffipaxok eltávolítása</string>
     <string name="shared_string_legal">Jogi</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index 4d997b73ce..d6b1964c02 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -247,9 +247,6 @@
     <string name="increase_search_radius">Ավելացնել որոնման շառավղը</string>
     <string name="nothing_found">Ոչինչ չի գտնվել</string>
     <string name="nothing_found_descr">Փոխել հարցումը կամ ավելացնել որոնման շառավիղը։</string>
-    <string name="quick_action_showhide_osmbugs_title">Ցույց տալ/թաքցնել OSM նշումները</string>
-    <string name="quick_action_osmbugs_show">Ցույց տալ OSM նշումները</string>
-    <string name="quick_action_osmbugs_hide">Թաքցնել OSM նշումները</string>
     <string name="quick_action_showhide_osmbugs_descr">Քարտեզի վրա ցույց տալ կամ թաքցնել OSM նշումները կոճակը:</string>
     <string name="sorted_by_distance">Դասավորված է ըստ հեռավորության</string>
     <string name="search_favorites">Որոնում Սիրվածում</string>
@@ -2484,10 +2481,6 @@
     <string name="quick_action_duplicate">Կրկնօրինակ անուն գտնվեց</string>
     <string name="quick_action_showhide_favorites_descr">Սեղմելով գործողության կոճակը ցույց կտա կամ կթաքցնի «Սիրված» կետերը քարտեզի վրա:</string>
     <string name="quick_action_showhide_poi_descr">Սեղմելով գործողության կոճակը ցույց կտա կամ կթաքցնի POI կետերը քարտեզի վրա:</string>
-    <string name="quick_action_showhide_favorites_title">Ցուցադրել/թաքցնել «Սիրված»-ը</string>
-    <string name="quick_action_favorites_show">Ցուցադրել «Սիրված»-ը</string>
-    <string name="quick_action_favorites_hide">Թաքցնել «Սիրված»-ը</string>
-    <string name="quick_action_showhide_poi_title">Ցուցադրել/թաքցնել POI</string>
     <string name="quick_action_poi_show">Ցուցադրել %1$s</string>
     <string name="quick_action_poi_hide">Թաքցնել %1$s</string>
     <string name="quick_action_add_category">Ավելացնել կատեգորիա</string>
@@ -2870,9 +2863,6 @@
     <string name="keep_active">Պահել ակտիվ</string>
     <string name="shared_string_uninstall">Ջնջել</string>
     <string name="speed_cameras_alert">Որոշ երկրներում արագության վերահսկողության տեսախցիկների ծանուցումը արգելված է օրենքով ։</string>
-    <string name="quick_action_showhide_mapillary_title">Ցույց տալ/Թաքցնել Mapillary</string>
-    <string name="quick_action_mapillary_hide">Թաքցնել</string>
-    <string name="quick_action_mapillary_show">Ցույց տալ Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Անջատիչ - Mapillary շերտը ցույց տալու կամ թաքցնել ու քարտեզի վրա:</string>
     <string name="shared_string_bearing">Կողմնորոշում</string>
     <string name="item_deleted">%1$s ջնջվեց</string>
@@ -2959,9 +2949,6 @@
     <string name="osmand_purchases_item">OsmAnd-ի գնումները</string>
     <string name="legend_item_description">Տեղեկանք քարտեզի խորհրդանիշներին:</string>
     <string name="navigation_profiles_item">Նավիգացիոն պրոֆիլներ</string>
-    <string name="quick_action_transport_hide">Թաքցնել հասարակական տրանսպորտը</string>
-    <string name="quick_action_transport_show">Ցույց տալ հասարակական տրանսպորտը</string>
-    <string name="quick_action_show_hide_transport">Ցույց տալ / թաքցնել հասարակական տրանսպորտը</string>
     <string name="quick_action_transport_descr">Կոճակ, որը ցույց է տալիս կամ թաքցնում է հասարակական տրանսպորտը քարտեզի վրա:</string>
     <string name="create_edit_poi">Ստեղծել / Խմբագրել POI</string>
     <string name="add_edit_favorite">Ավելացնել / Խմբագրել Սիրվածն-րը</string>
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index 066b53f1b6..d69eb004e6 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -233,9 +233,6 @@
     <string name="increase_search_radius">Tingkatkan radius pencarian</string>
     <string name="nothing_found">Tidak ada yang ditemukan</string>
     <string name="nothing_found_descr">Ubah kata pencarian atau tingkatkan radius pencarian.</string>
-    <string name="quick_action_showhide_osmbugs_title">Tampil/sembunyikan Catatan OSM</string>
-    <string name="quick_action_osmbugs_show">Tampilkan Catatan OSM</string>
-    <string name="quick_action_osmbugs_hide">Sembunyikan Catatan OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Mengetuk tombol tindakan akan menampilkan atau menyembunyikan Catatan OSM di peta.</string>
     <string name="sorted_by_distance">Diurutkan menurut jarak</string>
     <string name="search_favorites">Cari Favorit</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index baf977ae9c..09b929262e 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -1801,10 +1801,6 @@
     <string name="quick_favorites_name_preset">Forstilling á nafni</string>
     <string name="favorite_autofill_toast_text">" vistað í "</string>
     <string name="favorite_empty_place_name">Staður</string>
-    <string name="quick_action_showhide_favorites_title">Birta/Fela eftirlæti</string>
-    <string name="quick_action_favorites_show">Birta eftirlæti</string>
-    <string name="quick_action_favorites_hide">Fela eftirlæti</string>
-    <string name="quick_action_showhide_poi_title">Birta/Fela merkisstaði</string>
     <string name="quick_action_poi_show">Sýna %1$s</string>
     <string name="quick_action_poi_hide">Fela %1$s</string>
     <string name="quick_action_add_category">Bæta við flokki</string>
@@ -2049,9 +2045,6 @@
     <string name="restart_search">Byrja leit aftur</string>
     <string name="increase_search_radius">Stækka radíus leitar</string>
     <string name="nothing_found">Ekkert fannst</string>
-    <string name="quick_action_showhide_osmbugs_title">Birta/fela OSM-minnispunkta</string>
-    <string name="quick_action_osmbugs_show">Birta OSM-minnispunkta</string>
-    <string name="quick_action_osmbugs_hide">Fela OSM-minnispunkta</string>
     <string name="sorted_by_distance">Raðað eftir vegalengd</string>
     <string name="search_favorites">Leita í eftirlætum</string>
     <string name="shared_string_plugin">Viðbót</string>
@@ -2850,10 +2843,7 @@
     <string name="routeInfo_road_types_name">Gerðir vega</string>
     <string name="exit_at">Fara útaf við</string>
     <string name="sit_on_the_stop">Fara um borð við stöðvunina</string>
-    <string name="quick_action_show_hide_gpx_tracks">Birta/Fela ferla</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Hnappur til að birta eða fela valda ferla á kortinu.</string>
-    <string name="quick_action_gpx_tracks_hide">Fela ferla</string>
-    <string name="quick_action_gpx_tracks_show">Birta ferla</string>
     <string name="use_osm_live_public_transport_description">Virkja breytingar á almenningssamgöngum í OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Almenningssamgöngur OsmAnd Live</string>
     <string name="public_transport_warning_descr_blog">Lestu meira á blogginu okkar um hvernig OsmAnd reiknar leiðir.</string>
@@ -3268,13 +3258,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Velja frekar vegi með óbundnu slitlagi við leiðagerð.</string>
     <string name="layer_osm_edits">OSM-breytingar</string>
     <string name="quick_action_contour_lines_descr">Hnappur til að birta eða fela hæðarlínur á kortinu.</string>
-    <string name="quick_action_contour_lines_show">Birta hæðarlínur</string>
-    <string name="quick_action_contour_lines_hide">Fela hæðarlínur</string>
-    <string name="quick_action_show_hide_contour_lines">Birta/Fela hæðarlínur</string>
     <string name="quick_action_hillshade_descr">Hnappur til að birta eða fela hæðaskyggingu á kortinu.</string>
-    <string name="quick_action_hillshade_show">Birta hæðaskyggingu</string>
-    <string name="quick_action_hillshade_hide">Fela hæðaskyggingu</string>
-    <string name="quick_action_show_hide_hillshade">Birta/Fela hæðaskyggingu</string>
     <string name="tts_initialization_error">Gat ekki ræst talgervil.</string>
     <string name="simulate_your_location_gpx_descr">Herma eftir staðsetningu þinni með áður skráðum GPX-ferli.</string>
     <string name="export_profile">Flytja út snið</string>
@@ -3497,9 +3481,6 @@
     <string name="terrain_empty_state_text">Virkja til að sjá hæðaskyggingar eða brekkur á korti. Þú getur lesið meira um þessa eiginleika á vefnum okkar.</string>
     <string name="shared_string_hillshade">Hæðaskygging</string>
     <string name="download_slope_maps">Brekkur</string>
-    <string name="quick_action_show_hide_terrain">Birta eða fela yfirborð</string>
-    <string name="quick_action_terrain_hide">Fela yfirborð</string>
-    <string name="quick_action_terrain_show">Sýna yfirborð</string>
     <string name="quick_action_terrain_descr">Hnappur til að birta eða fela yfirborðslag á kortinu.</string>
     <string name="recalculate_route_in_deviation">Endurreikna leið ef farið er út af fyrirfram gefinni leið</string>
     <string name="select_distance_route_will_recalc">Veldu þá vegalengd sem þarf til að leiðin verði endurreiknuð.</string>
@@ -3597,7 +3578,6 @@
     <string name="profiles_for_action_not_found">Gat ekki fundið nein slík snið.</string>
     <string name="online_map_url_helper_text">Settu inn eða afritaðu og límdu slóð á nettengdan kortagjafa.</string>
     <string name="map_markers_item">Kortamerki</string>
-    <string name="quick_action_transport_hide">Fela almenningssamgöngur</string>
     <string name="system_screen_timeout">Nota tímamörk kerfis fyrir skjá</string>
     <string name="edit_online_source">Breyta nettengdum gagnagjafa</string>
     <string name="tracker_item">OsmAnd rekjari</string>
@@ -3610,7 +3590,6 @@
     <string name="additional_actions_descr">Þú getur komist í þessar aðgerðir með því að ýta á \"%1$s\"-hnappinn.</string>
     <string name="subscription_osmandlive_item">Áskrift - OsmAnd Live</string>
     <string name="shared_string_always">Alltaf</string>
-    <string name="quick_action_show_hide_transport">Birta eða fela almenningssamgöngur</string>
     <string name="reset_deafult_order">Endurheimta sjálfgefna röð atriða</string>
     <string name="unsupported_type_error">Óstudd tegund</string>
     <string name="turn_screen_on_navigation_instructions">Leiðsagnarleiðbeiningar</string>
@@ -3620,7 +3599,6 @@
     <string name="shared_string_resume">Halda áfram</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="add_edit_favorite">Bæta við eða breyta eftirlæti</string>
-    <string name="quick_action_transport_show">Birta almenningssamgöngur</string>
     <string name="default_screen_timeout">Sjálfgefin tímamörk fyrir skjá</string>
     <string name="quick_action_transport_descr">Hnappur til að birta eða fela almenningssamgöngur á kortinu.</string>
     <string name="turn_screen_on_proximity_sensor">Nálægðarskynjari</string>
@@ -3672,9 +3650,6 @@
     <string name="speed_camera_pois">Merktar hraðamyndavélar</string>
     <string name="keep_active">Halda virku</string>
     <string name="speed_cameras_alert">Aðvaranir vegna hraðamyndavéla eru bannaðar með lögum í sumum löndum.</string>
-    <string name="quick_action_showhide_mapillary_title">Sýna/fela Mapillary</string>
-    <string name="quick_action_mapillary_hide">Fela Mapillary</string>
-    <string name="quick_action_mapillary_show">Sýna Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Víxlhnappur til að birta eða fela Mapillary-lagið á kortinu.</string>
     <string name="shared_string_bearing">Stefna</string>
     <string name="item_deleted">%1$s eytt</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index b0fed91a00..0b578f99f3 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2120,10 +2120,6 @@
     <string name="quick_action_duplicate">Nome dell\'azione veloce duplicato</string>
     <string name="quick_action_showhide_favorites_descr">Questo pulsante d’azione mostra o nasconde i preferiti sulla mappa.</string>
     <string name="quick_action_showhide_poi_descr">Questo pulsante azione mostra o nasconde i PDI sulla mappa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostra/nascondi preferiti</string>
-    <string name="quick_action_favorites_show">Mostra preferiti</string>
-    <string name="quick_action_favorites_hide">Nascondi preferiti</string>
-    <string name="quick_action_showhide_poi_title">Mostra/nascondi PDI</string>
     <string name="quick_action_poi_show">Mostra %1$s</string>
     <string name="quick_action_poi_hide">Nascondi %1$s</string>
     <string name="quick_action_add_category">Aggiungi una categoria</string>
@@ -2250,9 +2246,6 @@
     <string name="increase_search_radius">Aumenta il raggio di ricerca</string>
     <string name="nothing_found">Nessun risultato</string>
     <string name="nothing_found_descr">Cambia la ricerca o aumenta il raggio.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostra/nascondi le Note OSM</string>
-    <string name="quick_action_osmbugs_show">Mostra le note OSM</string>
-    <string name="quick_action_osmbugs_hide">Nascondi le note OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Toccando il pulsante azione verranno mostrate o nascoste le note OSM sulla mappa.</string>
     <string name="sorted_by_distance">Ordinato per distanza</string>
     <string name="search_favorites">Cerca nei Preferiti</string>
@@ -2829,9 +2822,6 @@
     <string name="routeInfo_road_types_name">Tipi di strade</string>
     <string name="show_more">Mostra di più</string>
     <string name="tracks_on_map">Tracciati visualizzati</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostra/nascondi tracce GPX</string>
-    <string name="quick_action_gpx_tracks_hide">Nascondi Tracciati GPX</string>
-    <string name="quick_action_gpx_tracks_show">Mostra Tracciati GPX</string>
     <string name="quick_action_day_night_mode">Modalità %s</string>
     <string name="avoid_pt_types">Evita tipi di trasporto…</string>
     <string name="shared_string_walk">A piedi</string>
@@ -3252,13 +3242,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferisci le strade pavimentate.</string>
     <string name="layer_osm_edits">Modifiche OSM</string>
     <string name="quick_action_contour_lines_descr">Un controllo per mostrare o nascondere nella mappa le linee isoipse.</string>
-    <string name="quick_action_contour_lines_show">Mostra le linee isoipse</string>
-    <string name="quick_action_contour_lines_hide">Nascondi le linee isoipse</string>
-    <string name="quick_action_show_hide_contour_lines">Mostra/nascondi le linee isoipse</string>
     <string name="quick_action_hillshade_descr">Un controllo per mostrare o nascondere nella mappa le ombreggiature dei rilievi.</string>
-    <string name="quick_action_hillshade_show">Mostra l\'ombreggiatura dei rilievi</string>
-    <string name="quick_action_hillshade_hide">Nascondi l\'ombreggiatura dei rilievi</string>
-    <string name="quick_action_show_hide_hillshade">Mostra/nascondi l\'ombreggiatura dei rilievi</string>
     <string name="tts_initialization_error">Impossibile avviare il motore dal-testo-alla-voce.</string>
     <string name="simulate_your_location_gpx_descr">Simula la mia posizione utilizzando una traccia GPX registrata.</string>
     <string name="default_speed_dialog_msg">Utilizzata per stimare l\'orario d\'arrivo per le strade di tipo sconosciute e come limite di velocità per tutte le strade (può influenzare il calcolo del percorso)</string>
@@ -3476,9 +3460,6 @@
     <string name="add_description">Aggiungi descrizione</string>
     <string name="delete_description">Elimina descrizione</string>
     <string name="quick_action_terrain_descr">Un bottone per mostrare o nascondere la vista rilievo sulla mappa.</string>
-    <string name="quick_action_terrain_show">Mostra rilievo</string>
-    <string name="quick_action_terrain_hide">Nascondi rilievo</string>
-    <string name="quick_action_show_hide_terrain">Mostra/nascondi rilievo</string>
     <string name="download_slope_maps">Pendenze</string>
     <string name="shared_string_hillshade">Ombreggiatura rilievi</string>
     <string name="slope_read_more">Puoi avere maggiori informazioni sulle Pendenze in %1$s.</string>
@@ -3514,9 +3495,6 @@
     <string name="shared_string_all_languages">Tutte le lingue</string>
     <string name="developer_plugin">Plugin sviluppatore</string>
     <string name="shared_string_items">Oggetti</string>
-    <string name="quick_action_transport_hide">Nascondi i trasporti pubblici</string>
-    <string name="quick_action_transport_show">Mostra i trasporti pubblici</string>
-    <string name="quick_action_show_hide_transport">Mostra/nascondi i trasporti pubblici</string>
     <string name="quick_action_transport_descr">Il pulsante mostra o nasconde nella mappa i trasporti pubblici.</string>
     <string name="create_edit_poi">Crea/Modifica PDI</string>
     <string name="parking_positions">Posizione di parcheggio</string>
@@ -3672,9 +3650,6 @@
     <string name="vessel_height_warning">Puoi mpostare l\'altezza dell\'imbarcazione per evitare ponti bassi. Ricorda che, se il ponte è mobile, useremo la sua altezza da aperto.</string>
     <string name="vessel_height_limit_description">Imposta l\'altezza dell\'imbarcazione per evitare ponti bassi. Ricorda che, se il ponte è mobile, useremo la sua altezza da aperto.</string>
     <string name="vessel_width_limit_description">Imposta la larghezza della\"imbarcazione per evitare i ponti stretti</string>
-    <string name="quick_action_showhide_mapillary_title">Mostra/nascondi Mapillary</string>
-    <string name="quick_action_mapillary_hide">Nascondi Mapillary</string>
-    <string name="quick_action_mapillary_show">Mostra Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un pulsante per visualizzare nella mappa o nascondere il livello Mapillary .</string>
     <string name="lenght_limit_description">Fornisci la lunghezza del tuo veicolo, alcune restrizioni di percorso potrebbero essere applicate per veicoli.</string>
     <string name="uninstall_speed_cameras">Disinstalla autovelox</string>
diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index a9c6fff921..c299b049d4 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -1125,9 +1125,6 @@
     <string name="increase_search_radius">הגדלת רדיוס החיפוש</string>
     <string name="nothing_found">לא נמצא כלום</string>
     <string name="nothing_found_descr">עריכת החיפוש או הגדלת הטווח.</string>
-    <string name="quick_action_showhide_osmbugs_title">הצגה או הסתרה של הערות OSM</string>
-    <string name="quick_action_osmbugs_show">הצגת הערות OSM</string>
-    <string name="quick_action_osmbugs_hide">הסתרת הערות OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">כפתור להצגה או להסתרה של הערות OSM על המפה.</string>
     <string name="sorted_by_distance">מסודר לפי מרחק</string>
     <string name="search_favorites">חיפוש במועדפים</string>
@@ -1649,10 +1646,6 @@
     <string name="favorite_empty_place_name">מיקום</string>
     <string name="quick_action_showhide_favorites_descr">בורר להצגה או הסתרה של הנקודות המועדפות במפה.</string>
     <string name="quick_action_showhide_poi_descr">בורר להצגה או הסתרה של נקודות עניין במפה.</string>
-    <string name="quick_action_showhide_favorites_title">הצגה/הסתרה של מועדפים</string>
-    <string name="quick_action_favorites_show">הצגת מועדפים</string>
-    <string name="quick_action_favorites_hide">הסתרת מועדפים</string>
-    <string name="quick_action_showhide_poi_title">הצגה/הסרה של נקודות עניין</string>
     <string name="quick_action_poi_show">הצגת %1$s</string>
     <string name="quick_action_poi_hide">הסתרת %1$s</string>
     <string name="quick_action_add_category">הוספת קטגוריה</string>
@@ -2843,10 +2836,7 @@
     <string name="step_by_step">פנייה אחר פנייה</string>
     <string name="routeInfo_road_types_name">סוגי כבישים</string>
     <string name="exit_at">לצאת ב־</string>
-    <string name="quick_action_show_hide_gpx_tracks">הצגה/הסתרה של מסלולים</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">כפתור להצגה או הסתרה של המסלולים הנבחרים במפה.</string>
-    <string name="quick_action_gpx_tracks_hide">הסתרת מסלולים</string>
-    <string name="quick_action_gpx_tracks_show">הצגת מסלולים</string>
     <string name="use_osm_live_public_transport_description">הפעלת תחבורה ציבורית לשינויים ב־OsmAnd החי.</string>
     <string name="use_osm_live_public_transport">OsmAnd חי תחבורה ציבורית</string>
     <string name="transfers_size">%1$d העברות</string>
@@ -3257,13 +3247,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">להעדיף דרכים לא סלולות על פני סלולות בבחירת מסלול.</string>
     <string name="layer_osm_edits">עריכות OSM</string>
     <string name="quick_action_contour_lines_descr">כפתור להצגה או להסתרה של קווי מתאר במפה.</string>
-    <string name="quick_action_contour_lines_show">הצגת קווי מתאר</string>
-    <string name="quick_action_contour_lines_hide">הסתרת קווי מתאר</string>
-    <string name="quick_action_show_hide_contour_lines">הצגה/הסתרה של קווי מתאר</string>
     <string name="quick_action_hillshade_descr">כפתור להצגה או הסתרה של הצללות במפה.</string>
-    <string name="quick_action_hillshade_show">הצגת הצללה</string>
-    <string name="quick_action_hillshade_hide">הסתרת הצללה</string>
-    <string name="quick_action_show_hide_hillshade">הצגה/הסתרה של הצללה</string>
     <string name="tts_initialization_error">לא ניתן להפעיל מנוע המרת טקסט לדיבור.</string>
     <string name="simulate_your_location_gpx_descr">הדמיית המיקום שלך באמצעות מסלול GPX שהוקלט מראש.</string>
     <string name="export_profile">ייצוא פרופיל</string>
@@ -3470,9 +3454,6 @@
     <string name="shared_string_hillshade">הצללה</string>
     <string name="n_items_of_z">%1$s מתוך %2$s</string>
     <string name="download_slope_maps">מדרונות</string>
-    <string name="quick_action_show_hide_terrain">הצגה או הסתרה של תוואי שטח</string>
-    <string name="quick_action_terrain_hide">הסתרת תוואי שטח</string>
-    <string name="quick_action_terrain_show">הצגת תוואי שטח</string>
     <string name="quick_action_terrain_descr">כפתור להצגה או הסתרה של שכבת תוואי שטח על גבי המפה.</string>
     <string name="delete_description">מחיקת תיאור</string>
     <string name="add_description">הוספת תיאור</string>
@@ -3591,9 +3572,6 @@
     <string name="navigate_point_format_utm">תקן מר״ב</string>
     <string name="utm_format_descr">ב־OsmAnd נעשה שימוש בתקן מר״ב, שדומה אך לא זהה לתצורת המר״ב של נאט״ו.</string>
     <string name="additional_actions_descr">ניתן לגשת לפעולות האלו על ידי לחיצה על הכפתור „%1$s”.</string>
-    <string name="quick_action_transport_hide">הסתרת תחבורה ציבורית</string>
-    <string name="quick_action_transport_show">הצגת תחבורה ציבורית</string>
-    <string name="quick_action_show_hide_transport">הצגת או הסתרת תחב״צ</string>
     <string name="quick_action_transport_descr">כפתור להצגה או הסתרה של תחבורה ציבורית על המפה.</string>
     <string name="create_edit_poi">יצירה או עריכה של נקודת עניין</string>
     <string name="parking_positions">מקומות חנייה</string>
@@ -3686,9 +3664,6 @@
     <string name="vessel_height_warning">ניתן להגדיר את גובה כלי השיט כדי להימנע מגשרים נמוכים. נא לשים לב שאם הגשר נע, אנו נשתמש בגובהו במצב הפתוח.</string>
     <string name="vessel_height_limit_description">יש להגדיר את גובה כלי השיט כדי להימנע מגשרים נמוכים. נא לשים לב שאם הגשר נע, אנו נשתמש בגובהו במצב הפתוח.</string>
     <string name="vessel_width_limit_description">הגדרת רוחב כלי השיט כדי להימנע מגשרים צרים</string>
-    <string name="quick_action_showhide_mapillary_title">הצגת/הסתרת Mapillary</string>
-    <string name="quick_action_mapillary_hide">הסתרת Mapillary</string>
-    <string name="quick_action_mapillary_show">הצגת Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">מפסק להצגה או הסתרה של שכבת Mapillary על גבי המפה.</string>
     <string name="uninstall_speed_cameras">הסרת מצלמות מהירות</string>
     <string name="shared_string_legal">משפטי</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index a5edb2aaeb..ace0b01cd1 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -2141,10 +2141,6 @@ POIの更新は利用できません</string>
     <string name="quick_action_duplicate">クイックアクション名の重複</string>
     <string name="quick_action_showhide_favorites_descr">マップ画面でのお気に入り地点の表示/非表示の切替が出来ます。</string>
     <string name="quick_action_showhide_poi_descr">マップ画面でのPOIの表示/非表示の切替が出来ます。</string>
-    <string name="quick_action_showhide_favorites_title">お気に入りの表示/非表示</string>
-    <string name="quick_action_favorites_show">お気に入りを表示</string>
-    <string name="quick_action_favorites_hide">お気に入りを非表示</string>
-    <string name="quick_action_showhide_poi_title">POIの表示/非表示</string>
     <string name="quick_action_poi_show">%1$sを表示</string>
     <string name="quick_action_poi_hide">%1$sを非表示</string>
     <string name="quick_action_add_category">カテゴリーを追加</string>
@@ -2349,9 +2345,6 @@ POIの更新は利用できません</string>
  • オプションで速度と標高表示ができます
  • 等高線と山陰の表示(要追加プラグイン）
  "</string>
-    <string name="quick_action_showhide_osmbugs_title">OSMメモの表示/非表示</string>
-    <string name="quick_action_osmbugs_show">OSMメモを表示</string>
-    <string name="quick_action_osmbugs_hide">OSMメモを非表示</string>
     <string name="quick_action_showhide_osmbugs_descr">マップ画面でのOSMメモの表示/非表示を切り替えるボタンです。</string>
     <string name="sorted_by_distance">距離順で並べ替え</string>
     <string name="search_favorites">お気に入りで検索</string>
@@ -2792,10 +2785,7 @@ POIの更新は利用できません</string>
     <string name="shared_string_swap">入れ替え</string>
     <string name="show_more">さらに表示</string>
     <string name="tracks_on_map">マップ上の経路</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX経路の表示/非表示</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">マップ上にある選択したGPX経路の表示/非表示を切り替えるボタンです。</string>
-    <string name="quick_action_gpx_tracks_hide">経路の非表示</string>
-    <string name="quick_action_gpx_tracks_show">経路の表示</string>
     <string name="add_destination_query">最初に目的地を設定して下さい</string>
     <string name="previous_route">前回のルート</string>
     <string name="cubic_m">立方メートル</string>
@@ -3267,13 +3257,7 @@ POIの更新は利用できません</string>
     <string name="lang_oc">オック語</string>
     <string name="layer_osm_edits">OSMの編集</string>
     <string name="quick_action_contour_lines_descr">マップ上の等高線の表示/非表示を切り替えられるボタンです。</string>
-    <string name="quick_action_contour_lines_show">等高線を表示</string>
-    <string name="quick_action_contour_lines_hide">等高線を非表示</string>
-    <string name="quick_action_show_hide_contour_lines">等高線を表示/非表示</string>
     <string name="quick_action_hillshade_descr">マップ上の陰影起伏図の表示/非表示を切り替えられるボタンです。</string>
-    <string name="quick_action_hillshade_show">陰影起伏図を表示</string>
-    <string name="quick_action_hillshade_hide">陰影起伏図を非表示</string>
-    <string name="quick_action_show_hide_hillshade">陰影起伏図の表示/非表示</string>
     <string name="tts_initialization_error">テキスト読み上げエンジンを起動できません。</string>
     <string name="export_profile">プロファイルのエクスポート</string>
     <string name="exported_osmand_profile">OsmAndプロファイル:%1$s</string>
@@ -3497,9 +3481,6 @@ POIの更新は利用できません</string>
     <string name="shared_string_zoom_levels">ズームレベル</string>
     <string name="shared_string_hillshade">陰影起伏図</string>
     <string name="download_slope_maps">勾配</string>
-    <string name="quick_action_show_hide_terrain">地形を表示/非表示</string>
-    <string name="quick_action_terrain_hide">地形を非表示</string>
-    <string name="quick_action_terrain_show">地形を表示</string>
     <string name="quick_action_terrain_descr">マップ上の地形レイヤーの表示/非表示を切り替えるボタンです。</string>
     <string name="delete_description">説明を削除</string>
     <string name="add_description">説明を追加</string>
@@ -3508,9 +3489,6 @@ POIの更新は利用できません</string>
     <string name="shared_string_circle">円形</string>
     <string name="shared_string_square">四角形</string>
     <string name="shared_string_min">最小</string>
-    <string name="quick_action_transport_hide">公共交通機関を非表示</string>
-    <string name="quick_action_transport_show">公共交通機関を表示</string>
-    <string name="quick_action_show_hide_transport">公共交通機関の表示/非表示</string>
     <string name="quick_action_transport_descr">マップ内公共交通機関の表示/非表示を切り替えるボタンです。</string>
     <string name="create_edit_poi">POIの作成/編集</string>
     <string name="parking_positions">駐車位置</string>
@@ -3737,9 +3715,6 @@ POIの更新は利用できません</string>
     <string name="vessel_height_warning">低い橋を避けるために船の高さを調整できます。橋が可動式の場合は、開いた状態の高さが参照されます。</string>
     <string name="vessel_height_limit_description">低い橋を避けるために船の高さを設定します。注：橋が可動式の場合は、開いた状態の高さが参照されます。</string>
     <string name="vessel_width_limit_description">狭い橋を避けるために船の幅を設定します</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillaryの表示切替</string>
-    <string name="quick_action_mapillary_hide">Mapillaryを非表示</string>
-    <string name="quick_action_mapillary_show">Mapillaryを表示</string>
     <string name="quick_action_showhide_mapillary_descr">マップ上のMapillaryレイヤーの表示/非表示を切り替えるトグルボタンです。</string>
     <string name="routing_attr_length_description">ルート検索時に指定した車両の長さを考慮します。</string>
     <string name="routing_attr_length_name">長さ制限</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 786b5de97c..296d28d3e6 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1223,9 +1223,6 @@
     <string name="saving_new_profile">ახალი პროფილის ჩაწერა</string>
     <string name="n_items_of_z">%1$s %2$s-დან</string>
     <string name="download_slope_maps">დაქანებები</string>
-    <string name="quick_action_show_hide_terrain">რელიეფის ჩვენება/დამალვა</string>
-    <string name="quick_action_terrain_hide">რელიეფის დამალვა</string>
-    <string name="quick_action_terrain_show">რელიეფის ჩვენება</string>
     <string name="quick_action_terrain_descr">რელიეფის შრის საჩვენებელი ღილაკი.</string>
     <string name="delete_description">აღწერის წაშლა</string>
     <string name="add_description">აღწერის დამატება</string>
@@ -1797,9 +1794,6 @@
     <string name="shared_string_revert">შემობრუნება</string>
     <string name="rendering_value_white_name">თეთრი</string>
     <string name="transfers_size">%1$d გადმოწერა</string>
-    <string name="quick_action_gpx_tracks_show">ბილიკების ჩვენება</string>
-    <string name="quick_action_gpx_tracks_hide">ბილიკების დამალვა</string>
-    <string name="quick_action_show_hide_gpx_tracks">ბილიკების ჩვენება/დამალვა</string>
     <string name="exit_at">გამოსვლა</string>
     <string name="by_transport_type">%1$s-ით</string>
     <string name="tracks_on_map">ნაჩვენები ბილიკები</string>
@@ -1959,10 +1953,6 @@
     <string name="quick_action_add_configure_map">რუკის გამართვა</string>
     <string name="quick_action_poi_hide">%1$s-ის დამალვა</string>
     <string name="quick_action_poi_show">%1$s-ის ჩვენება</string>
-    <string name="quick_action_showhide_poi_title">POI-ს ჩვენება/დამალვა</string>
-    <string name="quick_action_favorites_hide">რჩეულების დამალვა</string>
-    <string name="quick_action_favorites_show">რჩეულების ჩვენება</string>
-    <string name="quick_action_showhide_favorites_title">რჩეულების ჩვენება/დამალვა</string>
     <string name="quick_actions_delete">მოქმედების წაშლა</string>
     <string name="dialog_add_action_title">მოქმედების დამატება</string>
     <string name="quick_action_add_favorite">რჩეულის დამატება</string>
@@ -2220,9 +2210,6 @@
     <string name="gpx_direction_arrows">მიმართულების ისრები</string>
     <string name="app_mode_enduro_motorcycle">მოტოციკლი Enduro</string>
     <string name="app_mode_motor_scooter">მოტორიანი სკუტერი</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary-ის ჩვენება/დამალვა</string>
-    <string name="quick_action_mapillary_hide">Mapillary-ის დამალვა</string>
-    <string name="quick_action_mapillary_show">Mapillary-ის ჩვენება</string>
     <string name="shared_string_delete_all_q">წავშალოთ ყველა\?</string>
     <string name="screen_control">ეკრანის კონტროლი</string>
     <string name="turn_screen_on_navigation_instructions">ნავიგაციის ინსტრუქციები</string>
@@ -2287,9 +2274,6 @@
     <string name="route_start_point">საწყისი წერტილი</string>
     <string name="profile_import">პროფილის იმპორტი</string>
     <string name="export_profile">პროფილის ექსპორტი</string>
-    <string name="quick_action_show_hide_hillshade">ბორცვების დამალვა/ჩვენება</string>
-    <string name="quick_action_hillshade_hide">ბორცვების დამალვა</string>
-    <string name="quick_action_hillshade_show">ბორცვების ჩვენება</string>
     <string name="shared_string_memory_kb_desc">%1$s კბ</string>
     <string name="shared_string_memory_mb_desc">%1$s მბ</string>
     <string name="shared_string_memory_gb_desc">%1$s გბ</string>
@@ -2365,7 +2349,6 @@
     <string name="how_to_open_wiki_title">როგორ გავხსნათ Wikipedia-ს სტატიები\?</string>
     <string name="welcome_to_open_beta">მოგესალმებით სატესტო ვერსიაში</string>
     <string name="show_arrows_on_the_map">რუკაზე ისრების ჩვენება</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-ჩანაწერების ჩვენება ან დამალვა</string>
     <string name="search_hint">აკრიფეთ ქალაქის სახელი ან მისამართი</string>
     <string name="show_something_on_map">%1$s-ის რუკაზე ჩვენება</string>
     <string name="location_on_map">მდებარეობა:
@@ -2540,8 +2523,6 @@
     <string name="plan_a_route">გზის დაგეგმვა</string>
     <string name="search_download_wikipedia_maps">Wikipedia-ის რუკების გადმოწერა</string>
     <string name="change_application_profile">აპის პროფილის შეცვლა</string>
-    <string name="quick_action_transport_hide">საზოგადოებრივი ტრანსპორტის დამალვა</string>
-    <string name="quick_action_transport_show">საზოგადოებრივი ტრანსპორტის ჩვენება</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="download_unsupported_action">მოქმედების შეცდომა %1$s</string>
@@ -2561,9 +2542,6 @@
     <string name="dialogs_and_notifications_title">შეტყობნებები</string>
     <string name="download_map_dialog">რუკის დიალოგის ფანჯარა</string>
     <string name="exported_osmand_profile">OsmAnd-ის პროფილი: %1$s</string>
-    <string name="quick_action_show_hide_contour_lines">კონტურული ხაზების ჩვენება/დამალვა</string>
-    <string name="quick_action_contour_lines_hide">კონტურული ხაზების დამალვა</string>
-    <string name="quick_action_contour_lines_show">კონტურული ხაზების ჩვენება</string>
     <string name="update_all_maps">ყველა რუკის განახლება</string>
     <string name="shared_string_memory_used_kb_desc">გამოყენებულია %1$s კბ</string>
     <string name="shared_string_memory_used_mb_desc">გამოყენებულია %1$s მბ</string>
diff --git a/OsmAnd/res/values-kn/strings.xml b/OsmAnd/res/values-kn/strings.xml
index 9ecd3c89bb..96d53b96cc 100644
--- a/OsmAnd/res/values-kn/strings.xml
+++ b/OsmAnd/res/values-kn/strings.xml
@@ -240,8 +240,6 @@
     <string name="shared_string_add_photos">ಚಿತ್ರಗಳನ್ನು ಸೇರಿಸಿ</string>
     <string name="mapillary">ಮ್ಯಾಪಿಲರಿ</string>
     <string name="nothing_found">ಏನೂ ಸಿಗಲಿಲ್ಲ :(</string>
-    <string name="quick_action_osmbugs_show">ಒಎಸ್ಎಂ ಟಿಪ್ಪಣಿಗಳನ್ನು ತೋರಿಸು</string>
-    <string name="quick_action_osmbugs_hide">ಒಎಸ್ಎಂ ಟಿಪ್ಪಣಿಗಳನ್ನು ಅಡಗಿಸು</string>
     <string name="change_color">ಬಣ್ಣವನ್ನು ಬದಲಿಸು</string>
     <string name="edit_name">ಹೆಸರನ್ನು ಸಂಪಾದಿಸು</string>
     <string name="type_address">ವಿಳಾಸವನ್ನು ಟೈಪಿಸು</string>
@@ -320,13 +318,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">ಸುಸಜ್ಜಿತ ರಸ್ತೆಗಳಿಗೆ ಆದ್ಯತೆ ನೀಡಿ.</string>
     <string name="layer_osm_edits">OSM ಪರಿಶಲನೆಗಳು</string>
     <string name="quick_action_contour_lines_descr">ನಕ್ಷೆಯಲ್ಲಿ ಬಾಹ್ಯರೇಖೆಗಳನ್ನು ತೋರಿಸಲು ಅಥವಾ ಮರೆಮಾಡಲು ಟಾಗಲ್.</string>
-    <string name="quick_action_contour_lines_show">ಬಾಹ್ಯರೇಖೆ ರೇಖೆಗಳನ್ನು ತೋರಿಸಿ</string>
-    <string name="quick_action_contour_lines_hide">ಬಾಹ್ಯರೇಖೆ ರೇಖೆಗಳನ್ನು ಮರೆಮಾಡಿ</string>
-    <string name="quick_action_show_hide_contour_lines">ಬಾಹ್ಯರೇಖೆಗಳನ್ನು ತೋರಿಸಿ / ಮರೆಮಾಡಿ</string>
     <string name="quick_action_hillshade_descr">ನಕ್ಷೆಯಲ್ಲಿ \'ಹಿಲ್ಶೇಡ್\' ಅನ್ನು ತೋರಿಸಲು ಅಥವಾ ಮರೆಮಾಡಲು ಟಾಗಲ್ ಮಾಡಿ.</string>
-    <string name="quick_action_hillshade_show">ಹಿಲ್ಶೇಡ್ ತೋರಿಸು</string>
-    <string name="quick_action_hillshade_hide">ಹಿಲ್ಶೇಡ್ ಅನ್ನು ಮರೆಮಾಡಿ</string>
-    <string name="quick_action_show_hide_hillshade">ಹಿಲ್ಶೇಡ್ ಅನ್ನು ತೋರಿಸಿ / ಮರೆಮಾಡಿ</string>
     <string name="tts_initialization_error">text-to-speech ಎಂಜಿನ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
     <string name="export_profile">ಪ್ರೊಫೈಲನ್ನು ಬೇರೆಡೆಗೆ ರಫ್ತುಮಾಡಿ</string>
     <string name="exported_osmand_profile">OsmAnd ಪ್ರೊಫೈಲ್:%1$s</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index eb1d4b98bc..1a1cc5ffc0 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2048,7 +2048,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="dialog_add_action_title">Pridėti veiksmą</string>
     <string name="quick_actions_delete">Ištrinti veiksmą</string>
     <string name="favorite_empty_place_name">Vieta</string>
-    <string name="quick_action_showhide_poi_title">Rodyti/slėpti LV</string>
     <string name="quick_action_add_category">Pridėti kategoriją</string>
     <string name="quick_action_bug_message">Pranešimas</string>
     <string name="quick_action_map_styles">Žemėlapio stiliai</string>
@@ -2069,9 +2068,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="increase_search_radius">Padidinti paieškos spindulį</string>
     <string name="nothing_found">Nepavyko nieko rasti</string>
     <string name="nothing_found_descr">Pakeiskite paieškos užklausą arba padidinkite paieškos spindulį.</string>
-    <string name="quick_action_showhide_osmbugs_title">Rodyti/slėpti OSM Pastabas</string>
-    <string name="quick_action_osmbugs_show">Rodyti OSM Pastabas</string>
-    <string name="quick_action_osmbugs_hide">Slėpti OSM Pastabas</string>
     <string name="search_favorites">Ieškoti parankiniuose</string>
     <string name="shared_string_plugin">Įskiepis</string>
     <string name="srtm_color_scheme">Spalvų schema</string>
@@ -2141,9 +2137,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="quick_favorites_show_favorites_dialog">Rodyti parankinių dialogą</string>
     <string name="quick_action_interim_dialog">Rodyti tarpinį dialogo langą</string>
     <string name="favorite_autofill_toast_text">" įrašytas į "</string>
-    <string name="quick_action_showhide_favorites_title">Rodyti/slėpti parankinius</string>
-    <string name="quick_action_favorites_show">Rodyti Parankinius</string>
-    <string name="quick_action_favorites_hide">Slėpti Parankinius</string>
     <string name="quick_action_poi_show">Rodyti %1$s</string>
     <string name="quick_action_poi_hide">Slėpti %1$s</string>
     <string name="quick_action_add_navigation">Navigacija</string>
@@ -2620,10 +2613,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="time_of_day">Dienos metas</string>
     <string name="routeInfo_road_types_name">Kelių tipai</string>
     <string name="show_more">Rodyti daugiau</string>
-    <string name="quick_action_show_hide_gpx_tracks">Rodyti/slėpti GPX pėdsakus</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Paspaudus šį mygtuką žemėlapyje parodomi arba paslepiami GPX pėdsakai</string>
-    <string name="quick_action_gpx_tracks_hide">Slėpti GPX pėdsakus</string>
-    <string name="quick_action_gpx_tracks_show">Rodyti GPX pėdsakus</string>
     <string name="add_destination_query">Prašome iš pradžių pridėti tikslą</string>
     <string name="previous_route">Ankstesnis maršrutas</string>
     <string name="add_home">Pridėti namus</string>
@@ -2730,9 +2720,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="shared_string_restore">Atkurti</string>
     <string name="search_street">Ieškoti gatvės</string>
     <string name="measure_distance_item">Matuoti atstumą</string>
-    <string name="quick_action_show_hide_transport">Rodyti/paslėpti viešąjį transportą</string>
-    <string name="quick_action_transport_hide">Paslėpti viešąjį transportą</string>
-    <string name="quick_action_transport_show">Rodyti viešąjį transportą</string>
     <string name="shared_string_add_profile">Pridėti profilį</string>
     <string name="unsupported_type_error">Nepalaikomas tipas</string>
     <string name="turn_screen_on_power_button">Įjungimo/išjungimo mygtukas</string>
@@ -2745,7 +2732,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="shared_string_uninstall">Išinstaliuoti</string>
     <string name="shared_string_night_map">Naktinis žemėlapis</string>
     <string name="shared_string_meters">metrai</string>
-    <string name="quick_action_mapillary_show">Rodyti Mapillary</string>
     <string name="routing_attr_length_name">Ilgio limitas</string>
     <string name="shared_string_bearing">Guolis</string>
     <string name="item_deleted">%1$s ištrinta</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 7120ce1b02..27ad892e50 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -2072,10 +2072,6 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="favorite_empty_place_name">Vieta</string>
     <string name="quick_action_showhide_favorites_descr">Spiežot darbības pogu, tiks rādīti vai slēpti favorīti.</string>
     <string name="quick_action_showhide_poi_descr">Spiežot darbības pogu, tiks rādīti vai slēpti POI.</string>
-    <string name="quick_action_showhide_favorites_title">Rādīt/nerādīt izlasi</string>
-    <string name="quick_action_favorites_show">Rādīt favorītus</string>
-    <string name="quick_action_favorites_hide">Nerādīt izlasi</string>
-    <string name="quick_action_showhide_poi_title">Rādīt/slēpt POI</string>
     <string name="quick_action_poi_show">Rādīt %1$s</string>
     <string name="quick_action_poi_hide">Paslēpt %1$s</string>
     <string name="quick_action_add_category">Pievienot kategoriju</string>
@@ -2170,8 +2166,6 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="relief_smoothness_factor_descr">Ieteicamais reljefs: līdzens vai kalnains.</string>
     <string name="shared_string_slope">Slīpums</string>
     <string name="lang_ber">Berberu</string>
-    <string name="quick_action_osmbugs_show">Rādīt OSM piezīmes</string>
-    <string name="quick_action_osmbugs_hide">Nerādīt OSM piezīmes</string>
     <string name="quick_action_showhide_osmbugs_descr">Nospiežot darbības pogu, tiek rādītas vai slēptas OEM piezīmes uz kartes.</string>
     <string name="sorted_by_distance">Sakārtots pēc distances</string>
     <string name="search_favorites">Meklēt Izlasē</string>
@@ -2202,7 +2196,6 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="increase_search_radius">Paplašināt meklēšanas rādiusu</string>
     <string name="nothing_found">Neko neatrada</string>
     <string name="nothing_found_descr">Meklējiet pēc cita vārda vai palieliniet meklēšanas rādiusu.</string>
-    <string name="quick_action_showhide_osmbugs_title">Rādīt/nerādīt OSM piezīmes</string>
     <string name="routing_attr_allow_private_description">Atļaut piekļūšanu privātajām teritorijām.</string>
     <string name="animate_my_location_desc">Maršruta gaitā iespējot kartes pagriešanas animāciju no manas atrašanās vietas.</string>
     <string name="quick_action_auto_zoom_desc">Ieslēdz vai izslēdz automātisko tālummaiņu, atkarībā no kustības ātruma.</string>
@@ -2670,10 +2663,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="step_by_step">Soli pa solim</string>
     <string name="exit_at">Iziet pie</string>
     <string name="sit_on_the_stop">Soliņš pieturā</string>
-    <string name="quick_action_show_hide_gpx_tracks">Rādīt/Slēpt GPX trekus</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Nospiežot šo pogu, tiek parādīti vai slēpti izvēlētie GPX treki uz kartes</string>
-    <string name="quick_action_gpx_tracks_hide">Paslēpt GPX trekus</string>
-    <string name="quick_action_gpx_tracks_show">Parādīt GPX trekus</string>
     <string name="add_destination_query">Vispirms pievienojiet galapunktu</string>
     <string name="use_osm_live_public_transport_description">Iespējot sabiedrisko transportu OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live sabiedriskais transports</string>
diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml
index 9b57d104e0..e4d1f3be78 100644
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@@ -1695,9 +1695,6 @@
     <string name="restart_search">"വീണ്ടും തെരയുക "</string>
     <string name="increase_search_radius">"തെരച്ചില്‍ വൃത്തം വലുതാക്കുക "</string>
     <string name="nothing_found">"ഒന്നും കണ്ടെത്താനായില്ല "</string>
-    <string name="quick_action_showhide_osmbugs_title">"ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കുക/കാണിക്കാതിരിക്കുക "</string>
-    <string name="quick_action_osmbugs_show">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കുക</string>
-    <string name="quick_action_osmbugs_hide">"ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കാതിരിക്കുക "</string>
     <string name="quick_action_showhide_osmbugs_descr">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണാന്‍/കാണാതിരിക്കാന്‍ ഈ ആക്ഷന്‍ ബട്ടണ്‍ അമത്തുക</string>
     <string name="sorted_by_distance">"ദൂരക്രമത്തിലടുക്കുക "</string>
     <string name="search_favorites">"താല്‍പര്യമുള്ളവയില്‍ തെരയുക "</string>
@@ -2343,10 +2340,6 @@
     <string name="favorite_empty_place_name">സ്ഥലം</string>
     <string name="quick_action_duplicates">"അതിവേഗ പ്രവൃത്തിയുടെ നാമം  ഉപയോഗത്തിലുണ്ട്, ഡ്യൂപ്ലിക്കേഷൻ ഒഴിവാക്കുന്നതിന്  %1$s  എന്നാക്കി മാറ്റി."</string>
     <string name="quick_action_duplicate">ദ്രുത പ്രവർത്തനത്തിന്റെ പേര് ഒന്നിലധികം പകര്‍പ്പിലുണ്ട്</string>
-    <string name="quick_action_showhide_favorites_title">പ്രിയപ്പെട്ടവ കാണിക്കുക / മറയ്ക്കുക</string>
-    <string name="quick_action_favorites_show">പ്രിയപ്പെട്ടവ കാണിക്കുക</string>
-    <string name="quick_action_favorites_hide">പ്രിയങ്കരങ്ങൾ മറയ്ക്കുക</string>
-    <string name="quick_action_showhide_poi_title">POI കാണിക്കുക / മറയ്ക്കുക</string>
     <string name="quick_action_poi_show">%1$s കാണിക്കുക</string>
     <string name="quick_action_poi_hide">%1$s മറയ്ക്കുക</string>
     <string name="quick_action_add_category">ഒരു വിഭാഗം ചേർക്കുക</string>
@@ -2650,10 +2643,7 @@
     <string name="by_transport_type">%1$s-ല്‍</string>
     <string name="exit_at">പുറത്തേക്ക് എത്തുക</string>
     <string name="sit_on_the_stop">സ്റ്റോപ്പിൽ നിന്ന് കയറുക</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX ട്രാക്കുകൾ കാണിക്കുക / മറയ്ക്കുക</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">"ഈ  ബട്ടണ്‍ തെരഞ്ഞെടുത്ത GPX ട്രാക്കുകൾ മാപ്പില്‍ കാണിക്കാന്‍ /മറയ്ക്കാന്‍ ഉപയോഗിക്കാം"</string>
-    <string name="quick_action_gpx_tracks_hide">GPX ട്രാക്കുകൾ മറയ്ക്കുക</string>
-    <string name="quick_action_gpx_tracks_show">GPX ട്രാക്കുകൾ കാണിക്കുക</string>
     <string name="add_destination_query">ആദ്യം ലക്ഷ്യസ്ഥാനം ചേർക്കുക</string>
     <string name="use_osm_live_public_transport_description">"OsmAnd ലൈവ് മാറ്റങ്ങൾക്കായി പൊതു ഗതാഗത സംവിധാനത്തെ  പ്രാപ്തമാക്കുക."</string>
     <string name="use_osm_live_public_transport">"ഓഎസ്എംആന്റ്  ലൈവ് പൊതു ഗതാഗതം"</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 5d0a58d52d..5324099e36 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1969,12 +1969,8 @@
     <string name="quick_action_add_navigation">Navigering</string>
     <string name="quick_action_add_configure_map">Kartinnstilling</string>
     <string name="quick_action_add_category">Legg til en kategori</string>
-    <string name="quick_action_favorites_hide">Skjul favoritter</string>
-    <string name="quick_action_showhide_poi_title">Vis/skjul interessepunkt</string>
     <string name="quick_action_poi_show">Vis %1$s</string>
     <string name="quick_action_poi_hide">Skjul %1$s</string>
-    <string name="quick_action_favorites_show">Vis favoritter</string>
-    <string name="quick_action_showhide_favorites_title">Vis/skjul favoritter</string>
     <string name="favorite_empty_place_name">Sted</string>
     <string name="quick_action_add_favorite">Legg til favoritt</string>
     <string name="quick_action_navigation_voice">Tale på/av</string>
@@ -2132,9 +2128,6 @@
     <string name="mapillary_menu_filter_description">Filtrer bilder etter innsender, dato eller type. Kun aktivt på nærgående forstørrelsesnivå.</string>
     <string name="improve_coverage_install_mapillary_desc">Installer Mapillary for å legge til bilder i denne kartposisjonen.</string>
     <string name="plugin_mapillary_descr">Foto på gatenivå for alle. Oppdag plasser, samarbeid, fang inn verden.</string>
-    <string name="quick_action_showhide_osmbugs_title">Vis/skjul OSM-notater</string>
-    <string name="quick_action_osmbugs_show">Vis OSM-notater</string>
-    <string name="quick_action_osmbugs_hide">Skjul OSM-notater</string>
     <string name="quick_action_showhide_osmbugs_descr">Knapp til å vise eller skjule OSM-notater på kartet.</string>
     <string name="sea_depth_thanks">Takk for at du kjøpte \'Havdybdekonturer\'</string>
     <string name="index_item_depth_contours_osmand_ext">Havdybdekonturer</string>
@@ -2852,10 +2845,7 @@
     <string name="routeInfo_road_types_name">Veityper</string>
     <string name="exit_at">Gå av på</string>
     <string name="sit_on_the_stop">Sitt på stoppet</string>
-    <string name="quick_action_show_hide_gpx_tracks">Vis/skjul spor</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Knapp for å vise eller skjule valgte spor på kartet.</string>
-    <string name="quick_action_gpx_tracks_hide">Skjul spor</string>
-    <string name="quick_action_gpx_tracks_show">Vis spor</string>
     <string name="use_osm_live_public_transport_description">Skru på offentlig transport i OsmAnd Live-endringer.</string>
     <string name="use_osm_live_public_transport">Offentlig transport i OsmAnd Live</string>
     <string name="transfers_size">%1$d overføringer</string>
@@ -3162,13 +3152,7 @@
     <string name="update_all_maps_q">Er du sikker på at du vil oppdatere alle (%1$d) kart\?</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Foretrekk veier uten fast dekke</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Foretrekk veier uten fast dekke framfor med fast dekke for ruting.</string>
-    <string name="quick_action_contour_lines_show">Vis koter</string>
-    <string name="quick_action_contour_lines_hide">Skjul koter</string>
-    <string name="quick_action_show_hide_contour_lines">Vis/skjul koter</string>
     <string name="quick_action_hillshade_descr">En knapp for å vise eller skjule relieffskygger på kartet.</string>
-    <string name="quick_action_hillshade_show">Vis relieffskygge</string>
-    <string name="quick_action_hillshade_hide">Skjul relieffskygge</string>
-    <string name="quick_action_show_hide_hillshade">Vis/skjul relieffskygge</string>
     <string name="tts_initialization_error">Kan ikke starte tekst-til-tale-motor.</string>
     <string name="simulate_your_location_gpx_descr">Simuler posisjonen din ved bruk av et innspilt GPX-spor.</string>
     <string name="exported_osmand_profile">OsmAnd-profil: %1$s</string>
@@ -3393,9 +3377,6 @@
     <string name="open_settings">Åpne innstillinger</string>
     <string name="shared_string_terrain">Terreng</string>
     <string name="n_items_of_z">%1$s av %2$s</string>
-    <string name="quick_action_show_hide_terrain">Vis eller skjul terreng</string>
-    <string name="quick_action_terrain_hide">Skjul terreng</string>
-    <string name="quick_action_terrain_show">Vis terreng</string>
     <string name="delete_description">Slett beskrivelse</string>
     <string name="add_description">Legg til beskrivelse</string>
     <string name="select_group">Velg gruppe</string>
@@ -3451,11 +3432,8 @@
     <string name="measure_distance_item">Mål avstand</string>
     <string name="travel_item">Reising (Wikivoyage og Wikipedia)</string>
     <string name="navigation_profiles_item">Navigasjonsprofiler</string>
-    <string name="quick_action_transport_hide">Skjul offentlig transport</string>
-    <string name="quick_action_transport_show">Vis offentlig transport</string>
     <string name="back_to_editing">Tilbake til redigering</string>
     <string name="create_edit_poi">Opprett eller rediger interessepunkt</string>
-    <string name="quick_action_show_hide_transport">Vis eller skjul offentlig transport</string>
     <string name="shared_string_add_profile">Legg til profil</string>
     <string name="quick_action_transport_descr">Knapp for vising eller skjuling av offentlig transport på kartet.</string>
     <string name="routing_profile_direct_to">Direkte-til-punkt</string>
@@ -3582,9 +3560,6 @@
     <string name="vessel_height_warning">Du kan sette fartøyhøyde for å unngå lave broer. Hvis broen endrer høyde, brukes høyden i åpen tilstand.</string>
     <string name="quick_action_remove_next_destination">Slett nærmeste målpunkt</string>
     <string name="please_provide_point_name_error">Navngi punktet</string>
-    <string name="quick_action_showhide_mapillary_title">Vis/skjul Mapillary</string>
-    <string name="quick_action_mapillary_hide">Skjul Mapillary</string>
-    <string name="quick_action_mapillary_show">Vis Mapillary</string>
     <string name="shared_string_bearing">Peiling</string>
     <string name="item_deleted">%1$s slettet</string>
     <string name="use_volume_buttons_as_zoom">Lydstyrkeknapper til forstørring</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 5209bca499..2aed93b35e 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2118,10 +2118,6 @@
     <string name="quick_action_duplicate">Sneltoets-duplicaat</string>
     <string name="quick_action_showhide_favorites_descr">Een schakelknop om Favorieten al dan niet te tonen op de kaart.</string>
     <string name="quick_action_showhide_poi_descr">Een schakelknop om POI’s al dan niet op de kaart te tonen.</string>
-    <string name="quick_action_showhide_favorites_title">Favorieten tonen /verbergen</string>
-    <string name="quick_action_favorites_show">Favorieten tonen</string>
-    <string name="quick_action_favorites_hide">Favorieten verbergen</string>
-    <string name="quick_action_showhide_poi_title">POI’s tonen/verbergen</string>
     <string name="quick_action_poi_show">%1$s tonen</string>
     <string name="quick_action_poi_hide">%1$s verbergen</string>
     <string name="quick_action_add_category">Categorie toevoegen</string>
@@ -2327,9 +2323,6 @@
 \n</string>
     <string name="save_poi_too_many_uppercase">Naam bevat erg veel hoofdletters, toch doorgaan?</string>
     <string name="search_favorites">Zoek in Favorieten</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-opmerkingen tonen of verbergen</string>
-    <string name="quick_action_osmbugs_show">OSM-opmerkingen tonen</string>
-    <string name="quick_action_osmbugs_hide">OSM-opmerkingen verbergen</string>
     <string name="quick_action_showhide_osmbugs_descr">Knop om OSM-opmerkingen al dan niet te tonen.</string>
     <string name="sorted_by_distance">Gesorteerd op afstand</string>
     <string name="private_access_routing_req">Uw bestemming ligt in een gebied dat particulier eigendom is. Wilt u gebruik van particuliere wegen voor deze route toestaan\?</string>
@@ -2859,10 +2852,7 @@
     <string name="shared_string_swap">Wissel</string>
     <string name="show_more">Toon meer</string>
     <string name="tracks_on_map">Getoonde tracks</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX-tracks tonen/verbergen</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Een knop om geselecteerde GPX-tracks al dan niet te tonen op de kaart.</string>
-    <string name="quick_action_gpx_tracks_hide">GPX-tracks verbergen</string>
-    <string name="quick_action_gpx_tracks_show">GPX-tracks tonen</string>
     <string name="add_destination_query">Voeg a.u.b. eerst de Bestemming in</string>
     <string name="previous_route">Vorige route</string>
     <string name="add_home">Thuisadres toevoegen</string>
@@ -3129,13 +3119,7 @@
     <string name="app_mode_utv">Naast elkaar</string>
     <string name="shared_string_maps">Kaarten</string>
     <string name="quick_action_contour_lines_descr">Knop om hoogtelijnen al dan niet te tonen op de kaart.</string>
-    <string name="quick_action_contour_lines_show">Hoogtelijnen tonen</string>
-    <string name="quick_action_contour_lines_hide">Hoogtelijnen verbergen</string>
-    <string name="quick_action_show_hide_contour_lines">Hoogtelijnen tonen/verbergen</string>
     <string name="quick_action_hillshade_descr">Knop om de reliëfschaduw al dan niet te tonen op de kaart.</string>
-    <string name="quick_action_hillshade_show">Reliëfschaduw tonen</string>
-    <string name="quick_action_hillshade_hide">Reliëfschaduw verbergen</string>
-    <string name="quick_action_show_hide_hillshade">Reliëfschaduw tonen/verbergen</string>
     <string name="track_saved">Track opgeslagen</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Toon knooppunt van de fietsroutes</string>
     <string name="contour_lines_and_hillshade">Hoogtelijnen en reliëfschaduw</string>
@@ -3408,9 +3392,6 @@
     <string name="profile_backup_failed">Kan profiel niet back-uppen.</string>
     <string name="n_items_of_z">%1$s van %2$s</string>
     <string name="download_slope_maps">Hellingen</string>
-    <string name="quick_action_show_hide_terrain">Terrein tonen / verbergen</string>
-    <string name="quick_action_terrain_hide">Terrein verbergen</string>
-    <string name="quick_action_terrain_show">Terrein tonen</string>
     <string name="quick_action_terrain_descr">Een knop om de terreinlaag al dan niet te tonen op de kaart.</string>
     <string name="delete_description">Beschrijving verwijderen</string>
     <string name="add_description">Beschrijving toevoegen</string>
@@ -3445,9 +3426,6 @@
     <string name="clear_tiles_warning">Het toepassen van deze wijzigingen wist de cache van deze rasterkaartbron</string>
     <string name="vessel_height_warning_link">Stel de hoogte van het vaartuig in</string>
     <string name="vessel_height_warning">Stel de hoogte van het vaartuig in om lage bruggen te vermijden. Let op, als de brug beweegbaar is, gebruiken we de hoogte in geopende toestand.</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary tonen/verbergen</string>
-    <string name="quick_action_mapillary_hide">Mapillary verbergen</string>
-    <string name="quick_action_mapillary_show">Mapillary tonen</string>
     <string name="quick_action_showhide_mapillary_descr">Een schakelknop om de Mapillary-laag al dan niet te tonen op de kaart.</string>
     <string name="routing_attr_length_description">Geef de toegestane voertuiglengte op voor routes.</string>
     <string name="routing_attr_length_name">Maximale lengte</string>
@@ -3561,9 +3539,6 @@
     <string name="custom_color">Aangepaste kleur</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="search_poi_types">POI-types zoeken</string>
-    <string name="quick_action_transport_hide">OV-informatie verbergen</string>
-    <string name="quick_action_transport_show">OV-informatie tonen</string>
-    <string name="quick_action_show_hide_transport">OV-informatie tonen/verbergen</string>
     <string name="quick_action_transport_descr">Knop om OV-informatie al dan niet te tonen op de kaart.</string>
     <string name="add_edit_favorite">Favoriet toevoegen / bewerken</string>
     <string name="create_edit_poi">POI toevoegen / bewerken</string>
diff --git a/OsmAnd/res/values-oc/strings.xml b/OsmAnd/res/values-oc/strings.xml
index 28149e979a..7e0d9fa6ed 100644
--- a/OsmAnd/res/values-oc/strings.xml
+++ b/OsmAnd/res/values-oc/strings.xml
@@ -136,10 +136,7 @@
     <string name="shared_string_swap">De l\'envèrs</string>
     <string name="show_more">Mostrar mai</string>
     <string name="tracks_on_map">Traças vesedoiras</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mòstrar/ Amagar la traça GPS</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">De quichar sus lo boton mòstra ò amaga la traça GPS sus la mapa</string>
-    <string name="quick_action_gpx_tracks_hide">Amagar la traça GPS</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar la traça GPS</string>
     <string name="add_destination_query">Començatz per indicar una destinacion</string>
     <string name="previous_route">Itinerari precedent</string>
     <string name="add_home">Ajustar lo domicile</string>
@@ -482,13 +479,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferissi lei rotas sensa quitran.</string>
     <string name="layer_osm_edits">Edicions d\'OSM</string>
     <string name="quick_action_contour_lines_descr">Un commutador per mostrar o amagar lei corbas de nivèu sus la mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostrar lei corbas de nivèu</string>
-    <string name="quick_action_contour_lines_hide">Amagar lei corbas de nivèu</string>
-    <string name="quick_action_show_hide_contour_lines">Mòstra/Amaga lei corbas de nivèu</string>
     <string name="quick_action_hillshade_descr">Un commutador per mostrar o amagar l\'ombrejat de relèu de la mapa.</string>
-    <string name="quick_action_hillshade_show">Mostrar l’ombrejat de relèu</string>
-    <string name="quick_action_hillshade_hide">Amagar l’ombrejat de relèu</string>
-    <string name="quick_action_show_hide_hillshade">Mòstra/Amaga l’ombrejat de relèu</string>
     <string name="export_profile">Exportar lo perfiu</string>
     <string name="exported_osmand_profile">Perfiu d\'OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">Lo perfiu \'%1$s\' existís ja. Lo volètz subrescriure\?</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 384f3f73a1..63c8be8d06 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -2134,10 +2134,6 @@
     <string name="quick_action_duplicate">Kopia nazwy szybkiej czynności</string>
     <string name="quick_action_showhide_favorites_descr">Przełącznik wyświetlania lub ukrywania ulubionych miejsc na mapie.</string>
     <string name="quick_action_showhide_poi_descr">Przełącznik wyświetlania lub ukrywania użytecznych miejsc na mapie.</string>
-    <string name="quick_action_showhide_favorites_title">Przełącz widoczność ulubionych</string>
-    <string name="quick_action_favorites_show">Pokaż Ulubione</string>
-    <string name="quick_action_favorites_hide">Ukryj Ulubione</string>
-    <string name="quick_action_showhide_poi_title">Przełącz widoczność użytecznych miejsc</string>
     <string name="quick_action_add_create_items">Tworzenie elementów</string>
     <string name="quick_action_bug_descr">Ta wiadomość uzupełni się w polu komentarza.</string>
     <string name="quick_action_bug_message">Wiadomość</string>
@@ -2282,9 +2278,6 @@
     <string name="hillshade_purchase_header">Zainstaluj wtyczkę \'Poziomice\', aby pokazać stopniowane obszary pionowe.</string>
     <string name="hillshade_menu_download_descr">Pobierz mapę \"Cieniowanie Rzeźby Terenu\", by wyświetlić cieniowanie pionowe.</string>
     <string name="srtm_purchase_header">Kup i zainstaluj wtyczkę \'Poziomice\', aby pokazać stopniowane obszary pionowe.</string>
-    <string name="quick_action_showhide_osmbugs_title">Pokaż lub ukryj uwagi OSM</string>
-    <string name="quick_action_osmbugs_show">Pokaż uwagi OSM</string>
-    <string name="quick_action_osmbugs_hide">Ukryj uwagi OSM</string>
     <string name="osmand_plus_extended_description_part8">Przybliżony zasięg i jakość mapy: 
 \n • Europa Zachodnia: **** 
 \n • Europa Wschodnia: *** 
@@ -2845,10 +2838,7 @@
     <string name="shared_string_swap">Wymień</string>
     <string name="show_more">Wyświetl więcej</string>
     <string name="tracks_on_map">Wyświetlane ślady</string>
-    <string name="quick_action_show_hide_gpx_tracks">Pokaż/Ukryj ślady</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Przycisk do pokazywania lub ukrywania wybranych śladów na mapie.</string>
-    <string name="quick_action_gpx_tracks_hide">Ukryj ślady</string>
-    <string name="quick_action_gpx_tracks_show">Pokaż ślady</string>
     <string name="add_destination_query">Proszę najpierw ustalić cel</string>
     <string name="previous_route">Poprzednia trasa</string>
     <string name="public_transport_warning_descr_blog">Dowiedz się więcej na naszym blogu, jak OsmAnd wyznacza trasy.</string>
@@ -3264,12 +3254,6 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferuje drogi nieutwardzone.</string>
     <string name="layer_osm_edits">Zmiany OSM</string>
     <string name="quick_action_contour_lines_descr">Przełącza wyświetlenie poziomic na mapie.</string>
-    <string name="quick_action_contour_lines_show">Wyświetl poziomice</string>
-    <string name="quick_action_contour_lines_hide">Ukryj poziomice</string>
-    <string name="quick_action_show_hide_contour_lines">Przełącz widoczność poziomic</string>
-    <string name="quick_action_hillshade_show">Wyświetl cieniowanie terenu</string>
-    <string name="quick_action_hillshade_hide">Ukryj cieniowanie terenu</string>
-    <string name="quick_action_show_hide_hillshade">Przełącz widoczność cieniowania terenu</string>
     <string name="quick_action_hillshade_descr">Przycisk do pokazywania lub ukrywania cieniowania terenu na mapie.</string>
     <string name="tts_initialization_error">Nie można uruchomić mechanizmu zamiany tekstu na mowę.</string>
     <string name="shared_preference">Wspólne</string>
@@ -3484,9 +3468,6 @@
     <string name="add_description">Dodaj opis</string>
     <string name="delete_description">Usuń opis</string>
     <string name="quick_action_terrain_descr">Przycisk do wyświetlania lub ukrywania warstwy terenu na mapie.</string>
-    <string name="quick_action_terrain_show">Pokaż teren</string>
-    <string name="quick_action_terrain_hide">Ukryj teren</string>
-    <string name="quick_action_show_hide_terrain">Pokaż lub ukryj teren</string>
     <string name="download_slope_maps">Nachylenie</string>
     <string name="terrain_empty_state_text">Włącz, aby wyświetlić cieniowanie wzniesień lub stoków. Możesz przeczytać więcej o tego rodzaju mapach na naszej stronie.</string>
     <string name="shared_string_legend">Legenda</string>
@@ -3611,9 +3592,6 @@
 \n
 \n</string>
     <string name="back_to_editing">Powrót do edycji</string>
-    <string name="quick_action_transport_hide">Ukryj transport publiczny</string>
-    <string name="quick_action_transport_show">Pokaż transport publiczny</string>
-    <string name="quick_action_show_hide_transport">Pokaż lub ukryj transport publiczny</string>
     <string name="create_edit_poi">Utwórz lub edytuj użyteczne miejsce</string>
     <string name="add_edit_favorite">Dodaj lub edytuj ulubione miejsce</string>
     <string name="quick_action_switch_profile_descr">Przycisk akcji przełącza między wybranymi profilami.</string>
@@ -3665,9 +3643,6 @@
     <string name="vessel_height_limit_description">Ustaw wysokość statku, by unikać niskich mostów. Uwaga: dla mostów zwodzonych liczymy wysokość podniesionego mostu.</string>
     <string name="vessel_height_warning_link">Ustaw wysokość statku</string>
     <string name="vessel_width_limit_description">Ustaw szerokość statku, by unikać wąskich mostów</string>
-    <string name="quick_action_showhide_mapillary_title">Pokaż/ukryj Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ukryj Mapillary</string>
-    <string name="quick_action_mapillary_show">Pokaż Mapillary</string>
     <string name="width_limit_description">Wprowadź szerokość pojazdu, niektóre restrykcje dróg mogą dotyczyć szerokich pojazdów.</string>
     <string name="height_limit_description">Wprowadź wysokość pojazdu, niektóre restrykcje dróg mogą dotyczyć wysokich pojazdów.</string>
     <string name="weight_limit_description">Wprowadź wagę pojazdu, niektóre restrykcje dróg mogą dotyczyć ciężkich pojazdów.</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 7a21af4cd6..c142233a7a 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2049,9 +2049,6 @@
     <string name="increase_search_radius">Aumentar o raio de busca</string>
     <string name="nothing_found">Nada encontrado</string>
     <string name="nothing_found_descr">Modifique o texto da pesquisa ou aumente o raio de busca.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar ou ocultar notas do OSM</string>
-    <string name="quick_action_osmbugs_show">Mostrar Anotações do OSM</string>
-    <string name="quick_action_osmbugs_hide">Ocultar notas OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botão para mostrar ou ocultar notas do OSM no mapa.</string>
     <string name="sorted_by_distance">Classificado por distância</string>
     <string name="search_favorites">Pesquisar Favoritos</string>
@@ -2457,10 +2454,6 @@
     <string name="quick_action_duplicate">Nome de ação rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Uma alternância para mostrar ou ocultar os pontos Favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Alternar para mostrar ou ocultar POIs no mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar/ocultar favoritos</string>
-    <string name="quick_action_favorites_show">Mostrar Favoritos</string>
-    <string name="quick_action_favorites_hide">Ocultar favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar/ocultar POI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Adicionar uma categoria</string>
@@ -2841,10 +2834,7 @@
     <string name="routeInfo_road_types_name">Tipos de estrada</string>
     <string name="exit_at">Desembarque em</string>
     <string name="sit_on_the_stop">Embarque na parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trilhas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar as trilhas selecionadas no mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trilhas</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trilhas</string>
     <string name="use_osm_live_public_transport_description">Habilitar o transporte público para alterações do OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público OsmAnd Live</string>
     <string name="rendering_attr_surface_unpaved_name">Não pavimentado</string>
@@ -3257,13 +3247,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefira não pavimentada sobre estradas pavimentadas para o roteamento.</string>
     <string name="layer_osm_edits">Edições OSM</string>
     <string name="quick_action_contour_lines_descr">Botão que mostra ou oculta linhas de contorno no mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostrar curvas de nível</string>
-    <string name="quick_action_contour_lines_hide">Ocultar linhas de contorno</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar/ocultar linhas de contorno</string>
     <string name="quick_action_hillshade_descr">Um botão para mostrar ou ocultar sombras de relevo.</string>
-    <string name="quick_action_hillshade_show">Mostrar sombras de relevo</string>
-    <string name="quick_action_hillshade_hide">Ocultar sombras de relevo</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar/ocultar sombras de relevo</string>
     <string name="tts_initialization_error">Não é possível iniciar o mecanismo de conversão de texto em fala.</string>
     <string name="simulate_your_location_gpx_descr">Simule sua posição usando um rasteador GPX gravada.</string>
     <string name="export_profile">Exportar perfil</string>
@@ -3489,9 +3473,6 @@
     <string name="shared_string_hillshade">Sombras de relevo</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Encostas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar ou ocultar terreno</string>
-    <string name="quick_action_terrain_hide">Ocultar terreno</string>
-    <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Um botão para mostrar ou ocultar a camada do terreno no mapa.</string>
     <string name="delete_description">Excluir descrição</string>
     <string name="add_description">Adicionar descrição</string>
@@ -3604,9 +3585,6 @@
 \n
 \n</string>
     <string name="additional_actions_descr">Você pode acessar essas ações tocando no botão “%1$s”.</string>
-    <string name="quick_action_transport_hide">Ocultar transporte público</string>
-    <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar ou ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botão que mostra ou oculta o transporte público no mapa.</string>
     <string name="create_edit_poi">Criar ou editar POI</string>
     <string name="parking_positions">Posições de estacionamento</string>
@@ -3675,9 +3653,6 @@
     <string name="vessel_height_warning">Você pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="vessel_height_limit_description">Defina a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="vessel_width_limit_description">Defina a largura da embarcação para evitar pontes estreitas</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
-    <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Uma alternância para mostrar ou ocultar a camada Mapillary no mapa.</string>
     <string name="uninstall_speed_cameras">Desinstalar radares de velocidade</string>
     <string name="shared_string_legal">Legal</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index b5ddfb1f86..4eafe977d0 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1911,9 +1911,6 @@
     <string name="increase_search_radius">Aumentar raio de pesquisa</string>
     <string name="nothing_found">Nada encontrado</string>
     <string name="nothing_found_descr">Altere a pesquisa ou aumente o raio dela.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar ou ocultar anotações do OSM</string>
-    <string name="quick_action_osmbugs_show">Mostrar anotações OSM</string>
-    <string name="quick_action_osmbugs_hide">Ocultar anotações do OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botão para mostrar ou ocultar anotações OSM no mapa.</string>
     <string name="sorted_by_distance">Ordenar por distância</string>
     <string name="search_favorites">Pesquisar em Favoritos</string>
@@ -2725,10 +2722,6 @@
     <string name="quick_action_duplicate">Nome de ação rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Uma alternância para mostrar ou ocultar os pontos favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Uma alternância para mostrar ou ocultar PIs no mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar/esconder favoritos</string>
-    <string name="quick_action_favorites_show">Mostrar Favoritos</string>
-    <string name="quick_action_favorites_hide">Esconder favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar/esconder POI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Esconder %1$s</string>
     <string name="quick_action_add_category">Adicionar uma categoria</string>
@@ -2894,9 +2887,7 @@
     <string name="shared_string_swap">Trocar</string>
     <string name="show_more">Mostrar mais</string>
     <string name="tracks_on_map">Trilhos mostrados</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trilhos</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar trilhos selecionados no mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trilhos</string>
     <string name="routing_attr_avoid_tram_name">Sem elétricos</string>
     <string name="routing_attr_avoid_tram_description">Evita elétricos</string>
     <string name="routing_attr_avoid_bus_name">Sem autocarros</string>
@@ -2913,7 +2904,6 @@
     <string name="rendering_attr_surface_sett_name">Paralelos</string>
     <string name="rendering_attr_surface_pebblestone_name">Seixos</string>
     <string name="rendering_attr_highway_class_bridleway_name">Caminho para cavaleiros</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trilhos</string>
     <string name="add_destination_query">Por favor defina primeiro o destino</string>
     <string name="previous_route">Rota anterior</string>
     <string name="add_home">Adicionar casa</string>
@@ -3284,13 +3274,7 @@
     <string name="profile_appearance">Aspeto do perfil</string>
     <string name="layer_osm_edits">Edições OSM</string>
     <string name="quick_action_contour_lines_descr">Botão que mostra ou oculta curvas de nível no mapa.</string>
-    <string name="quick_action_contour_lines_show">Mostrar curvas de nível</string>
-    <string name="quick_action_contour_lines_hide">Ocultar curvas de nível</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar/ocultar curvas de nível</string>
     <string name="quick_action_hillshade_descr">Um botão para mostrar ou ocultar sombras de relevo.</string>
-    <string name="quick_action_hillshade_show">Mostrar sombras de relevo</string>
-    <string name="quick_action_hillshade_hide">Ocultar sombras de relevo</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar/ocultar sombras de relevo</string>
     <string name="tts_initialization_error">Não é possível iniciar o mecanismo de conversão de texto em fala.</string>
     <string name="simulate_your_location_gpx_descr">Simule a sua posição usando um caminho GPX gravado.</string>
     <string name="export_profile">Exportar o perfil</string>
@@ -3345,9 +3329,6 @@
     <string name="shared_string_hillshade">Sombras de relevo</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pistas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar ou ocultar terrenos</string>
-    <string name="quick_action_terrain_hide">Ocultar terreno</string>
-    <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Um botão para mostrar ou esconder a camada do terreno no mapa.</string>
     <string name="delete_description">Apagar descrição</string>
     <string name="add_description">Adicionar descrição</string>
@@ -3591,9 +3572,6 @@
     <string name="lang_lmo">Lombardo</string>
     <string name="custom_color">Cor customizada</string>
     <string name="search_poi_types_descr">Combinar categorias de POI de categorias diferentes. Toque em trocar para selecionar tudo, toque no lado esquerdo para seleção da categoria.</string>
-    <string name="quick_action_transport_hide">Ocultar o transporte público</string>
-    <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar ou ocultar transportes públicos</string>
     <string name="quick_action_transport_descr">Botão que mostra ou oculta o transporte público no mapa.</string>
     <string name="create_edit_poi">Criar ou editar um POI</string>
     <string name="parking_positions">Posições de estacionamento</string>
@@ -3658,7 +3636,6 @@
     <string name="app_mode_go_cart">Go-cart</string>
     <string name="speed_cameras_alert">Os alertas de radares de velocidade em alguns países são proibidos por lei.</string>
     <string name="keep_active">Manter ativo</string>
-    <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
     <string name="please_provide_point_name_error">Forneça um nome para o ponto</string>
     <string name="clear_tiles_warning">A aplicação dessas alterações limpará os dados em cache dessa origem de bloco</string>
     <string name="speed_cameras_removed_descr">Este aparelho não possui câmeras de velocidade.</string>
@@ -3681,7 +3658,6 @@
     <string name="item_deleted">%1$s apagado</string>
     <string name="quick_action_showhide_mapillary_descr">Uma alternância para mostrar ou ocultar a camada Mapillary no mapa.</string>
     <string name="vessel_height_warning_link">Definir altura da embarcação</string>
-    <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="app_mode_enduro_motorcycle">Motocicleta enduro</string>
     <string name="app_mode_inline_skates">Patins em linha</string>
     <string name="turn_screen_on_power_button_disabled">Desativado. Requer \'manter o ecrã ligadp\' em \'tempo limite após a ativação\'.</string>
@@ -3712,7 +3688,6 @@
     <string name="vessel_height_warning">Pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="app_mode_wheelchair_forward">Cadeira de rodas para a frente</string>
     <string name="use_volume_buttons_as_zoom_descr">Controlar o nível de ampliação do mapa pelos botões de volume do aparelho.</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
     <string name="uninstall_speed_cameras">Desinstalar radares de velocidade</string>
     <string name="osm_edit_closed_note">Anotaçaõ OSM fechada</string>
     <string name="shared_string_uninstall_and_restart">Desinstalar e reiniciar</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 22bec3c3c9..c6f961eb7c 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1803,9 +1803,6 @@
     <string name="increase_search_radius">Măriți aria de căutare</string>
     <string name="nothing_found">Nimic găsit</string>
     <string name="nothing_found_descr">Modifică criteriile de căutare sau mărește aria de căutare.</string>
-    <string name="quick_action_showhide_osmbugs_title">Comutare note OSM</string>
-    <string name="quick_action_osmbugs_show">Arată notele OSM</string>
-    <string name="quick_action_osmbugs_hide">Ascunde notele OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Atingând acest buton de acțiune, se afișează sau se ascund notele OSM de pe hartă.</string>
     <string name="sorted_by_distance">Sortat după distanță</string>
     <string name="search_favorites">Caută Favorite</string>
@@ -2204,9 +2201,6 @@
     <string name="shared_string_swap">Schimbați</string>
     <string name="show_more">Afișați mai multe</string>
     <string name="tracks_on_map">Trasee afișate</string>
-    <string name="quick_action_show_hide_gpx_tracks">Afișați/Ascundeți traseele GPX</string>
-    <string name="quick_action_gpx_tracks_hide">Ascundeți traseele GPX</string>
-    <string name="quick_action_gpx_tracks_show">Afișați traseele GPX</string>
     <string name="add_destination_query">Selectați destinația mai întâi</string>
     <string name="previous_route">Ruta anterioară</string>
     <string name="add_home">Adăugați acasă</string>
@@ -2381,13 +2375,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefer drumurile nepavate.</string>
     <string name="layer_osm_edits">Editare OSM</string>
     <string name="quick_action_contour_lines_descr">Comută pentru a afișa sau ascunde liniile de contur pe hartă.</string>
-    <string name="quick_action_contour_lines_show">Afişează conturul liniilor</string>
-    <string name="quick_action_contour_lines_hide">Ascunde conturul liniilor</string>
-    <string name="quick_action_show_hide_contour_lines">Afişează-ascunde conturul liniilor</string>
     <string name="quick_action_hillshade_descr">Comută pentru a arăta sau ascunde umbrele de pe hartă.</string>
-    <string name="quick_action_hillshade_show">Arata si umbrele</string>
-    <string name="quick_action_hillshade_hide">Ascunde afisarea umbrelor</string>
-    <string name="quick_action_show_hide_hillshade">Afişează/ascunde umbrele</string>
     <string name="tts_initialization_error">Motorul text-to-speech nu porneste.</string>
     <string name="export_profile">Exportă profilul</string>
     <string name="exported_osmand_profile">Profil osmand exportat %1$s</string>
@@ -2825,9 +2813,6 @@
     <string name="shared_string_tones">tone</string>
     <string name="shared_string_meters">metrii</string>
     <string name="add_online_source">Adăugare surse online</string>
-    <string name="quick_action_showhide_mapillary_title">Afișare/ascundere Mapillary</string>
-    <string name="quick_action_mapillary_hide">Ascundere Mapillary</string>
-    <string name="quick_action_mapillary_show">Afișare Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">O comutare pentru a afișa sau ascunde stratul Mapillary pe hartă.</string>
     <string name="routing_attr_length_description">Specificați lungimea vehiculului care trebuie permisă pe rute.</string>
     <string name="routing_attr_length_name">Limită lungime</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index b77fe2b33d..df4223eeb4 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -40,9 +40,6 @@
     <string name="increase_search_radius">Увеличить радиус поиска</string>
     <string name="nothing_found">Ничего не найдено</string>
     <string name="nothing_found_descr">Изменить запрос или увеличить радиус поиска.</string>
-    <string name="quick_action_showhide_osmbugs_title">Показать/скрыть OSM-заметки</string>
-    <string name="quick_action_osmbugs_show">Показать OSM-заметки</string>
-    <string name="quick_action_osmbugs_hide">Скрыть OSM-заметки</string>
     <string name="quick_action_showhide_osmbugs_descr">Переключатель отображения OSM-заметок на карте.</string>
     <string name="sorted_by_distance">Отсортировано по расстоянию</string>
     <string name="search_favorites">Поиск в избранных</string>
@@ -147,7 +144,6 @@
     <string name="quick_action_duplicate">Обнаружен дубликат имени</string>
     <string name="quick_action_showhide_favorites_descr">Переключатель, чтобы показать или скрыть избранные точки на карте.</string>
     <string name="quick_action_showhide_poi_descr">Переключатель, чтобы показать или скрыть POI на карте.</string>
-    <string name="quick_action_showhide_favorites_title">Показать/скрыть избранные</string>
     <string name="quick_action_add_category">Категория</string>
     <string name="quick_action_add_create_items">Действия</string>
     <string name="quick_action_fav_name_descr">Если оставить это поле пустым, то оно будет автоматически заполнено адресом или названием места.</string>
@@ -2258,9 +2254,6 @@
     <string name="dialog_add_action_title">Добавить</string>
     <string name="quick_actions_delete">Удалить действие</string>
     <string name="quick_actions_delete_text">Вы уверены, что хотите удалить действие «%s»\?</string>
-    <string name="quick_action_favorites_show">Показать избранные</string>
-    <string name="quick_action_favorites_hide">Скрыть избранные</string>
-    <string name="quick_action_showhide_poi_title">Показать/скрыть POI</string>
     <string name="quick_action_poi_show">Показать %1$s</string>
     <string name="quick_action_poi_hide">Скрыть %1$s</string>
     <string name="quick_action_add_configure_map">Настройки карты</string>
@@ -2868,9 +2861,6 @@
     <string name="shared_string_swap">Поменять</string>
     <string name="show_more">Показать больше</string>
     <string name="tracks_on_map">Отображаемые треки</string>
-    <string name="quick_action_show_hide_gpx_tracks">Показать/скрыть треки</string>
-    <string name="quick_action_gpx_tracks_hide">Скрыть треки</string>
-    <string name="quick_action_gpx_tracks_show">Показать треки</string>
     <string name="time_of_day">Время суток</string>
     <string name="step_by_step">По шагам</string>
     <string name="routeInfo_road_types_name">Типы дорог</string>
@@ -3228,13 +3218,7 @@
     <string name="apply_preference_to_all_profiles">Вы можете применить это ко всем или только к выбранному профилю.</string>
     <string name="shared_preference">Общий</string>
     <string name="quick_action_contour_lines_descr">Переключатель, показывающая или скрывающая контурные линии на карте.</string>
-    <string name="quick_action_contour_lines_show">Показать контурные линии</string>
-    <string name="quick_action_contour_lines_hide">Скрыть контурные линии</string>
-    <string name="quick_action_show_hide_contour_lines">Показать/скрыть контурные линии</string>
     <string name="quick_action_hillshade_descr">Переключатель, чтобы показать или скрыть затенение рельефа на карте.</string>
-    <string name="quick_action_hillshade_show">Показать затенение рельефа</string>
-    <string name="quick_action_hillshade_hide">Скрыть затенение рельефа</string>
-    <string name="quick_action_show_hide_hillshade">Показать/скрыть затенение рельефа</string>
     <string name="export_profile">Экспорт профиля</string>
     <string name="exported_osmand_profile">Профиль OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">«%1$s» уже существует. Перезаписать\?</string>
@@ -3482,10 +3466,7 @@
     <string name="recalculate_route_in_deviation">Пересчитывать маршрут в случае отклонения</string>
     <string name="n_items_of_z">%1$s из %2$s</string>
     <string name="terrain_slider_description">Настройка минимального и максимального уровней масштабирования, при которых слой будет отображаться.</string>
-    <string name="quick_action_show_hide_terrain">Показать или скрыть рельеф</string>
     <string name="quick_action_terrain_descr">Переключатель, чтобы показать или скрыть слой рельефа местности на карте.</string>
-    <string name="quick_action_terrain_show">Показать рельеф</string>
-    <string name="quick_action_terrain_hide">Скрыть рельеф</string>
     <string name="shared_string_terrain">Рельеф</string>
     <string name="app_mode_ski_touring">Лыжный туризм</string>
     <string name="app_mode_ski_snowmobile">Снегоход</string>
@@ -3609,9 +3590,6 @@
 \n
 \n</string>
     <string name="additional_actions_descr">Функции, доступные при нажатии кнопки «%1$s».</string>
-    <string name="quick_action_transport_hide">Скрыть общественный транспорт</string>
-    <string name="quick_action_transport_show">Показать общественный транспорт</string>
-    <string name="quick_action_show_hide_transport">Показать/скрыть общественный транспорт</string>
     <string name="add_edit_favorite">Добавить или изменить избранное</string>
     <string name="create_edit_poi">Создать или изменить POI</string>
     <string name="back_to_editing">Возврат к редактированию</string>
@@ -3680,9 +3658,6 @@
     <string name="vessel_height_warning">Вы можете указать высоту судна, чтобы избегать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
     <string name="vessel_height_limit_description">Укажите высоту судна, чтобы избежать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
     <string name="vessel_width_limit_description">Укажите ширину судна, чтобы избежать узких мостов</string>
-    <string name="quick_action_showhide_mapillary_title">Показать/скрыть Mapillary</string>
-    <string name="quick_action_mapillary_hide">Скрыть Mapillary</string>
-    <string name="quick_action_mapillary_show">Показать Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Переключатель, чтобы показать или скрыть слой Mapillary на карте.</string>
     <string name="shared_string_legal">Законодательство</string>
     <string name="speed_cameras_legal_descr">В некоторых странах и регионах использование предупреждений о камерах контроля скорости запрещено законом. 
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 0f5d4c3fdb..d00dbd0aab 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2119,10 +2119,6 @@
     <string name="quick_action_interim_dialog">Ammustra una ventana intermèdia</string>
     <string name="quick_action_showhide_favorites_descr">Unu butone pro ammustrare o cuare sos puntos preferidos in sa mapa.</string>
     <string name="quick_action_showhide_poi_descr">Unu butone pro ammustrare o cuare sos PDI in sa mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Ammustra/cua sos preferidos</string>
-    <string name="quick_action_favorites_show">Ammustra sos preferidos</string>
-    <string name="quick_action_favorites_hide">Cua sos preferidos</string>
-    <string name="quick_action_showhide_poi_title">Ammustra/cua sos PDI</string>
     <string name="quick_action_poi_show">Ammustra %1$s</string>
     <string name="quick_action_poi_hide">Cua %1$s</string>
     <string name="quick_action_add_category">Annanghe una categoria</string>
@@ -2389,9 +2385,6 @@
     <string name="srtm_purchase_header">Còmpora e installa s\'estensione \'Curvas de Livellu\' pro ammustrare sas àreas verticales graduadas.</string>
     <string name="search_favorites">Chirca in sos preferidos</string>
     <string name="sorted_by_distance">Ordinados pro distàntzia</string>
-    <string name="quick_action_showhide_osmbugs_title">Ammustra/cua sas notas OSM</string>
-    <string name="quick_action_osmbugs_show">Ammustra sas notas OSM</string>
-    <string name="quick_action_osmbugs_hide">Cua sas notas OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Unu butone pro ammustrare o cuare sas Notas OSM in sa mapa.</string>
     <string name="restart_search">Torra a incumintzare sa chirca</string>
     <string name="increase_search_radius">Ismànnia su raju de chirca</string>
@@ -2844,10 +2837,7 @@
     <string name="routeInfo_road_types_name">Castas de àndalas</string>
     <string name="exit_at">Essi in</string>
     <string name="sit_on_the_stop">Àrtzia in sa firmada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Ammustra/cua sas rastas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Unu butone pro ammustrare o cuare sas rastas ischertadas in sa mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Istichi sas rastas</string>
-    <string name="quick_action_gpx_tracks_show">Ammustra sas rastas</string>
     <string name="use_osm_live_public_transport_description">Abìlita su trasportu pùblicu pro sas modìficas de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Trasportu pùblicu in OsmAnd Live</string>
     <string name="transfers_size">%1$d tramudòngios</string>
@@ -3262,13 +3252,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferi caminos no apamentados a sos caminos pamentados pro s\'àndala.</string>
     <string name="layer_osm_edits">Modìficas de OSM</string>
     <string name="quick_action_contour_lines_descr">Butone chi ammustrat o cuat sas curvas de livellu in sa mapa.</string>
-    <string name="quick_action_contour_lines_show">Ammustra sas curvas de livellu</string>
-    <string name="quick_action_contour_lines_hide">Cua sas curvas de livellu</string>
-    <string name="quick_action_show_hide_contour_lines">Ammustra/cua sas curvas de livellu</string>
     <string name="quick_action_hillshade_descr">Unu butone pro ammustrare o cuare sas umbraduras de sos rilievos in sa mapa.</string>
-    <string name="quick_action_hillshade_show">Ammustra sas umbraduras de sos rilievos</string>
-    <string name="quick_action_hillshade_hide">Cua sas umbraduras de sos rilievos</string>
-    <string name="quick_action_show_hide_hillshade">Ammustra/cua sas umbraduras de sos rilievos</string>
     <string name="tts_initialization_error">Allughidura de su motore de sìntesi vocale fallida.</string>
     <string name="simulate_your_location_gpx_descr">Sìmula sa positzione tua impreende una rasta GPX registrada.</string>
     <string name="export_profile">Esporta su profilu</string>
@@ -3494,9 +3478,6 @@
     <string name="shared_string_hillshade">Umbraduras de sos rilievos</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pistas</string>
-    <string name="quick_action_show_hide_terrain">Ammustra o cua su terrinu</string>
-    <string name="quick_action_terrain_hide">Cua su terrinu</string>
-    <string name="quick_action_terrain_show">Ammustra su terrinu</string>
     <string name="quick_action_terrain_descr">Unu butone pro ammustrare o cuare s\'istratu de su terrinu in sa mapa.</string>
     <string name="delete_description">Iscantzella sa descritzione</string>
     <string name="add_description">Annanghe una descritzione</string>
@@ -3610,9 +3591,6 @@
 \n</string>
     <string name="shared_string_resume">Sighi</string>
     <string name="additional_actions_descr">Podes atzèdere a custas atziones incarchende su butone \"%1$s\".</string>
-    <string name="quick_action_transport_hide">Cua sos trasportos pùblicos</string>
-    <string name="quick_action_transport_show">Ammustra sos trasportos pùblicos</string>
-    <string name="quick_action_show_hide_transport">Ammustra o cua sos trasportos pùblicos</string>
     <string name="quick_action_transport_descr">Butone pro ammustrare o cuare sos trasportos pùblicos in sa mapa.</string>
     <string name="create_edit_poi">Crea o modìfica unu PDI</string>
     <string name="parking_positions">Logos de parchègiu</string>
@@ -3680,9 +3658,6 @@
     <string name="vessel_height_warning">Podes impostare s\'artària de sa barca pro evitare sos pontes bassos. Ammenta·ti chi, si su ponte est mòbile, amus a impreare s\'artària sua de cando est abertu.</string>
     <string name="vessel_height_limit_description">Imposta s\'artària de sa barca pro evitare sos pontes bassos. Ammenta·ti chi, si su ponte est mòbile, amus a impreare s\'artària sua de cando est abertu.</string>
     <string name="vessel_width_limit_description">Imposta sa largària de sa barca pro evitare pontes astrintos</string>
-    <string name="quick_action_showhide_mapillary_title">Ammustra/cua Mapillary</string>
-    <string name="quick_action_mapillary_hide">Cua Mapillary</string>
-    <string name="quick_action_mapillary_show">Ammustra Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Unu butone pro ammustrare o cuare s\'istratu de Mapillary in sa mapa.</string>
     <string name="uninstall_speed_cameras">Disinstalla sos autovelox</string>
     <string name="shared_string_legal">Legale</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 2fd8af51aa..5b2e98d67b 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2124,10 +2124,6 @@
     <string name="quick_action_duplicate">Duplicitný názov rýchlej akcie</string>
     <string name="quick_action_showhide_favorites_descr">Prepínač pre zobrazenie alebo skrytie Obľúbených bodov na mape.</string>
     <string name="quick_action_showhide_poi_descr">Prepínač pre zobrazenie alebo skrytie bodov záujmu na mape.</string>
-    <string name="quick_action_showhide_favorites_title">Zobraziť/skryť Obľúbené body</string>
-    <string name="quick_action_favorites_show">Zobraziť Obľúbené body</string>
-    <string name="quick_action_favorites_hide">Skryť Obľúbené body</string>
-    <string name="quick_action_showhide_poi_title">Zobraziť/skryť body záujmu</string>
     <string name="quick_action_poi_show">Zobraziť %1$s</string>
     <string name="quick_action_poi_hide">Skryť %1$s</string>
     <string name="quick_action_add_category">Pridať kategóriu</string>
@@ -2387,9 +2383,6 @@
     <string name="srtm_menu_download_descr">Stiahnite mapu \"Vrstevnice\" pre tento región.</string>
     <string name="sorted_by_distance">Zoradené podľa vzdialenosti</string>
     <string name="search_favorites">Hľadať v Obľúbených bodoch</string>
-    <string name="quick_action_showhide_osmbugs_title">Zobraziť alebo skryť OSM poznámky</string>
-    <string name="quick_action_osmbugs_show">Zobraziť OSM poznámky</string>
-    <string name="quick_action_osmbugs_hide">Skryť OSM poznámky</string>
     <string name="quick_action_showhide_osmbugs_descr">Tlačidlo pre zobrazenie alebo skrytie OSM poznámok na mape.</string>
     <string name="private_access_routing_req">Váš cieľ je v oblasti so súkromným prístupom. Povoliť vstup na súkromné cesty pre tento výlet\?</string>
     <string name="restart_search">Znovu začať hľadanie</string>
@@ -2844,10 +2837,7 @@
     <string name="routeInfo_road_types_name">Druhy ciest</string>
     <string name="exit_at">Vystúpte na</string>
     <string name="sit_on_the_stop">Nastúpte na zastávke</string>
-    <string name="quick_action_show_hide_gpx_tracks">Zobraziť/skryť stopy</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Tlačidlo pre zobrazenie alebo skrytie zvolených stôp na mape.</string>
-    <string name="quick_action_gpx_tracks_hide">Skryť stopy</string>
-    <string name="quick_action_gpx_tracks_show">Zobraziť stopy</string>
     <string name="transfers_size">%1$d prestup(y)</string>
     <string name="add_start_and_end_points">Pridať východzí a cieľový bod</string>
     <string name="route_add_start_point">Pridať východzí bod</string>
@@ -3272,13 +3262,7 @@
     <string name="clear_confirmation_msg">Vymazať %1$s\?</string>
     <string name="layer_osm_edits">Úpravy OSM</string>
     <string name="quick_action_contour_lines_descr">Tlačidlo pre zobrazenie alebo skrytie vrstevníc na mape.</string>
-    <string name="quick_action_contour_lines_show">Zobraziť vrstevnice</string>
-    <string name="quick_action_contour_lines_hide">Skryť vrstevnice</string>
-    <string name="quick_action_show_hide_contour_lines">Zobraziť/skryť vrstevnice</string>
     <string name="quick_action_hillshade_descr">Tlačidlo pre zobrazenie alebo skrytie tieňovaných svahov na mape.</string>
-    <string name="quick_action_hillshade_show">Zobraziť tieňované svahy</string>
-    <string name="quick_action_hillshade_hide">Skryť tieňované svahy</string>
-    <string name="quick_action_show_hide_hillshade">Zobraziť/skryť tieňované svahy</string>
     <string name="tts_initialization_error">Nepodarilo sa spustiť modul prevodu textu na reč.</string>
     <string name="simulate_your_location_gpx_descr">Simulovať polohu pomocou zaznamenanej stopy GPX.</string>
     <string name="profile_import">Importovať profil</string>
@@ -3492,9 +3476,6 @@
     <string name="recalculate_route_distance_promo">Trasa bude prepočítaná ak vzdialenosť od trasy k aktuálnej polohe je väčšia ako zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
     <string name="download_slope_maps">Sklony svahov</string>
-    <string name="quick_action_show_hide_terrain">Zobraziť alebo skryť terén</string>
-    <string name="quick_action_terrain_hide">Skryť terén</string>
-    <string name="quick_action_terrain_show">Zobraziť terén</string>
     <string name="quick_action_terrain_descr">Tlačidlo pre zobrazenie alebo skrytie vrstvy terénu na mape.</string>
     <string name="delete_description">Vymazať popis</string>
     <string name="add_description">Pridať popis</string>
@@ -3606,9 +3587,6 @@
 \n • Opravy chýb pre jazyky písané sprava doľava
 \n
 \n</string>
-    <string name="quick_action_transport_hide">Skryť verejnú dopravu</string>
-    <string name="quick_action_transport_show">Zobraziť verejnú dopravu</string>
-    <string name="quick_action_show_hide_transport">Zobraziť alebo skryť verejnú dopravu</string>
     <string name="quick_action_transport_descr">Tlačidlo na zobrazenie alebo skrytie verejnej dopravy na mape.</string>
     <string name="create_edit_poi">Vytvoriť alebo upraviť bod záujmu</string>
     <string name="parking_positions">Parkovacie miesta</string>
@@ -3689,9 +3667,6 @@
 \nZvoľte %2$s a všetky údaje o rýchlostných radaroch budú odstránené, až kým nebude OsmAnd znovu preinštalovaný.</string>
     <string name="keep_active">Ponechať aktívne</string>
     <string name="speed_cameras_alert">V niektorých krajinách je varovanie pred rýchlostnými radarmi zakázané zákonom.</string>
-    <string name="quick_action_showhide_mapillary_title">Zobraziť/skryť Mapillary</string>
-    <string name="quick_action_mapillary_hide">Skryť Mapillary</string>
-    <string name="quick_action_mapillary_show">Zobraziť Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Prepínač pre zobrazenie alebo skrytie vrstvy Mapillary na mape.</string>
     <string name="shared_string_bearing">Smerovanie</string>
     <string name="item_deleted">%1$s vymazané</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index e78029cd1b..94ff5eb396 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2095,10 +2095,6 @@
     <string name="quick_actions_delete_text">Ali ste prepričani, da želite izbrisati dejanje »%s«?</string>
     <string name="shared_string_action_name">Ime dejanja</string>
     <string name="favorite_empty_place_name">Mesto</string>
-    <string name="quick_action_showhide_favorites_title">Pokaži/Skrij priljubljene</string>
-    <string name="quick_action_favorites_show">Pokaži priljubljene</string>
-    <string name="quick_action_favorites_hide">Skrij priljubljene</string>
-    <string name="quick_action_showhide_poi_title">Pokaži/Skrij točke POI</string>
     <string name="quick_action_poi_show">Pokaži %1$s</string>
     <string name="quick_action_poi_hide">Skrij %1$s</string>
     <string name="quick_action_add_category">Dodaj kategorijo</string>
@@ -2258,9 +2254,6 @@
     <string name="increase_search_radius">Povečaj območje iskanja</string>
     <string name="nothing_found">Ni zadetkov</string>
     <string name="nothing_found_descr">Poskusite zamenjati iskalni niz ali pa povečajte obseg iskanja.</string>
-    <string name="quick_action_showhide_osmbugs_title">Preklopi vidnost opomb OSM</string>
-    <string name="quick_action_osmbugs_show">Pokaži Opombe OSM</string>
-    <string name="quick_action_osmbugs_hide">Skrij Opombe OSM</string>
     <string name="sorted_by_distance">Razvrščeno po razdalji</string>
     <string name="search_favorites">Iskanje med priljubljenimi</string>
     <string name="shared_string_plugin">Vstavek</string>
@@ -2874,9 +2867,6 @@
     <string name="shared_string_swap">Zamenjaj</string>
     <string name="show_more">Pokaži več</string>
     <string name="tracks_on_map">Prikazane sledi</string>
-    <string name="quick_action_show_hide_gpx_tracks">Pokaži/Skrij sledi GPX</string>
-    <string name="quick_action_gpx_tracks_hide">Skrij sledi GPX</string>
-    <string name="quick_action_gpx_tracks_show">Pokaži sledi GPX</string>
     <string name="add_destination_query">Najprej je treba dodati cilj</string>
     <string name="previous_route">Predhodna pot</string>
     <string name="add_home">Dodaj domači naslov</string>
@@ -3238,10 +3228,7 @@
     <string name="quick_action_remove_next_destination_descr">Trenutna ciljna točka na poti bo izbrisana. Če je ta vaš cilj, bo navigacija zaustavljena.</string>
     <string name="plugin_wikipedia_description">Podrobnosti o zanimivih točkah so na voljo na Wikipediji. Lahko je vaš žepni vodič, ki deluje tudi brez povezave – omogočiti je treba le vstavek Wikipedije in podrobno spoznati svet okoli vas.</string>
     <string name="use_volume_buttons_as_zoom_descr">Omogoči za nadzor približevanja zemljevida z gumbi za glasnost.</string>
-    <string name="quick_action_mapillary_hide">Skrij Mapillary</string>
-    <string name="quick_action_mapillary_show">Prikaži mapillary</string>
     <string name="add_online_source">Dodaj spletni vir</string>
-    <string name="quick_action_showhide_mapillary_title">Prikaži/skrij Mapillary</string>
     <string name="shared_string_uninstall_and_restart">Odstrani in ponovno zaženi</string>
     <string name="use_volume_buttons_as_zoom">Uporabi gumbe za glasnost za približevanje</string>
     <string name="search_download_wikipedia_maps">Prejmi zemljevide Wikipedije</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index a548052f4a..16020da81d 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1245,9 +1245,6 @@
     <string name="increase_search_radius">Повећај област претраге</string>
     <string name="nothing_found">Нема ничег пронађеног</string>
     <string name="nothing_found_descr">Промените претрагу или повећајте област претраге.</string>
-    <string name="quick_action_showhide_osmbugs_title">Приказује или сакрива OSM белешке</string>
-    <string name="quick_action_osmbugs_show">Прикажи белешке ОСМ-а</string>
-    <string name="quick_action_osmbugs_hide">Сакриј белешке ОСМ-а</string>
     <string name="quick_action_showhide_osmbugs_descr">Дугме да прикажите или да сакријете OSM белешке на карти.</string>
     <string name="sorted_by_distance">Разврстано по удаљености</string>
     <string name="search_favorites">Тражи у Омиљеним</string>
@@ -2218,10 +2215,6 @@
     <string name="quick_favorites_show_favorites_dialog">Прикажи дијалог за Омиљене</string>
     <string name="favorite_autofill_toast_text">" сачувано у "</string>
     <string name="favorite_empty_place_name">Место</string>
-    <string name="quick_action_showhide_favorites_title">Прикажи/сакриј Омиљене</string>
-    <string name="quick_action_favorites_show">Прикажи Омиљене</string>
-    <string name="quick_action_favorites_hide">Сакриј Омиљене</string>
-    <string name="quick_action_showhide_poi_title">Прикажи/сакриј тачке од интереса</string>
     <string name="quick_action_poi_show">Прикажи %1$s</string>
     <string name="quick_action_poi_hide">Сакриј %1$s</string>
     <string name="quick_action_add_category">Додај категорију</string>
@@ -2901,10 +2894,7 @@
     <string name="show_more">Прикажи још</string>
     <string name="tracks_on_map">Приказане путање</string>
     <string name="sit_on_the_stop">Укрцавање на стајању</string>
-    <string name="quick_action_show_hide_gpx_tracks">Прикажи/сакриј путање</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Дугме које приказује или сакрива одабране путање са карте.</string>
-    <string name="quick_action_gpx_tracks_hide">Сакриј путање</string>
-    <string name="quick_action_gpx_tracks_show">Прикажи путање</string>
     <string name="use_osm_live_public_transport_description">Омогући јавни превоз на OsmAnd Live изменама.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live јавни превоз</string>
     <string name="rendering_attr_surface_sett_name">Калдрма</string>
@@ -3262,13 +3252,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Преферира неасфалтиране путеве испред асфалтрираних за рутирање.</string>
     <string name="layer_osm_edits">ОСМ измене</string>
     <string name="quick_action_contour_lines_descr">Дугме које приказује или сакрива линије изохипси на карти.</string>
-    <string name="quick_action_contour_lines_show">Прикажи изохипсе</string>
-    <string name="quick_action_contour_lines_hide">Сакриј изохипсе</string>
-    <string name="quick_action_show_hide_contour_lines">Прикажи/сакриј изохипсе</string>
     <string name="quick_action_hillshade_descr">Дугме које приказује или сакрива рељеф на карти.</string>
-    <string name="quick_action_hillshade_show">Прикажи рељеф</string>
-    <string name="quick_action_hillshade_hide">Сакриј рељеф</string>
-    <string name="quick_action_show_hide_hillshade">Прикажи/сакриј рељеф</string>
     <string name="tts_initialization_error">Не могу да покренем мотор за синтетизовање гласа.</string>
     <string name="simulate_your_location_gpx_descr">Симулирајте Вашу позицију користећу снимљену GPX стазу.</string>
     <string name="export_profile">Извези профил</string>
@@ -3467,9 +3451,6 @@
     <string name="restore_all_profile_settings">Поврати све поставке профила\?</string>
     <string name="saving_new_profile">Чувам нови профил</string>
     <string name="profile_backup_failed">Не могу да направим резервну копију профила.</string>
-    <string name="quick_action_show_hide_terrain">Прикажи или сакриј терен</string>
-    <string name="quick_action_terrain_hide">Сакриј терен</string>
-    <string name="quick_action_terrain_show">Прикажи терен</string>
     <string name="quick_action_terrain_descr">Дугме да прикаже или сакрите слој терена на карти.</string>
     <string name="delete_description">Обриши опис</string>
     <string name="add_description">Додај опис</string>
@@ -3508,9 +3489,6 @@
     <string name="osmand_purchases_item">OsmAnd куповине</string>
     <string name="legend_item_description">Упутство за легенду карте.</string>
     <string name="navigation_profiles_item">Профили навођења</string>
-    <string name="quick_action_transport_hide">Сакриј јавни превоз</string>
-    <string name="quick_action_transport_show">Прикажи јавни превоз</string>
-    <string name="quick_action_show_hide_transport">Прикажи или сакриј јавни превоз</string>
     <string name="quick_action_transport_descr">Дугме које приказује или скрива јавни превоз на карти.</string>
     <string name="parking_positions">Паркинг позиције</string>
     <string name="reset_deafult_order">Поврати подразумевани поредак ставки</string>
@@ -3587,9 +3565,6 @@
     <string name="keep_active">Држи активним</string>
     <string name="shared_string_uninstall">Избриши</string>
     <string name="speed_cameras_alert">Упозорења за радаре су законом забрањене у неким државама.</string>
-    <string name="quick_action_showhide_mapillary_title">Прикажи/сакриј Mapillary</string>
-    <string name="quick_action_mapillary_hide">Сакриј Mapillary</string>
-    <string name="quick_action_mapillary_show">Прикажи Mapillary</string>
     <string name="lang_yo">Јоруба</string>
     <string name="lang_war">Варајски</string>
     <string name="lang_tg">Таџички</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index bb3003ee19..f9305301d2 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2025,10 +2025,6 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="quick_action_add_favorite">Lägg till favorit</string>
     <string name="favorite_autofill_toast_text">" har sparats i "</string>
     <string name="favorite_empty_place_name">Plats</string>
-    <string name="quick_action_showhide_favorites_title">Visa/Dölj favoriter</string>
-    <string name="quick_action_favorites_show">Visa favoriter</string>
-    <string name="quick_action_favorites_hide">Dölj favoriter</string>
-    <string name="quick_action_showhide_poi_title">Visa/Dölj POI</string>
     <string name="quick_action_poi_show">Visa %1$s</string>
     <string name="quick_action_poi_hide">Dölj %1$s</string>
     <string name="quick_action_add_category">Lägg till en kategori</string>
@@ -2125,9 +2121,6 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="select_city">Välj stad</string>
     <string name="select_postcode">Välj postnummer</string>
     <string name="quick_action_auto_zoom">Autozoomning på/av</string>
-    <string name="quick_action_showhide_osmbugs_title">Visa/Dölj OSM-anteckningar</string>
-    <string name="quick_action_osmbugs_show">Visa OSM-anteckningar</string>
-    <string name="quick_action_osmbugs_hide">Dölj OSM-anteckningar</string>
     <string name="quick_action_showhide_osmbugs_descr">Ett tryck på denna åtgärdsknapp visar eller döljer OSM-anteckningar på kartan.</string>
     <string name="restart_search">Starta om sökningen</string>
     <string name="increase_search_radius">Utöka sökradien</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 2d2101489a..631aacada7 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -1981,9 +1981,6 @@
     <string name="rendering_value_low_name">Düşük</string>
     <string name="rendering_attr_hideWaterPolygons_description">Su</string>
     <string name="shared_string_action_name">İşlem Adı</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM notlarını göster ya da gizle</string>
-    <string name="quick_action_osmbugs_show">OSM notlarını göster</string>
-    <string name="quick_action_osmbugs_hide">OSM notlarını gizle</string>
     <string name="quick_action_showhide_osmbugs_descr">OSM notlarını haritada göstermek veya gizlemek için bir düğme.</string>
     <string name="sorted_by_distance">Mesafeye göre sıralandı</string>
     <string name="quick_action_btn_tutorial_descr">Düğmeye uzunca basıp sürüklemek, ekrandaki konumunu değiştirir.</string>
@@ -2443,9 +2440,6 @@
     <string name="routeInfo_road_types_name">Yol türleri</string>
     <string name="shared_string_swap">Takas</string>
     <string name="show_more">Daha fazla görüntüle</string>
-    <string name="quick_action_show_hide_gpx_tracks">Yolları göster/gizle</string>
-    <string name="quick_action_gpx_tracks_hide">Yolları Gizle</string>
-    <string name="quick_action_gpx_tracks_show">Yolları Göster</string>
     <string name="add_home">Ev ekle</string>
     <string name="add_work">Iş ekle</string>
     <string name="work_button">İş</string>
@@ -2964,10 +2958,6 @@
     <string name="favorite_autofill_toast_text">" kaydedildi "</string>
     <string name="favorite_empty_place_name">Yer</string>
     <string name="quick_action_duplicate">Hızlı eylem adı yinelenen</string>
-    <string name="quick_action_showhide_favorites_title">Sık Kullanılanları göster/gizle</string>
-    <string name="quick_action_favorites_show">Sık Kullanılanları göster</string>
-    <string name="quick_action_favorites_hide">Sık Kullanılanları gizle</string>
-    <string name="quick_action_showhide_poi_title">POI göster/gizle</string>
     <string name="quick_action_poi_show">%1$s göster</string>
     <string name="quick_action_poi_hide">%1$s gizle</string>
     <string name="quick_action_add_category">Kategori ekle</string>
@@ -3265,13 +3255,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Yönlendirme için asfaltsız yolları asfaltlılara tercih et.</string>
     <string name="layer_osm_edits">OSM düzenlemeleri</string>
     <string name="quick_action_contour_lines_descr">Eş yükselti eğrilerini haritada gösterme veya gizleme düğmesi.</string>
-    <string name="quick_action_contour_lines_show">Eş yükselti eğrilerini göster</string>
-    <string name="quick_action_contour_lines_hide">Eş yükselti eğrilerini gizle</string>
-    <string name="quick_action_show_hide_contour_lines">Eş yükselti eğrilerini göster/gizle</string>
     <string name="quick_action_hillshade_descr">Haritada tepe gölgelerini göstermek veya gizlemek için bir düğme.</string>
-    <string name="quick_action_hillshade_show">Tepe gölgesini göster</string>
-    <string name="quick_action_hillshade_hide">Tepe gölgesini gizle</string>
-    <string name="quick_action_show_hide_hillshade">Tepe gölgesini göster/gizle</string>
     <string name="tts_initialization_error">Metinden konuşmaya motoru başlatılamıyor.</string>
     <string name="simulate_your_location_gpx_descr">Kayıtlı bir GPX yolu kullanarak konumunuzu simüle edin.</string>
     <string name="export_profile">Profili dışa aktar</string>
@@ -3497,9 +3481,6 @@
     <string name="recalculate_route_distance_promo">Güzergahtan geçerli konuma olan mesafe seçilen değerden fazla ise güzergah yeniden hesaplanacaktır.</string>
     <string name="n_items_of_z">%1$s / %2$s</string>
     <string name="download_slope_maps">Yamaçlar</string>
-    <string name="quick_action_show_hide_terrain">Araziyi göster veya gizle</string>
-    <string name="quick_action_terrain_hide">Araziyi gizle</string>
-    <string name="quick_action_terrain_show">Araziyi göster</string>
     <string name="quick_action_terrain_descr">Haritada arazi katmanını göstermek veya gizlemek için bir düğme.</string>
     <string name="delete_description">Açıklamayı sil</string>
     <string name="add_description">Açıklama ekle</string>
@@ -3613,9 +3594,6 @@
 \n</string>
     <string name="shared_string_resume">Devam ettir</string>
     <string name="additional_actions_descr">Bu eylemlere “%1$s” düğmesine dokunarak erişebilirsiniz.</string>
-    <string name="quick_action_transport_hide">Toplu taşıma araçlarını gizle</string>
-    <string name="quick_action_transport_show">Toplu taşıma araçlarını göster</string>
-    <string name="quick_action_show_hide_transport">Toplu taşıma araçlarını göster veya gizle</string>
     <string name="quick_action_transport_descr">Haritada toplu taşıma araçlarını gösteren veya gizleyen düğme.</string>
     <string name="create_edit_poi">POI oluştur veya düzenle</string>
     <string name="parking_positions">Park etme alanları</string>
@@ -3683,9 +3661,6 @@
     <string name="vessel_height_warning">Alçak köprülerden kaçınmak için gemi yüksekliğini ayarlayabilirsiniz. Köprü hareket edebiliyorsa, açık durumdaki yüksekliğini kullanacağımızı unutmayın.</string>
     <string name="vessel_height_limit_description">Alçak köprülerden kaçınmak için gemi yüksekliğini ayarlayın. Köprü hareket edebiliyorsa, açık durumdaki yüksekliğini kullanacağımızı unutmayın.</string>
     <string name="vessel_width_limit_description">Dar köprülerden kaçınmak için gemi genişliğini ayarlayın</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary\'i göster/gizle</string>
-    <string name="quick_action_mapillary_hide">Mapillary\'i gizle</string>
-    <string name="quick_action_mapillary_show">Mapillary\'i göster</string>
     <string name="quick_action_showhide_mapillary_descr">Harita üzerinde Mapillary katmanını göstermek veya gizlemek için bir geçiş.</string>
     <string name="uninstall_speed_cameras">Hız kameralarını kaldır</string>
     <string name="shared_string_legal">Yasal</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 6fba4223b3..ecbdddd2b2 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -2093,10 +2093,6 @@
     <string name="quick_actions_delete">Вилучити дію</string>
     <string name="quick_actions_delete_text">Ви впевнені, що хочете вилучити дію „%s“?</string>
     <string name="favorite_empty_place_name">Місце</string>
-    <string name="quick_action_showhide_favorites_title">Показати/приховати Закладки</string>
-    <string name="quick_action_favorites_show">Показати Закладки</string>
-    <string name="quick_action_favorites_hide">Приховати Закладки</string>
-    <string name="quick_action_showhide_poi_title">Показати/приховати POI</string>
     <string name="quick_action_poi_show">Показати %1$s</string>
     <string name="quick_action_poi_hide">Приховати %1$s</string>
     <string name="quick_action_add_category">Додати категорію</string>
@@ -2210,9 +2206,6 @@
     <string name="nothing_found">Нічого не знайдено</string>
     <string name="private_access_routing_req">Місце призначення розташовано в області з приватним доступом. Дозволити доступ до приватних доріг у цій подорожі\?</string>
     <string name="nothing_found_descr">Змініть пошуковий запит або ж розширте пошуковий радіус.</string>
-    <string name="quick_action_showhide_osmbugs_title">Показати/приховати примітки OSM</string>
-    <string name="quick_action_osmbugs_show">Показати примітки OSM</string>
-    <string name="quick_action_osmbugs_hide">Приховати примітки OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Натискання на кнопку дії покаже чи приховає примітки OSM на мапі.</string>
     <string name="sorted_by_distance">Відсортоване за відстанню</string>
     <string name="search_favorites">Пошук у закладках</string>
@@ -2804,9 +2797,6 @@
     <string name="shared_string_swap">Поміняти</string>
     <string name="show_more">Показати більше</string>
     <string name="tracks_on_map">Показані треки</string>
-    <string name="quick_action_show_hide_gpx_tracks">Показати/Приховати треки</string>
-    <string name="quick_action_gpx_tracks_hide">Приховати треки</string>
-    <string name="quick_action_gpx_tracks_show">Показати треки</string>
     <string name="add_destination_query">Спершу додайте пункт призначення</string>
     <string name="previous_route">Попередній маршрут</string>
     <string name="add_home">Додати домівку</string>
@@ -3265,13 +3255,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Надати перевагу незаасфальтованим над асфальтованими дорогами для прокладки.</string>
     <string name="layer_osm_edits">Правки OSM</string>
     <string name="quick_action_contour_lines_descr">Увімк/вимк показ горизонталей.</string>
-    <string name="quick_action_contour_lines_show">Показати горизонталі</string>
-    <string name="quick_action_contour_lines_hide">Сховати горизонталі</string>
-    <string name="quick_action_show_hide_contour_lines">Показати/приховати горизонталі</string>
     <string name="quick_action_hillshade_descr">Кнопка, що показує чи приховує горизонталі на мапі.</string>
-    <string name="quick_action_hillshade_show">Показати затемнення рельєфу</string>
-    <string name="quick_action_hillshade_hide">Приховати затемнення рельєфу</string>
-    <string name="quick_action_show_hide_hillshade">Показати/приховати затемнення рельєфу</string>
     <string name="tts_initialization_error">Не вдається запустити рушій мовлення.</string>
     <string name="simulate_your_location_gpx_descr">Відтворити свою позицію за допомогою записаного треку GPX.</string>
     <string name="export_profile">Експорт профілю</string>
@@ -3496,9 +3480,6 @@
     <string name="shared_string_hillshade">Пагорб</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схили</string>
-    <string name="quick_action_show_hide_terrain">Показати чи приховати рельєф</string>
-    <string name="quick_action_terrain_hide">Сховати місцевість</string>
-    <string name="quick_action_terrain_show">Показати місцевість</string>
     <string name="quick_action_terrain_descr">Кнопка для відображення або приховування шару місцевості на мапі.</string>
     <string name="delete_description">Видалити опис</string>
     <string name="add_description">Додати опис</string>
@@ -3610,9 +3591,6 @@
 \n
 \n</string>
     <string name="parking_positions">Розташування припаркованого авто</string>
-    <string name="quick_action_transport_hide">Приховати громадський транспорт</string>
-    <string name="quick_action_transport_show">Показати громадський транспорт</string>
-    <string name="quick_action_show_hide_transport">Показати чи приховати громадський транспорт</string>
     <string name="quick_action_transport_descr">Кнопка показу або приховування громадського транспорту на мапі.</string>
     <string name="create_edit_poi">Створити чи змінити POI</string>
     <string name="add_edit_favorite">Додати чи змінити закладку</string>
@@ -3681,9 +3659,6 @@
     <string name="vessel_height_warning">Ви можете встановити висоту судна, щоб уникнути низьких мостів. Майте на увазі, якщо міст рухомий, використовуватиметься його висота у відкритому стані.</string>
     <string name="vessel_height_limit_description">Встановіть висоту судна, щоб уникнути низьких мостів. Майте на увазі, якщо міст рухомий, використовуватиметься його висота у відкритому стані.</string>
     <string name="vessel_width_limit_description">Встановіть ширину судна, щоб уникнути вузьких мостів</string>
-    <string name="quick_action_showhide_mapillary_title">Увімкнути/вимкнути Mapillary</string>
-    <string name="quick_action_mapillary_hide">Вимкнути Mapillary</string>
-    <string name="quick_action_mapillary_show">Показати Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Перемикач показує/приховує шар Mapillary на мапі.</string>
     <string name="uninstall_speed_cameras">Видалити камери контролю швидкості</string>
     <string name="shared_string_legal">Законодавство</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 4f46e46e40..b1afb6439f 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -1249,9 +1249,6 @@
     <string name="increase_search_radius">增加搜索范围</string>
     <string name="nothing_found">什么都没找到</string>
     <string name="nothing_found_descr">更改搜索或增加其半径。</string>
-    <string name="quick_action_showhide_osmbugs_title">显示/隐藏 OSM 注记</string>
-    <string name="quick_action_osmbugs_show">显示 OSM 注记</string>
-    <string name="quick_action_osmbugs_hide">隐藏 OSM 注记</string>
     <string name="shared_string_add_photos">添加照片</string>
     <string name="routing_attr_allow_private_description">允许进入私有土地。</string>
     <string name="download_tab_downloads">全部下载</string>
@@ -2382,10 +2379,6 @@
     <string name="quick_action_duplicate">快速动作名称重复</string>
     <string name="quick_action_showhide_favorites_descr">轻触动作按钮将会在地图上显示或隐收藏夹标点。</string>
     <string name="quick_action_showhide_poi_descr">轻触动作按钮将会在地图上显示或隐藏 POI。</string>
-    <string name="quick_action_showhide_favorites_title">显示/隐藏收藏夹</string>
-    <string name="quick_action_favorites_show">显示收藏夹</string>
-    <string name="quick_action_favorites_hide">隐藏收藏夹</string>
-    <string name="quick_action_showhide_poi_title">显示/隐藏 POI</string>
     <string name="quick_action_poi_show">显示 %1$s</string>
     <string name="quick_action_poi_hide">隐藏 %1$s</string>
     <string name="quick_action_add_category">添加类别</string>
@@ -2732,10 +2725,7 @@
     <string name="step_by_step">逐步</string>
     <string name="routeInfo_road_types_name">道路类型</string>
     <string name="exit_at">退出于</string>
-    <string name="quick_action_show_hide_gpx_tracks">显示/隐藏GPX轨迹</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">在地图中显示或隐藏已选中的GPX轨迹的按钮。</string>
-    <string name="quick_action_gpx_tracks_hide">隐藏GPX轨迹</string>
-    <string name="quick_action_gpx_tracks_show">显示GPX路径</string>
     <string name="add_destination_query">请先设置目的地</string>
     <string name="use_osm_live_public_transport_description">为OsmAnd Live启用公共交通的变更情况。</string>
     <string name="add_start_and_end_points">添加出发地和目的地</string>
@@ -2894,9 +2884,6 @@
     <string name="shared_string_transparency">透明度</string>
     <string name="shared_string_zoom_levels">缩放等级</string>
     <string name="shared_string_legend">图例</string>
-    <string name="quick_action_show_hide_terrain">显示/隐藏地形</string>
-    <string name="quick_action_terrain_hide">隐藏地形</string>
-    <string name="quick_action_terrain_show">显示地形</string>
     <string name="delete_description">删除描述</string>
     <string name="add_description">添加描述</string>
     <string name="select_shape">选择形状</string>
@@ -2917,9 +2904,6 @@
     <string name="search_poi_types">搜索兴趣点类型</string>
     <string name="radius_ruler_item">半径尺</string>
     <string name="subscription_osmandlive_item">订阅 - OsmAnd Live</string>
-    <string name="quick_action_transport_hide">隐藏公共交通</string>
-    <string name="quick_action_transport_show">显示公共交通</string>
-    <string name="quick_action_show_hide_transport">显示/隐藏公共交通</string>
     <string name="create_edit_poi">创建/编辑兴趣点</string>
     <string name="edit_online_source">编辑在线资源</string>
     <string name="mercator_projection">正轴等角圆柱投影</string>
@@ -2934,9 +2918,6 @@
     <string name="vessel_height_warning">您可以设置船只高度，以避免过低桥梁。请记住，如果桥是可移动的，我们将使用它在打开状态下的高度。</string>
     <string name="vessel_height_limit_description">设置船只高度，以避免过低桥梁。请记住，如果桥是可移动的，我们将使用它在打开状态下的高度。</string>
     <string name="vessel_width_limit_description">设置船只宽度以避免狭窄的桥梁</string>
-    <string name="quick_action_showhide_mapillary_title">显示/隐藏Mapillary</string>
-    <string name="quick_action_mapillary_hide">隐藏Mapillary</string>
-    <string name="quick_action_mapillary_show">显示Mapillary</string>
     <string name="item_deleted">%1$s 已删除</string>
     <string name="shared_string_uninstall_and_restart">卸载并重新启动</string>
     <string name="quick_action_remove_next_destination">删除下一个目的地</string>
@@ -2959,10 +2940,6 @@
     <string name="routing_attr_allow_expert_name">允许专家路线</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">节点网络</string>
     <string name="hide_compass_ruler">隐藏罗盘标尺</string>
-    <string name="quick_action_show_hide_hillshade">显示/隐藏山体阴影</string>
-    <string name="quick_action_hillshade_hide">隐藏山体阴影</string>
-    <string name="quick_action_show_hide_contour_lines">显示/隐藏轮廓线</string>
-    <string name="quick_action_contour_lines_hide">隐藏轮廓线</string>
     <string name="quick_action_terrain_descr">在地图上显示或隐藏地形图层的按钮。</string>
     <string name="details_dialog_decr">显示或隐藏其他地图细节</string>
     <string name="quick_action_showhide_mapillary_descr">在地图上显示或隐藏Mapillary图层的开关。</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 21e5de09a5..d980706693 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2092,10 +2092,6 @@
     <string name="quick_favorites_name_preset">預設的名稱</string>
     <string name="favorite_autofill_toast_text">" 儲存到 "</string>
     <string name="favorite_empty_place_name">場所</string>
-    <string name="quick_action_showhide_favorites_title">顯示/隱藏我的收藏</string>
-    <string name="quick_action_favorites_show">顯示我的收藏</string>
-    <string name="quick_action_favorites_hide">隱藏我的收藏</string>
-    <string name="quick_action_showhide_poi_title">顯示/隱藏 POI</string>
     <string name="quick_action_poi_show">顯示 %1$s</string>
     <string name="quick_action_poi_hide">隱藏 %1$s</string>
     <string name="quick_action_add_category">增加一項類別</string>
@@ -2382,9 +2378,6 @@
     <string name="hillshade_purchase_header">安裝「等高線」外掛程式以顯示漸層垂直區域。</string>
     <string name="hide_from_zoom_level">自此縮放等級開始隱藏</string>
     <string name="sorted_by_distance">按距離排序</string>
-    <string name="quick_action_showhide_osmbugs_title">顯示或隱藏 OSM 註記</string>
-    <string name="quick_action_osmbugs_show">顯示 OSM 註記</string>
-    <string name="quick_action_osmbugs_hide">隱藏 OSM 註記</string>
     <string name="search_favorites">在我的最愛中搜尋</string>
     <string name="quick_action_showhide_osmbugs_descr">顯示或隱藏地圖上的 OSM 註記的按鈕。</string>
     <string name="private_access_routing_req">您的目的地位處私人通路的區域。本次旅程允許使用私人道路嗎？</string>
@@ -2839,10 +2832,7 @@
     <string name="routeInfo_road_types_name">道路類型</string>
     <string name="exit_at">離開於</string>
     <string name="sit_on_the_stop">站點的座位</string>
-    <string name="quick_action_show_hide_gpx_tracks">顯示／隱藏軌跡</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">在地圖上顯示或隱藏所選軌跡的按鈕。</string>
-    <string name="quick_action_gpx_tracks_hide">隱藏軌跡</string>
-    <string name="quick_action_gpx_tracks_show">顯示軌跡</string>
     <string name="send_log">傳送紀錄檔</string>
     <string name="routing_attr_avoid_tram_name">避免電車</string>
     <string name="routing_attr_avoid_tram_description">避免電車</string>
@@ -3257,13 +3247,7 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">在計算路徑時，相較於有鋪面的道路，較偏好無鋪面的道路。</string>
     <string name="layer_osm_edits">OSM 編輯</string>
     <string name="quick_action_contour_lines_descr">在地圖上顯示或隱藏等高線的按鈕。</string>
-    <string name="quick_action_contour_lines_show">顯示等高線</string>
-    <string name="quick_action_contour_lines_hide">隱藏等高線</string>
-    <string name="quick_action_show_hide_contour_lines">顯示／隱藏等高線</string>
     <string name="quick_action_hillshade_descr">在地圖上顯示或隱藏地形陰影的按鈕。</string>
-    <string name="quick_action_hillshade_show">顯示地形陰影</string>
-    <string name="quick_action_hillshade_hide">隱藏地形陰影</string>
-    <string name="quick_action_show_hide_hillshade">顯示／隱藏地形陰影</string>
     <string name="tts_initialization_error">無法啟動文字轉語音引擎。</string>
     <string name="simulate_your_location_gpx_descr">使用已紀錄的 GPX 軌跡模擬您的位置。</string>
     <string name="export_profile">匯出設定檔</string>
@@ -3490,9 +3474,6 @@
     <string name="terrain_empty_state_text">啟用以檢視地形陰影或坡度圖。您可以在我們的網站上閱讀更多關於這些地圖類型的資訊。</string>
     <string name="shared_string_hillshade">地形陰影</string>
     <string name="download_slope_maps">坡度</string>
-    <string name="quick_action_show_hide_terrain">顯示或隱藏地形</string>
-    <string name="quick_action_terrain_hide">隱藏地形</string>
-    <string name="quick_action_terrain_show">顯示地形</string>
     <string name="quick_action_terrain_descr">用於顯示或隱藏地圖上地形圖層的按鈕。</string>
     <string name="delete_description">刪除描述</string>
     <string name="add_description">新增描述</string>
@@ -3603,11 +3584,8 @@
 \n • 修復 RTL 的臭蟲
 \n
 \n</string>
-    <string name="quick_action_transport_show">顯示大眾運輸</string>
     <string name="additional_actions_descr">您可以透過點選「%1$s」按鈕存取這些動作。</string>
-    <string name="quick_action_transport_hide">隱藏大眾運輸</string>
     <string name="quick_action_transport_descr">在地圖上顯示或隱藏大眾運輸的按鈕。</string>
-    <string name="quick_action_show_hide_transport">顯示或隱藏大眾運輸</string>
     <string name="create_edit_poi">建立或編輯 POI</string>
     <string name="parking_positions">停車位置</string>
     <string name="add_edit_favorite">新增與編輯收藏</string>
@@ -3675,9 +3653,6 @@
     <string name="vessel_height_warning">您可以設定船艦高度以避免矮橋。請記住，如果橋是可動式的，我們將會使用其在開啟狀態的高度。</string>
     <string name="vessel_height_limit_description">設定船艦高度以避免矮橋。請記住，如果橋是可動式的，我們將會使用其開啟狀態的高度。</string>
     <string name="vessel_width_limit_description">設定船艦寬度以避免窄橋</string>
-    <string name="quick_action_showhide_mapillary_title">顯示／隱藏 Mapillary</string>
-    <string name="quick_action_mapillary_hide">隱藏 Mapillary</string>
-    <string name="quick_action_mapillary_show">顯示 Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">在地圖上顯示或隱藏 Mapillary 圖層的開關。</string>
     <string name="uninstall_speed_cameras">解除安裝測速照相</string>
     <string name="shared_string_legal">法律</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 53138bcc18..675077e65c 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -4345,4 +4345,6 @@
 	<string name="poi_conference_centre">Conference centre</string>
 	<string name="poi_geodesist">Geodesist</string>
 
+	<string name="poi_local_ref">Local ref</string>
+
 </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 49c94d05bf..66d7b6ec59 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,14 +12,13 @@
 
 -->
 
+    <string name="shared_string_interval">Interval</string>
+    <string name="quick_action_show_hide_title">Show/hide</string>
     <string name="copy_poi_name">Copy POI name</string>
     <string name="track_recording_will_be_continued">The recording will be continued.</string>
     <string name="select_category_descr">Select category or add new one</string>
     <string name="map_widget_distance_by_tap">Distance by tap</string>
     <string name="quick_action_coordinates_widget_descr">A toggle to show or hide the Coordinates widget on the map.</string>
-    <string name="quick_action_coordinates_widget_show">Show Coordinates widget</string>
-    <string name="quick_action_coordinates_widget_hide">Hide Coordinates widget</string>
-    <string name="quick_action_showhide_coordinates_widget">Show/Hide coordinates widget</string>
     <string name="routing_attr_height_obstacles_description">Routing could avoid strong uphills.</string>
     <string name="app_restart_required">Application restart required to apply some settings.</string>
     <string name="on_pause">On pause</string>
@@ -342,9 +341,6 @@
     <string name="routing_attr_length_name">Length limit</string>
     <string name="routing_attr_length_description">Specify vehicle length to be permitted on routes.</string>
     <string name="quick_action_showhide_mapillary_descr">A toggle to show or hide the Mapillary layer on the map.</string>
-    <string name="quick_action_mapillary_show">Show Mapillary</string>
-    <string name="quick_action_mapillary_hide">Hide Mapillary</string>
-    <string name="quick_action_showhide_mapillary_title">Show/hide Mapillary</string>
     <string name="vessel_width_limit_description">Set vessel width to avoid narrow bridges</string>
     <string name="vessel_height_limit_description">Set vessel height to avoid low bridges. Keep in mind, if the bridge is movable, we will use its height in the open state.</string>
     <string name="vessel_height_warning">You can set vessel height to avoid low bridges. Keep in mind, if the bridge is movable, we will use its height in the open state.</string>
@@ -421,9 +417,6 @@
     <string name="parking_positions">Parking positions</string>
     <string name="create_edit_poi">Create or edit POI</string>
     <string name="quick_action_transport_descr">Button showing or hiding public transport on the map.</string>
-    <string name="quick_action_show_hide_transport">Show or hide public transport</string>
-    <string name="quick_action_transport_show">Show public transport</string>
-    <string name="quick_action_transport_hide">Hide public transport</string>
     <string name="release_3_7">
     • New offline Slope maps\n\n
     • Full customization of Favorites and GPX Waypoints – custom colors, icons, shapes\n\n
@@ -521,9 +514,6 @@
     <string name="add_description">Add description</string>
     <string name="delete_description">Delete description</string>
     <string name="quick_action_terrain_descr">A button to show or hide terrain layer on the map.</string>
-    <string name="quick_action_terrain_show">Show terrain</string>
-    <string name="quick_action_terrain_hide">Hide terrain</string>
-    <string name="quick_action_show_hide_terrain">Show or hide terrain</string>
     <string name="download_slope_maps">Slopes</string>
     <string name="n_items_of_z">%1$s of %2$s</string>
     <string name="recalculate_route_distance_promo">The route will be recalculated if the distance from the route to the current location is more than selected value.</string>
@@ -724,13 +714,7 @@
     <string name="tts_initialization_error">Cannot start text-to-speech engine.</string>
     <string name="layer_osm_edits">OSM edits</string>
     <string name="quick_action_contour_lines_descr">Button showing or hiding contour lines on the map.</string>
-    <string name="quick_action_contour_lines_show">Show contour lines</string>
-    <string name="quick_action_contour_lines_hide">Hide contour lines</string>
-    <string name="quick_action_show_hide_contour_lines">Show/hide contour lines</string>
     <string name="quick_action_hillshade_descr">A button to show or hide hillshades on the map.</string>
-    <string name="quick_action_hillshade_show">Show hillshade</string>
-    <string name="quick_action_hillshade_hide">Hide hillshade</string>
-    <string name="quick_action_show_hide_hillshade">Show/hide hillshade</string>
     <string name="apply_preference_to_all_profiles">You can apply this change to all or only the selected profile.</string>
     <string name="shared_preference">Shared</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer unpaved roads</string>
@@ -1117,10 +1101,7 @@
     <string name="shared_string_swap">Swap</string>
     <string name="show_more">Show more</string>
     <string name="tracks_on_map">Displayed tracks</string>
-    <string name="quick_action_show_hide_gpx_tracks">Show/hide tracks</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">A button to show or hide selected tracks on the map.</string>
-    <string name="quick_action_gpx_tracks_hide">Hide Tracks</string>
-    <string name="quick_action_gpx_tracks_show">Show Tracks</string>
     <string name="add_destination_query">Please set the destination first</string>
     <string name="previous_route">Previous route</string>
     <string name="add_home">Add home</string>
@@ -1530,9 +1511,6 @@
     <string name="increase_search_radius">Increase search radius</string>
     <string name="nothing_found">Nothing found</string>
     <string name="nothing_found_descr">Change the search or increase its radius.</string>
-    <string name="quick_action_showhide_osmbugs_title">Show or hide OSM notes</string>
-    <string name="quick_action_osmbugs_show">Show OSM notes</string>
-    <string name="quick_action_osmbugs_hide">Hide OSM notes</string>
     <string name="quick_action_showhide_osmbugs_descr">Button to show or hide OSM notes on the map.</string>
     <string name="sorted_by_distance">Sorted by distance</string>
     <string name="search_favorites">Search in Favorites</string>
@@ -2280,7 +2258,7 @@
     <string name="shared_string_add">Add</string>
     <string name="shared_string_add_to_favorites">Add to \'Favorites\'</string>
     <string name="shared_string_my_location">My Position</string>
-    <string name="shared_string_my_places">My Places</string>
+    <string name="shared_string_my_places">My places</string>
     <string name="shared_string_my_favorites">Favorites</string>
     <string name="shared_string_tracks">Tracks</string>
     <string name="shared_string_currently_recording_track">Currently recording track</string>
@@ -4014,10 +3992,6 @@
     <string name="quick_action_duplicate">Quick action name duplicate</string>
     <string name="quick_action_showhide_favorites_descr">A toggle to show or hide the Favorite points on the map.</string>
     <string name="quick_action_showhide_poi_descr">A toggle to show or hide POIs on the map.</string>
-    <string name="quick_action_showhide_favorites_title">Show/hide Favorites</string>
-    <string name="quick_action_favorites_show">Show Favorites</string>
-    <string name="quick_action_favorites_hide">Hide Favorites</string>
-    <string name="quick_action_showhide_poi_title">Show/hide POI</string>
     <string name="quick_action_poi_show">Show %1$s</string>
     <string name="quick_action_poi_hide">Hide %1$s</string>
     <string name="quick_action_add_category">Add a category</string>
diff --git a/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java b/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
index d5ff6fcedf..df05570f57 100644
--- a/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
+++ b/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
@@ -6,9 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
+import com.android.billingclient.api.AccountIdentifiers;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.Purchase;
@@ -25,7 +23,6 @@ import net.osmand.plus.inapp.InAppPurchases.InAppSubscription.SubscriptionState;
 import net.osmand.plus.inapp.InAppPurchasesImpl.InAppPurchaseLiveUpdatesOldSubscription;
 import net.osmand.plus.inapp.util.BillingManager;
 import net.osmand.plus.settings.backend.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.util.Algorithms;
@@ -37,6 +34,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 
 	// The helper object
@@ -77,6 +77,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 		return billingManager;
 	}
 
+	@Override
 	protected void execImpl(@NonNull final InAppPurchaseTaskType taskType, @NonNull final InAppCommand runnable) {
 		billingManager = new BillingManager(ctx, BASE64_ENCODED_PUBLIC_KEY, new BillingManager.BillingUpdatesListener() {
 
@@ -126,7 +127,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 					}
 					billingManager.querySkuDetailsAsync(BillingClient.SkuType.INAPP, skuInApps, new SkuDetailsResponseListener() {
 						@Override
-						public void onSkuDetailsResponse(BillingResult billingResult, final List<SkuDetails> skuDetailsListInApps) {
+						public void onSkuDetailsResponse(@NonNull BillingResult billingResult, final List<SkuDetails> skuDetailsListInApps) {
 							// Is it a failure?
 							if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) {
 								logError("Failed to query inapps sku details: " + billingResult.getResponseCode());
@@ -153,7 +154,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 
 							billingManager.querySkuDetailsAsync(BillingClient.SkuType.SUBS, skuSubscriptions, new SkuDetailsResponseListener() {
 								@Override
-								public void onSkuDetailsResponse(BillingResult billingResult, final List<SkuDetails> skuDetailsListSubscriptions) {
+								public void onSkuDetailsResponse(@NonNull BillingResult billingResult, final List<SkuDetails> skuDetailsListSubscriptions) {
 									// Is it a failure?
 									if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) {
 										logError("Failed to query subscriptipons sku details: " + billingResult.getResponseCode());
@@ -197,6 +198,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 					if (skuDetails == null) {
 						throw new IllegalArgumentException("Cannot find sku details");
 					}
+
 					BillingManager billingManager = getBillingManager();
 					if (billingManager != null) {
 						billingManager.initiatePurchaseFlow(activity, skuDetails);
@@ -321,7 +323,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 		}
 
 		@Override
-		public void onSkuDetailsResponse(BillingResult billingResult, List<SkuDetails> skuDetailsList) {
+		public void onSkuDetailsResponse(@NonNull BillingResult billingResult, List<SkuDetails> skuDetailsList) {
 
 			logDebug("Query sku details finished.");
 
@@ -442,19 +444,8 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 			if (liveUpdatesPurchases.size() > 0) {
 				List<String> tokensSent = Arrays.asList(settings.BILLING_PURCHASE_TOKENS_SENT.get().split(";"));
 				for (Purchase purchase : liveUpdatesPurchases) {
-					if ((Algorithms.isEmpty(settings.BILLING_USER_ID.get()) || Algorithms.isEmpty(settings.BILLING_USER_TOKEN.get()))
-							&& !Algorithms.isEmpty(purchase.getDeveloperPayload())) {
-						String payload = purchase.getDeveloperPayload();
-						if (!Algorithms.isEmpty(payload)) {
-							String[] arr = payload.split(" ");
-							if (arr.length > 0) {
-								settings.BILLING_USER_ID.set(arr[0]);
-							}
-							if (arr.length > 1) {
-								token = arr[1];
-								settings.BILLING_USER_TOKEN.set(token);
-							}
-						}
+					if (needRestoreUserInfo()) {
+						restoreUserInfo(purchase);
 					}
 					if (!tokensSent.contains(purchase.getSku())) {
 						tokensToSend.add(purchase);
@@ -469,6 +460,37 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 		}
 	};
 
+	private void restoreUserInfo(Purchase purchase) {
+		boolean restored = restoreUserInfoFromString(purchase.getDeveloperPayload());
+		if (!restored) {
+			AccountIdentifiers accountIdentifiers = purchase.getAccountIdentifiers();
+			if (accountIdentifiers != null) {
+				restoreUserInfoFromString(accountIdentifiers.getObfuscatedAccountId());
+			}
+		}
+	}
+
+	private boolean restoreUserInfoFromString(String userInfo) {
+		if (Algorithms.isEmpty(userInfo)) {
+			return false;
+		}
+		OsmandSettings settings = ctx.getSettings();
+		String[] arr = userInfo.split(" ");
+		if (arr.length > 0) {
+			settings.BILLING_USER_ID.set(arr[0]);
+		}
+		if (arr.length > 1) {
+			token = arr[1];
+			settings.BILLING_USER_TOKEN.set(token);
+		}
+		return needRestoreUserInfo();
+	}
+
+	private boolean needRestoreUserInfo() {
+		OsmandSettings settings = ctx.getSettings();
+		return Algorithms.isEmpty(settings.BILLING_USER_ID.get()) || Algorithms.isEmpty(settings.BILLING_USER_TOKEN.get());
+	}
+
 	private PurchaseInfo getPurchaseInfo(Purchase purchase) {
 		return new PurchaseInfo(purchase.getSku(), purchase.getOrderId(), purchase.getPurchaseToken());
 	}
@@ -511,7 +533,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 
 			String introductoryPrice = skuDetails.getIntroductoryPrice();
 			String introductoryPricePeriod = skuDetails.getIntroductoryPricePeriod();
-			String introductoryPriceCycles = skuDetails.getIntroductoryPriceCycles();
+			int introductoryPriceCycles = skuDetails.getIntroductoryPriceCycles();
 			long introductoryPriceAmountMicros = skuDetails.getIntroductoryPriceAmountMicros();
 			if (!Algorithms.isEmpty(introductoryPrice)) {
 				try {
@@ -524,7 +546,8 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 		}
 	}
 
-	protected InAppCommand getPurchaseLiveUpdatesCommand(final WeakReference<Activity> activity, final String sku, final String payload) {
+	@Override
+	protected InAppCommand getPurchaseLiveUpdatesCommand(final WeakReference<Activity> activity, final String sku, final String userInfo) {
 		return new InAppCommand() {
 			@Override
 			public void run(InAppPurchaseHelper helper) {
@@ -534,7 +557,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 					if (AndroidUtils.isActivityNotDestroyed(a) && skuDetails != null) {
 						BillingManager billingManager = getBillingManager();
 						if (billingManager != null) {
-							billingManager.setPayload(payload);
+							billingManager.setObfuscatedAccountId(userInfo);
 							billingManager.initiatePurchaseFlow(a, skuDetails);
 						} else {
 							throw new IllegalStateException("BillingManager disposed");
@@ -551,6 +574,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 		};
 	}
 
+	@Override
 	protected InAppCommand getRequestInventoryCommand() {
 		return new InAppCommand() {
 			@Override
diff --git a/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java b/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
index 0f3536e5d0..7a16429bd5 100644
--- a/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
+++ b/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
@@ -276,7 +276,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 		}
 	}
 
-	protected InAppCommand getPurchaseLiveUpdatesCommand(final WeakReference<Activity> activity, final String sku, final String payload) {
+	protected InAppCommand getPurchaseLiveUpdatesCommand(final WeakReference<Activity> activity, final String sku, final String userInfo) {
 		return new InAppCommand() {
 			@Override
 			public void run(InAppPurchaseHelper helper) {
@@ -285,7 +285,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 					ProductInfo productInfo = getProductInfo(sku);
 					if (AndroidUtils.isActivityNotDestroyed(a) && productInfo != null) {
 						IapRequestHelper.createPurchaseIntent(getIapClient(), sku,
-								IapClient.PriceType.IN_APP_SUBSCRIPTION, payload, new IapApiCallback<PurchaseIntentResult>() {
+								IapClient.PriceType.IN_APP_SUBSCRIPTION, userInfo, new IapApiCallback<PurchaseIntentResult>() {
 									@Override
 									public void onSuccess(PurchaseIntentResult result) {
 										if (result == null) {
diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java
index 28c5e12519..41c46d0dcf 100644
--- a/OsmAnd/src/net/osmand/data/PointDescription.java
+++ b/OsmAnd/src/net/osmand/data/PointDescription.java
@@ -47,6 +47,7 @@ public class PointDescription {
 	public static final String POINT_TYPE_OSM_BUG = "bug";
 	public static final String POINT_TYPE_WORLD_REGION = "world_region";
 	public static final String POINT_TYPE_GPX_ITEM = "gpx_item";
+	public static final String POINT_TYPE_GPX_FILE = "gpx_file";
 	public static final String POINT_TYPE_WORLD_REGION_SHOW_ON_MAP = "world_region_show_on_map";
 	public static final String POINT_TYPE_BLOCKED_ROAD = "blocked_road";
 	public static final String POINT_TYPE_TRANSPORT_ROUTE = "transport_route";
@@ -297,6 +298,10 @@ public class PointDescription {
 		return POINT_TYPE_GPX.equals(type);
 	}
 
+	public boolean isGpxFile() {
+		return POINT_TYPE_GPX_FILE.equals(type);
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index 10a8c2ae84..66dbb1c75e 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -27,6 +27,8 @@ import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
+import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
+import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
@@ -581,7 +583,7 @@ public class GpxSelectionHelper {
 						} else if (obj.has(BACKUP)) {
 							selectedGpxFilesBackUp.put(gpx, gpx.modifiedTime);
 						} else {
-							SelectedGpxFile file = selectGpxFile(gpx, true, false, true, selectedByUser, false);
+							SelectedGpxFile file = selectGpxFile(gpx, true, false, true, selectedByUser, false, false);
 							if (obj.has(HIDDEN_GROUPS)) {
 								readHiddenGroups(file, obj.getString(HIDDEN_GROUPS));
 							}
@@ -684,7 +686,13 @@ public class GpxSelectionHelper {
 		app.getSettings().SELECTED_GPX.set(ar.toString());
 	}
 
-	private SelectedGpxFile selectGpxFileImpl(GPXFile gpx, GpxDataItem dataItem, boolean show, boolean notShowNavigationDialog, boolean syncGroup, boolean selectedByUser) {
+	private SelectedGpxFile selectGpxFileImpl(GPXFile gpx,
+	                                          GpxDataItem dataItem,
+	                                          boolean show,
+	                                          boolean notShowNavigationDialog,
+	                                          boolean syncGroup,
+	                                          boolean selectedByUser,
+	                                          boolean addToHistory) {
 		boolean displayed;
 		SelectedGpxFile sf;
 		if (gpx != null && gpx.showCurrentTrack) {
@@ -724,6 +732,15 @@ public class GpxSelectionHelper {
 		if (sf != null) {
 			sf.splitProcessed = false;
 		}
+		if (show && selectedByUser && addToHistory) {
+			String path = gpx.path;
+			String rootGpxDir = app.getAppPath(IndexConstants.GPX_INDEX_DIR).getAbsolutePath() + '/';
+			String fileName = path.replace(rootGpxDir, "");
+			GPXInfo gpxInfo = GpxUiHelper.getGpxInfoByFileName(app, fileName);
+			if (gpxInfo != null) {
+				SearchHistoryHelper.getInstance(app).addNewItemToHistory(gpxInfo);
+			}
+		}
 		return sf;
 	}
 
@@ -749,18 +766,39 @@ public class GpxSelectionHelper {
 		return selectGpxFile(gpx, show, notShowNavigationDialog, true, true, true);
 	}
 
-	public SelectedGpxFile selectGpxFile(GPXFile gpx, GpxDataItem dataItem, boolean show, boolean notShowNavigationDialog, boolean syncGroup, boolean selectedByUser) {
-		SelectedGpxFile sf = selectGpxFileImpl(gpx, dataItem, show, notShowNavigationDialog, syncGroup, selectedByUser);
+	public SelectedGpxFile selectGpxFile(GPXFile gpx,
+	                                     GpxDataItem dataItem,
+	                                     boolean show,
+	                                     boolean notShowNavigationDialog,
+	                                     boolean syncGroup,
+	                                     boolean selectedByUser,
+	                                     boolean addToHistory) {
+		SelectedGpxFile sf = selectGpxFileImpl(gpx, dataItem, show, notShowNavigationDialog, syncGroup, selectedByUser, addToHistory);
 		saveCurrentSelections();
 		return sf;
 	}
 
-	public SelectedGpxFile selectGpxFile(GPXFile gpx, boolean show, boolean notShowNavigationDialog, boolean syncGroup, boolean selectedByUser, boolean canAddToMarkers) {
+	public SelectedGpxFile selectGpxFile(GPXFile gpx,
+	                                     boolean show,
+	                                     boolean notShowNavigationDialog,
+	                                     boolean syncGroup,
+	                                     boolean selectedByUser,
+	                                     boolean canAddToMarkers) {
+		return selectGpxFile(gpx, show, notShowNavigationDialog, syncGroup, selectedByUser, canAddToMarkers, true);
+	}
+
+	public SelectedGpxFile selectGpxFile(GPXFile gpx,
+	                                     boolean show,
+	                                     boolean notShowNavigationDialog,
+	                                     boolean syncGroup,
+	                                     boolean selectedByUser,
+	                                     boolean canAddToMarkers,
+	                                     boolean addToHistory) {
 		GpxDataItem dataItem = app.getGpxDbHelper().getItem(new File(gpx.path));
 		if (canAddToMarkers && show && dataItem != null && dataItem.isShowAsMarkers()) {
 			app.getMapMarkersHelper().addOrEnableGroup(gpx);
 		}
-		return selectGpxFile(gpx, dataItem, show, notShowNavigationDialog, syncGroup, selectedByUser);
+		return selectGpxFile(gpx, dataItem, show, notShowNavigationDialog, syncGroup, selectedByUser, addToHistory);
 	}
 
 	public void clearPoints(GPXFile gpxFile) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index 6a52fe9804..883cc908c5 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -121,13 +121,22 @@ public class OsmAndFormatter {
 	}
 
 	public static String getFormattedTimeInterval(OsmandApplication app, double interval) {
+		String unitsStr;
+		double intervalInUnits;
 		if (interval < 60) {
-			return interval + " " + app.getString(R.string.int_seconds);
+			unitsStr = app.getString(R.string.shared_string_sec);
+			intervalInUnits = interval;
 		} else if (interval % 60 == 0) {
-			return (interval / 60) + " " + app.getString(R.string.int_min);
+			unitsStr = app.getString(R.string.int_min);
+			intervalInUnits = (interval / 60);
 		} else {
-			return (interval / 60f) + " " + app.getString(R.string.int_min);
+			unitsStr = app.getString(R.string.int_min);
+			intervalInUnits = (interval / 60f);
 		}
+		String formattedInterval = Algorithms.isInt(intervalInUnits) ?
+				String.format(Locale.US, "%d", (long) intervalInUnits) :
+				String.format("%s", intervalInUnits);
+		return formattedInterval + " " + unitsStr;
 	}
 
 	public static String getFormattedDistanceInterval(OsmandApplication app, double interval) {
diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index 269800c630..e6ce06ca35 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -1,6 +1,7 @@
 package net.osmand.plus;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -369,13 +370,14 @@ public class UiUtilities {
 				break;
 		}
 		//Looks like screenOrientation correction must not be applied for devices without compass?
-		Sensor compass = ((SensorManager) app.getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
-		if (compass == null) {
+		PackageManager manager = app.getPackageManager();
+		boolean hasCompass = manager.hasSystemFeature(PackageManager.FEATURE_SENSOR_COMPASS);
+		if (!hasCompass) {
 			screenOrientation = 0;
 		}
 		return screenOrientation;
 	}
-
+	
 	public static void setupSnackbar(Snackbar snackbar, boolean nightMode) {
 		setupSnackbar(snackbar, nightMode, null, null, null, null);
 	}
@@ -633,8 +635,9 @@ public class UiUtilities {
 		}
 		int activeDisableColor = getColorWithAlpha(activeColor, 0.25f);
 		ColorStateList activeCsl = new ColorStateList(states, new int[] {activeColor, activeDisableColor});
-		int inactiveColor = ContextCompat.getColor(ctx, nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
-		ColorStateList inactiveCsl = new ColorStateList(states, new int[] {inactiveColor, inactiveColor});
+		int inactiveColor = getColorWithAlpha(activeColor, 0.5f);
+		int inactiveDisableColor = ContextCompat.getColor(ctx, nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
+		ColorStateList inactiveCsl = new ColorStateList(states, new int[] {inactiveColor, inactiveDisableColor});
 		slider.setTrackActiveTintList(activeCsl);
 		slider.setTrackInactiveTintList(inactiveCsl);
 		slider.setHaloTintList(activeCsl);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 34f020fd17..48cc860cb7 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -441,7 +441,7 @@ public class MapActivityActions implements DialogProvider {
 		}
 
 		adapter.addItem(itemBuilder
-				.setTitleId(R.string.plan_a_route, mapActivity)
+				.setTitleId(R.string.plan_route, mapActivity)
 				.setId(MAP_CONTEXT_MENU_MEASURE_DISTANCE)
 				.setIcon(R.drawable.ic_action_ruler)
 				.setOrder(MEASURE_DISTANCE_ITEM_ORDER)
@@ -489,7 +489,7 @@ public class MapActivityActions implements DialogProvider {
 					//			new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
 					//			REQUEST_LOCATION_FOR_DIRECTIONS_NAVIGATION_PERMISSION);
 					//}
-				} else if (standardId == R.string.plan_a_route) {
+				} else if (standardId == R.string.plan_route) {
 					mapActivity.getContextMenu().close();
 					MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), new LatLon(latitude, longitude));
 				} else if (standardId == R.string.avoid_road) {
@@ -963,7 +963,7 @@ public class MapActivityActions implements DialogProvider {
 					}
 				}).createItem());
 
-		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.plan_a_route, mapActivity)
+		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.plan_route, mapActivity)
 				.setId(DRAWER_MEASURE_DISTANCE_ID)
 				.setIcon(R.drawable.ic_action_plan_route)
 				.setListener(new ItemClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index 536ef96541..9cb508141e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -303,9 +303,9 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA
 			iconId = R.drawable.ic_type_audio;
 		} else if (pd.isVideoNote()) {
 			iconId = R.drawable.ic_type_video;
-		}else if (pd.isPhotoNote()) {
+		} else if (pd.isPhotoNote()) {
 			iconId = R.drawable.ic_type_img;
-		}  else {
+		} else {
 			iconId = R.drawable.ic_action_street_name;
 		}
 		return iconId;
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index c2f3d831b8..1d49394ea0 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -93,7 +93,6 @@ import net.osmand.plus.activities.ActivityResultListener;
 import net.osmand.plus.activities.ActivityResultListener.OnActivityResultListener;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.PluginsFragment;
-import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.dialogs.GpxAppearanceAdapter;
 import net.osmand.plus.dialogs.GpxAppearanceAdapter.AppearanceListItem;
 import net.osmand.plus.helpers.enums.MetricsConstants;
@@ -751,13 +750,53 @@ public class GpxUiHelper {
 		gpxDbHelper.updateShowStartFinish(item, showStartFinish);
 	}
 
-	public static void updateGpxInfoView(View v, String itemTitle, GPXInfo info, GpxDataItem dataItem, boolean currentlyRecordingTrack, OsmandApplication app) {
+	public static void updateGpxInfoView(final @NonNull OsmandApplication app,
+	                                     final @NonNull View v,
+	                                     final @NonNull String itemTitle,
+	                                     final @Nullable Drawable iconDrawable,
+	                                     final @NonNull GPXInfo info) {
+		GpxDataItem item = getDataItem(app, info, new GpxDataItemCallback() {
+			@Override
+			public boolean isCancelled() {
+				return false;
+			}
+
+			@Override
+			public void onGpxDataItemReady(GpxDataItem item) {
+				updateGpxInfoView(app, v, itemTitle, iconDrawable, info, item);
+			}
+		});
+		if (item != null) {
+			updateGpxInfoView(app, v, itemTitle, iconDrawable, info, item);
+		}
+	}
+
+	private static void updateGpxInfoView(@NonNull OsmandApplication app,
+	                                      @NonNull View v,
+	                                      @NonNull String itemTitle,
+	                                      @Nullable Drawable iconDrawable,
+	                                      @NonNull GPXInfo info,
+	                                      @NonNull GpxDataItem dataItem) {
+		updateGpxInfoView(v, itemTitle, info, dataItem, false, app);
+		if (iconDrawable != null) {
+			ImageView icon = (ImageView) v.findViewById(R.id.icon);
+			icon.setImageDrawable(iconDrawable);
+			icon.setVisibility(View.VISIBLE);
+		}
+	}
+
+	public static void updateGpxInfoView(View v,
+	                                     String itemTitle,
+	                                     GPXInfo info,
+	                                     GpxDataItem dataItem,
+	                                     boolean currentlyRecordingTrack,
+	                                     OsmandApplication app) {
 		TextView viewName = ((TextView) v.findViewById(R.id.name));
 		viewName.setText(itemTitle.replace("/", " • ").trim());
+		viewName.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
 		ImageView icon = (ImageView) v.findViewById(R.id.icon);
 		icon.setVisibility(View.GONE);
 		//icon.setImageDrawable(app.getIconsCache().getThemedIcon(R.drawable.ic_action_polygom_dark));
-		viewName.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
 
 		GPXTrackAnalysis analysis = null;
 		if (currentlyRecordingTrack) {
@@ -809,9 +848,23 @@ public class GpxUiHelper {
 		}
 
 		TextView descr = ((TextView) v.findViewById(R.id.description));
-		descr.setVisibility(View.GONE);
+		if (descr != null) {
+			descr.setVisibility(View.GONE);
+		}
 
-		v.findViewById(R.id.check_item).setVisibility(View.GONE);
+		View checkbox = v.findViewById(R.id.check_item);
+		if (checkbox != null) {
+			checkbox.setVisibility(View.GONE);
+		}
+	}
+
+	private static GpxDataItem getDataItem(@NonNull OsmandApplication app,
+	                                       @NonNull GPXInfo info,
+	                                       @Nullable GpxDataItemCallback callback) {
+		File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR);
+		String fileName = info.getFileName();
+		File file = new File(dir, fileName);
+		return app.getGpxDbHelper().getItem(file, callback);
 	}
 
 	@TargetApi(Build.VERSION_CODES.KITKAT)
@@ -884,6 +937,17 @@ public class GpxUiHelper {
 		return list;
 	}
 
+	@Nullable
+	public static GPXInfo getGpxInfoByFileName(@NonNull OsmandApplication app, @NonNull String fileName) {
+		final File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR);
+		List<GPXInfo> infoList = getSortedGPXFilesInfo(dir, null, false);
+		for (GPXInfo info : infoList) {
+			if (Algorithms.objectEquals(info.getFileName(), fileName)) {
+				return info;
+			}
+		}
+		return null;
+	}
 
 	public static List<GPXInfo> getSortedGPXFilesInfo(File dir, final List<String> selectedGpxList, boolean absolutePath) {
 		final List<GPXInfo> list = new ArrayList<>();
diff --git a/OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java b/OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
index 693227f434..b71b83316f 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
@@ -6,6 +6,7 @@ import net.osmand.osm.AbstractPoiType;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
 import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
+import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.util.Algorithms;
 
@@ -16,6 +17,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static net.osmand.data.PointDescription.POINT_TYPE_GPX_FILE;
+
 public class SearchHistoryHelper {
 
 	private static final int HISTORY_LIMIT = 1500;
@@ -53,6 +56,10 @@ public class SearchHistoryHelper {
 		context.getPoiFilters().markHistory(filter.getFilterId(), true);
 	}
 
+	public void addNewItemToHistory(GPXInfo gpxInfo) {
+		addNewItemToHistory(new HistoryEntry(0, 0, createPointDescription(gpxInfo)));
+	}
+
 	public List<HistoryEntry> getHistoryEntries(boolean onlyPoints) {
 		if (loadedEntries == null) {
 			checkLoadedEntries();
@@ -75,6 +82,10 @@ public class SearchHistoryHelper {
 		return new PointDescription(PointDescription.POINT_TYPE_CUSTOM_POI_FILTER, filter.getFilterId());
 	}
 
+	private PointDescription createPointDescription(GPXInfo gpxInfo) {
+		return new PointDescription(PointDescription.POINT_TYPE_GPX_FILE, gpxInfo.getFileName());
+	}
+
 	public void remove(Object item) {
 		PointDescription pd = null;
 		if (item instanceof HistoryEntry) {
@@ -83,6 +94,8 @@ public class SearchHistoryHelper {
 			pd = createPointDescription((AbstractPoiType) item);
 		} else if (item instanceof PoiUIFilter) {
 			pd = createPointDescription((PoiUIFilter) item);
+		} else if (item instanceof GPXInfo) {
+			pd = createPointDescription((GPXInfo) item);
 		}
 		if (pd != null) {
 			remove(pd);
diff --git a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
index 221b192405..2c899eb840 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
+++ b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
@@ -178,17 +178,19 @@
 									</xsl:otherwise>
 								</xsl:choose>
 							</xsl:variable>
-							<trkpt lon="{$lon}" lat="{$lat}">
-								<xsl:choose>
-									<xsl:when test="contains($latele,' ')">
-										<ele><xsl:value-of select="substring-after($latele,' ')"/></ele>
-									</xsl:when>
-								</xsl:choose>
-								<xsl:variable name="ts" select="../kml:when[$i]"/>
-								<xsl:if test="$ts">
-									<time><xsl:value-of select="$ts"/></time>
-								</xsl:if>
-							</trkpt>
+							<xsl:if test="$lon">
+								<trkpt lon="{$lon}" lat="{$lat}">
+									<xsl:choose>
+										<xsl:when test="contains($latele,' ')">
+											<ele><xsl:value-of select="substring-after($latele,' ')"/></ele>
+										</xsl:when>
+									</xsl:choose>
+									<xsl:variable name="ts" select="../kml:when[$i]"/>
+									<xsl:if test="$ts">
+										<time><xsl:value-of select="$ts"/></time>
+									</xsl:if>
+								</trkpt>
+							</xsl:if>
 						</xsl:for-each>
 					</trkseg>
 				</trk>
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
index 48fd643099..d511b7be85 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
@@ -364,8 +364,8 @@ public abstract class InAppPurchaseHelper {
 			notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
 			if (!Algorithms.isEmpty(userId) && !Algorithms.isEmpty(token)) {
 				logDebug("Launching purchase flow for live updates subscription for userId=" + userId);
-				final String payload = userId + " " + token;
-				exec(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, getPurchaseLiveUpdatesCommand(activity, sku, payload));
+				final String userInfo = userId + " " + token;
+				exec(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, getPurchaseLiveUpdatesCommand(activity, sku, userInfo));
 			} else {
 				notifyError(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, "Empty userId");
 				stop(true);
@@ -374,7 +374,7 @@ public abstract class InAppPurchaseHelper {
 	}
 
 	protected abstract InAppCommand getPurchaseLiveUpdatesCommand(final WeakReference<Activity> activity,
-																  final String sku, final String payload) throws UnsupportedOperationException;
+																  final String sku, final String userInfo) throws UnsupportedOperationException;
 
 	@SuppressLint("StaticFieldLeak")
 	private class RequestInventoryTask extends AsyncTask<Void, Void, String[]> {
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
index 7cc9a8fbee..e6ec431187 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
@@ -405,16 +405,12 @@ public abstract class InAppPurchases {
 												 String introductoryPrice,
 												 long introductoryPriceAmountMicros,
 												 String introductoryPeriodString,
-												 String introductoryCycles) throws ParseException {
+												 int introductoryCycles) throws ParseException {
 			this.subscription = subscription;
 			this.introductoryPrice = introductoryPrice;
 			this.introductoryPriceAmountMicros = introductoryPriceAmountMicros;
 			this.introductoryPeriodString = introductoryPeriodString;
-			try {
-				this.introductoryCycles = Integer.parseInt(introductoryCycles);
-			} catch (NumberFormatException e) {
-				throw new ParseException("Cannot parse introductoryCycles = " + introductoryCycles, 0);
-			}
+			this.introductoryCycles = introductoryCycles;
 			introductoryPriceValue = introductoryPriceAmountMicros / 1000000d;
 			introductoryPeriod = Period.parse(introductoryPeriodString);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/inapp/util/BillingManager.java b/OsmAnd/src/net/osmand/plus/inapp/util/BillingManager.java
index b5b3c654f9..ed1772be6f 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/util/BillingManager.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/util/BillingManager.java
@@ -2,9 +2,7 @@ package net.osmand.plus.inapp.util;
 
 import android.app.Activity;
 import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.text.TextUtils;
 
 import com.android.billingclient.api.AcknowledgePurchaseParams;
 import com.android.billingclient.api.AcknowledgePurchaseResponseListener;
@@ -25,7 +23,6 @@ import com.android.billingclient.api.SkuDetailsParams;
 import com.android.billingclient.api.SkuDetailsResponseListener;
 
 import net.osmand.PlatformUtil;
-import net.osmand.util.Algorithms;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,6 +30,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Handles all the interactions with Play Store (via Billing library), maintains connection to
  * it through BillingClient and caches temporary states/data if needed
@@ -58,7 +58,9 @@ public class BillingManager implements PurchasesUpdatedListener {
 
 	// Public key for verifying signature, in base64 encoding
 	private String mSignatureBase64;
-	private String mPayload;
+
+	private String mObfuscatedAccountId;
+	private String mObfuscatedProfileId;
 
 	private final BillingUpdatesListener mBillingUpdatesListener;
 	private final List<Purchase> mPurchases = new ArrayList<>();
@@ -135,18 +137,29 @@ public class BillingManager implements PurchasesUpdatedListener {
 	 * Start a purchase flow
 	 */
 	public void initiatePurchaseFlow(final Activity activity, final SkuDetails skuDetails) {
-		initiatePurchaseFlow(activity, skuDetails, null);
+		initiatePurchaseFlow(activity, skuDetails, null, null);
 	}
 
 	/**
 	 * Start a purchase or subscription replace flow
 	 */
-	public void initiatePurchaseFlow(final Activity activity, final SkuDetails skuDetails, final String oldSku) {
+	public void initiatePurchaseFlow(final Activity activity, final SkuDetails skuDetails, final String oldSku, final String purchaseToken) {
 		Runnable purchaseFlowRequest = new Runnable() {
 			@Override
 			public void run() {
-				LOG.debug("Launching in-app purchase flow. Replace old SKU? " + (oldSku != null));
-				BillingFlowParams purchaseParams = BillingFlowParams.newBuilder().setSkuDetails(skuDetails).setOldSku(oldSku).build();
+				LOG.debug("Launching in-app purchase flow. Replace old SKU? " + (oldSku != null && purchaseToken != null));
+				BillingFlowParams.Builder paramsBuilder = BillingFlowParams.newBuilder()
+						.setSkuDetails(skuDetails);
+				if (!TextUtils.isEmpty(mObfuscatedAccountId)) {
+					paramsBuilder.setObfuscatedAccountId(mObfuscatedAccountId);
+				}
+				if (!TextUtils.isEmpty(mObfuscatedProfileId)) {
+					paramsBuilder.setObfuscatedProfileId(mObfuscatedProfileId);
+				}
+				if (oldSku != null && purchaseToken != null) {
+					paramsBuilder.setOldSku(oldSku, purchaseToken);
+				}
+				BillingFlowParams purchaseParams = paramsBuilder.build();
 				mBillingClient.launchBillingFlow(activity, purchaseParams);
 			}
 		};
@@ -177,9 +190,11 @@ public class BillingManager implements PurchasesUpdatedListener {
 			@Override
 			public void run() {
 				// Query the purchase async
-				SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
-				params.setSkusList(skuList).setType(itemType);
-				mBillingClient.querySkuDetailsAsync(params.build(),
+				SkuDetailsParams params = SkuDetailsParams.newBuilder()
+						.setSkusList(skuList)
+						.setType(itemType)
+						.build();
+				mBillingClient.querySkuDetailsAsync(params,
 						new SkuDetailsResponseListener() {
 							@Override
 							public void onSkuDetailsResponse(BillingResult billingResult, List<SkuDetails> skuDetailsList) {
@@ -247,15 +262,6 @@ public class BillingManager implements PurchasesUpdatedListener {
 		return Collections.unmodifiableList(mPurchases);
 	}
 
-
-	public String getPayload() {
-		return mPayload;
-	}
-
-	public void setPayload(String payload) {
-		this.mPayload = payload;
-	}
-
 	/**
 	 * Handles the purchase
 	 * <p>Note: Notice that for each purchase, we check if signature is valid on the client.
@@ -274,13 +280,9 @@ public class BillingManager implements PurchasesUpdatedListener {
 		if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
 			// Acknowledge the purchase if it hasn't already been acknowledged.
 			if (!purchase.isAcknowledged()) {
-				AcknowledgePurchaseParams.Builder builder =
-						AcknowledgePurchaseParams.newBuilder()
-								.setPurchaseToken(purchase.getPurchaseToken());
-				if (!Algorithms.isEmpty(mPayload)) {
-					builder.setDeveloperPayload(mPayload);
-				}
-				AcknowledgePurchaseParams acknowledgePurchaseParams = builder.build();
+				AcknowledgePurchaseParams acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder()
+						.setPurchaseToken(purchase.getPurchaseToken())
+						.build();
 				mBillingClient.acknowledgePurchase(acknowledgePurchaseParams, new AcknowledgePurchaseResponseListener() {
 					@Override
 					public void onAcknowledgePurchaseResponse(BillingResult billingResult) {
@@ -404,6 +406,14 @@ public class BillingManager implements PurchasesUpdatedListener {
 		});
 	}
 
+	public void setObfuscatedAccountId(String obfuscatedAccountId) {
+		mObfuscatedAccountId = obfuscatedAccountId;
+	}
+
+	public void setObfuscatedProfileId(String obfuscatedProfileId) {
+		mObfuscatedProfileId = obfuscatedProfileId;
+	}
+
 	private void executeServiceRequest(Runnable runnable) {
 		if (mIsServiceConnected) {
 			runnable.run();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
index c4799987f0..946351baa0 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
@@ -50,7 +50,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.ColorDialogs;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
@@ -68,6 +67,7 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -126,7 +126,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-	                         Bundle savedInstanceState) {
+							 Bundle savedInstanceState) {
 
 		app = requireMyApplication();
 		nightMode = app.getDaynightHelper().isNightModeForMapControls();
@@ -146,7 +146,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		selectedShape = getBackgroundType();
 		selectedIcon = getIconId();
 
-		Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
+		Toolbar toolbar = view.findViewById(R.id.toolbar);
 		toolbar.setBackgroundColor(ContextCompat.getColor(requireContext(),
 				nightMode ? R.color.app_bar_color_dark : R.color.list_background_color_light));
 		toolbar.setTitle(getToolbarTitle());
@@ -161,7 +161,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 			}
 		});
 
-		final ScrollView scrollView = (ScrollView) view.findViewById(R.id.editor_scroll_view);
+		final ScrollView scrollView = view.findViewById(R.id.editor_scroll_view);
 		scrollViewY = scrollView.getScrollY();
 		scrollView.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() {
 			@Override
@@ -177,14 +177,14 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		});
 
 		final int activeColorResId = getActiveColorRes();
-		ImageView toolbarAction = (ImageView) view.findViewById(R.id.toolbar_action);
+		ImageView toolbarAction = view.findViewById(R.id.toolbar_action);
 		view.findViewById(R.id.background_layout).setBackgroundResource(nightMode
 				? R.color.app_bar_color_dark : R.color.list_background_color_light);
-		ImageView replaceIcon = (ImageView) view.findViewById(R.id.replace_action_icon);
+		ImageView replaceIcon = view.findViewById(R.id.replace_action_icon);
 		replaceIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_replace, activeColorResId));
-		ImageView deleteIcon = (ImageView) view.findViewById(R.id.delete_action_icon);
+		ImageView deleteIcon = view.findViewById(R.id.delete_action_icon);
 		deleteIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_delete_dark, activeColorResId));
-		ImageView groupListIcon = (ImageView) view.findViewById(R.id.group_list_button_icon);
+		ImageView groupListIcon = view.findViewById(R.id.group_list_button_icon);
 		groupListIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_group_select_all, activeColorResId));
 		addToHiddenGroupInfo = view.findViewById(R.id.add_hidden_group_info);
 		addToHiddenGroupInfo.setText(getString(R.string.add_hidden_group_info, getString(R.string.shared_string_my_places)));
@@ -193,7 +193,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 			@Override
 			public void onClick(View v) {
 				FragmentManager fragmentManager = getFragmentManager();
-				DialogFragment dialogFragment  = createSelectCategoryDialog();
+				DialogFragment dialogFragment = createSelectCategoryDialog();
 				if (fragmentManager != null && dialogFragment != null) {
 					dialogFragment.show(fragmentManager, SelectFavoriteCategoryBottomSheet.class.getSimpleName());
 				}
@@ -220,10 +220,10 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		UiUtilities.setupDialogButton(nightMode, cancelButton, UiUtilities.DialogButtonType.SECONDARY, R.string.shared_string_cancel);
 		UiUtilities.setupDialogButton(nightMode, saveButton, UiUtilities.DialogButtonType.PRIMARY, R.string.shared_string_save);
 
-		final TextInputLayout nameCaption = (TextInputLayout) view.findViewById(R.id.name_caption);
+		final TextInputLayout nameCaption = view.findViewById(R.id.name_caption);
 		nameCaption.setHint(getString(R.string.shared_string_name));
 
-		nameEdit = (EditText) view.findViewById(R.id.name_edit);
+		nameEdit = view.findViewById(R.id.name_edit);
 		nameEdit.setText(getNameInitValue());
 		nameEdit.addTextChangedListener(new TextWatcher() {
 			@Override
@@ -241,15 +241,15 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		});
 
 		checkEmptyName(nameEdit.getText(), nameCaption, saveButton);
-		nameIcon = (ImageView) view.findViewById(R.id.name_icon);
+		nameIcon = view.findViewById(R.id.name_icon);
 		TextView categoryEdit = view.findViewById(R.id.groupName);
 		if (categoryEdit != null) {
 			AndroidUtils.setTextPrimaryColor(view.getContext(), categoryEdit, nightMode);
 			categoryEdit.setText(getCategoryInitValue());
 		}
 
-		descriptionEdit = (EditText) view.findViewById(R.id.description_edit);
-		addressEdit = (EditText) view.findViewById(R.id.address_edit);
+		descriptionEdit = view.findViewById(R.id.description_edit);
+		addressEdit = view.findViewById(R.id.address_edit);
 		AndroidUtils.setTextPrimaryColor(view.getContext(), descriptionEdit, nightMode);
 		AndroidUtils.setTextPrimaryColor(view.getContext(), addressEdit, nightMode);
 		AndroidUtils.setHintTextSecondaryColor(view.getContext(), descriptionEdit, nightMode);
@@ -260,7 +260,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 
 		descriptionCaption = view.findViewById(R.id.description);
 		addressCaption = view.findViewById(R.id.address);
-		addDelDescription = (TextView) view.findViewById(R.id.description_button);
+		addDelDescription = view.findViewById(R.id.description_button);
 		addAddressBtn = view.findViewById(R.id.address_button);
 		deleteAddressIcon = view.findViewById(R.id.delete_address_icon);
 		deleteAddressIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_trash_basket_16, activeColorResId));
@@ -522,8 +522,10 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		FlowLayout selectShape = view.findViewById(R.id.select_shape);
 		for (BackgroundType backgroundType : BackgroundType.values()) {
 			if (backgroundType.isSelected()) {
+				int minimalPaddingBetweenIcon = app.getResources().getDimensionPixelSize(R.dimen.favorites_select_icon_button_right_padding);
 				selectShape.addView(createShapeItemView(backgroundType, selectShape),
-						new FlowLayout.LayoutParams(0, 0));
+						new FlowLayout.LayoutParams(minimalPaddingBetweenIcon, 0));
+				selectShape.setHorizontalAutoSpacing(true);
 			}
 		}
 	}
@@ -564,7 +566,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		((TextView) rootView.findViewById(R.id.shape_name)).setText(backgroundType.getNameId());
 		ImageView background = newShape.findViewById(R.id.background);
 		background.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, backgroundType.getIconId()),
-						selectedColor));
+				selectedColor));
 		selectedShape = backgroundType;
 		setBackgroundType(backgroundType);
 		updateNameIcon();
@@ -572,9 +574,9 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 
 	private void setShapeSelectorBackground(BackgroundType backgroundType, ImageView background) {
 		background.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, backgroundType.getIconId()),
-						ContextCompat.getColor(app,
-								nightMode ? R.color.inactive_buttons_and_links_bg_dark
-										: R.color.inactive_buttons_and_links_bg_light)));
+				ContextCompat.getColor(app,
+						nightMode ? R.color.inactive_buttons_and_links_bg_dark
+								: R.color.inactive_buttons_and_links_bg_light)));
 	}
 
 	private String getInitCategory() {
@@ -646,7 +648,9 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 			horizontalSelectionAdapter.notifyDataSetChanged();
 			iconCategoriesRecyclerView.smoothScrollToPosition(horizontalSelectionAdapter.getItemPositionByTitle(selectedIconCategory));
 			for (String name : iconNameList) {
-				selectIcon.addView(createIconItemView(name, selectIcon), new FlowLayout.LayoutParams(0, 0));
+				int minimalPaddingBetweenIcon = app.getResources().getDimensionPixelSize(R.dimen.favorites_select_icon_button_right_padding);
+				selectIcon.addView(createIconItemView(name, selectIcon), new FlowLayout.LayoutParams(minimalPaddingBetweenIcon, 0));
+				selectIcon.setHorizontalAutoSpacing(true);
 			}
 		}
 	}
@@ -704,9 +708,9 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 
 	private void setIconSelectorBackground(ImageView backgroundCircle) {
 		backgroundCircle.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_point_circle),
-						ContextCompat.getColor(app, nightMode
-								? R.color.inactive_buttons_and_links_bg_dark
-								: R.color.inactive_buttons_and_links_bg_light)));
+				ContextCompat.getColor(app, nightMode
+						? R.color.inactive_buttons_and_links_bg_dark
+						: R.color.inactive_buttons_and_links_bg_light)));
 	}
 
 	private void updateNameIcon() {
@@ -723,7 +727,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 			byte[] buffer = new byte[size];
 			is.read(buffer);
 			is.close();
-			json = new String(buffer, "UTF-8");
+			json = new String(buffer, StandardCharsets.UTF_8);
 		} catch (IOException ex) {
 			ex.printStackTrace();
 			return null;
diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java
index 670375c0b5..f296115c3e 100644
--- a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java
+++ b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java
@@ -41,6 +41,8 @@ public abstract class OnlineRoutingEngine implements Cloneable {
 	private final Set<EngineParameter> allowedParameters = new HashSet<>();
 
 	public OnlineRoutingEngine(@Nullable Map<String, String> params) {
+		// Params represents the entire state of an engine object.
+		// An engine object with null params used only to provide information about the engine type
 		if (!isEmpty(params)) {
 			this.params.putAll(params);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/ShowHideOSMBugAction.java b/OsmAnd/src/net/osmand/plus/osmedit/ShowHideOSMBugAction.java
index 39082ea6e9..5d2ed59049 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/ShowHideOSMBugAction.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/ShowHideOSMBugAction.java
@@ -15,10 +15,10 @@ import net.osmand.plus.quickaction.QuickActionType;
 public class ShowHideOSMBugAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(24,
-			"osmbug.showhide", ShowHideOSMBugAction.class).
-			nameRes(R.string.quick_action_showhide_osmbugs_title).iconRes(R.drawable.ic_action_osm_note).nonEditable().
-			category(QuickActionType.CONFIGURE_MAP);
-
+			"osmbug.showhide", ShowHideOSMBugAction.class)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.osm_notes).iconRes(R.drawable.ic_action_osm_note).nonEditable()
+			.category(QuickActionType.CONFIGURE_MAP);
 
 	public ShowHideOSMBugAction() {
 		super(TYPE);
@@ -55,10 +55,9 @@ public class ShowHideOSMBugAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-
-		return application.getSettings().SHOW_OSM_BUGS.get()
-				? application.getString(R.string.quick_action_osmbugs_hide)
-				: application.getString(R.string.quick_action_osmbugs_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/AddQuickActionDialog.java b/OsmAnd/src/net/osmand/plus/quickaction/AddQuickActionDialog.java
index 41a25beb12..9183338021 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/AddQuickActionDialog.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/AddQuickActionDialog.java
@@ -53,7 +53,13 @@ public class AddQuickActionDialog extends MenuBottomSheetDialogFragment {
                         null, false);
                 TextView title = itemView.findViewById(R.id.title);
                 ImageView icon = itemView.findViewById(R.id.image);
-                title.setText(action.getNameRes());
+                if (action.getActionNameRes() != 0) {
+                    String name = getString(action.getNameRes());
+                    String actionName =  getString(action.getActionNameRes());
+                    title.setText(getString(R.string.ltr_or_rtl_combine_via_dash, actionName, name));
+                } else {
+                    title.setText(action.getNameRes());
+                }
                 icon.setImageResource(action.getIconRes());
                 items.add(new BaseBottomSheetItem.Builder()
                         .setCustomView(itemView)
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java b/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java
index 81476161f9..819c0b9b77 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/CreateEditActionDialog.java
@@ -197,13 +197,12 @@ public class CreateEditActionDialog extends DialogFragment
     }
 
     private void setupHeader(View root, Bundle savedInstanceState){
-
         ImageView image = (ImageView) root.findViewById(R.id.image);
-        EditText name = (EditText) root.findViewById(R.id.name);
+        EditText nameEditText = (EditText) root.findViewById(R.id.name);
         int buttonsAndLinksTextColorResId = isLightContent ? R.color.active_buttons_and_links_text_light : R.color.active_buttons_and_links_text_dark;
-        name.setTextColor(ContextCompat.getColor(getContext(), buttonsAndLinksTextColorResId));
+        nameEditText.setTextColor(ContextCompat.getColor(getContext(), buttonsAndLinksTextColorResId));
 
-        name.addTextChangedListener(new TextWatcher() {
+        nameEditText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
@@ -218,12 +217,20 @@ public class CreateEditActionDialog extends DialogFragment
             }
         });
 
-        name.setEnabled(action.isActionEditable());
-        action.setAutoGeneratedTitle(name);
-
-        if (savedInstanceState == null) name.setText(action.getName(getContext()));
-        else action.setName(name.getText().toString());
+        nameEditText.setEnabled(action.isActionEditable());
+        action.setAutoGeneratedTitle(nameEditText);
 
+        if (savedInstanceState == null) {
+            String name = action.getName(getContext());
+            if (action.getActionNameRes() != 0) {
+                String actionName = getString(action.getActionNameRes());
+                nameEditText.setText(getString(R.string.ltr_or_rtl_combine_via_dash, actionName, name));
+            } else {
+                nameEditText.setText(name);
+            }
+        } else {
+        	action.setName(nameEditText.getText().toString());
+		}
         image.setImageResource(action.getIconRes(getApplication()));
     }
 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickAction.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickAction.java
index c2e73cdc1b..dafbbbac49 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickAction.java
@@ -48,6 +48,10 @@ public class QuickAction {
     	return actionType == null ? 0 : actionType.getNameRes();
     }
 
+	public int getActionNameRes() {
+		return actionType == null ? 0 : actionType.getActionNameRes();
+	}
+
     public int getIconRes() {
 		return actionType == null ? 0 : actionType.getIconRes();
     }
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
index 9ea226366a..f1d4bac7e5 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
@@ -66,6 +66,8 @@ public class QuickActionRegistry {
 			nameRes(R.string.quick_action_add_configure_map).category(QuickActionType.CONFIGURE_MAP);
 	public static final QuickActionType TYPE_NAVIGATION = new QuickActionType(0, "").
 			nameRes(R.string.quick_action_add_navigation).category(QuickActionType.NAVIGATION);
+	public static final QuickActionType TYPE_CONFIGURE_SCREEN = new QuickActionType(0, "").
+			nameRes(R.string.map_widget_config).category(QuickActionType.CONFIGURE_SCREEN);
 
 
 	private final OsmandSettings settings;
@@ -248,6 +250,7 @@ public class QuickActionRegistry {
 		filterQuickActions(TYPE_ADD_ITEMS, result);
 		filterQuickActions(TYPE_CONFIGURE_MAP, result);
 		filterQuickActions(TYPE_NAVIGATION, result);
+		filterQuickActions(TYPE_CONFIGURE_SCREEN, result);
 		return result;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionType.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionType.java
index 4e201d06e0..9d29039764 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionType.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionType.java
@@ -10,11 +10,13 @@ public class QuickActionType {
 	public static final int CREATE_CATEGORY = 0;
 	public static final int CONFIGURE_MAP = 1;
 	public static final int NAVIGATION = 2;
+	public static final int CONFIGURE_SCREEN = 3;
 
 	private final int id;
 	private final String stringId;
 	private boolean actionEditable;
 	private @StringRes int nameRes;
+	private @StringRes int nameActionRes;
 	private @DrawableRes int iconRes;
 	private Class<? extends QuickAction> cl;
 	private int category;
@@ -36,6 +38,11 @@ public class QuickActionType {
 		return this;
 	}
 
+	public QuickActionType nameActionRes(int nameActionRes) {
+		this.nameActionRes = nameActionRes;
+		return this;
+	}
+
 	public QuickActionType category(int cat) {
 		this.category = cat;
 		return this;
@@ -101,6 +108,10 @@ public class QuickActionType {
 		return nameRes;
 	}
 
+	public int getActionNameRes() {
+		return nameActionRes;
+	}
+
 	public int getIconRes() {
 		return iconRes;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideCoordinatesWidgetAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideCoordinatesWidgetAction.java
index d0f0728c19..225fe3b0e3 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideCoordinatesWidgetAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideCoordinatesWidgetAction.java
@@ -14,9 +14,10 @@ import net.osmand.plus.quickaction.QuickActionType;
 public class ShowHideCoordinatesWidgetAction extends QuickAction {
 	public static final QuickActionType TYPE = new QuickActionType(35,
 			"coordinates.showhide", ShowHideCoordinatesWidgetAction.class)
-			.nameRes(R.string.quick_action_showhide_coordinates_widget)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.coordinates_widget)
 			.iconRes(R.drawable.ic_action_coordinates_widget).nonEditable()
-			.category(QuickActionType.CONFIGURE_MAP);
+			.category(QuickActionType.CONFIGURE_SCREEN);
 
 	public ShowHideCoordinatesWidgetAction() {
 		super(TYPE);
@@ -49,10 +50,9 @@ public class ShowHideCoordinatesWidgetAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-
-		return application.getSettings().SHOW_COORDINATES_WIDGET.get()
-				? application.getString(R.string.quick_action_coordinates_widget_hide)
-				: application.getString(R.string.quick_action_coordinates_widget_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideFavoritesAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideFavoritesAction.java
index 0bad3af2a9..019c27dc07 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideFavoritesAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideFavoritesAction.java
@@ -14,11 +14,11 @@ import net.osmand.plus.quickaction.QuickActionType;
 public class ShowHideFavoritesAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(4,
-			"favorites.showhide", ShowHideFavoritesAction.class).
-			nameRes(R.string.quick_action_showhide_favorites_title).iconRes(R.drawable.ic_action_favorite).nonEditable().
-			category(QuickActionType.CONFIGURE_MAP);
-
-
+			"favorites.showhide", ShowHideFavoritesAction.class)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.shared_string_favorites)
+			.iconRes(R.drawable.ic_action_favorite).nonEditable()
+			.category(QuickActionType.CONFIGURE_MAP);
 
 	public ShowHideFavoritesAction() {
 		super(TYPE);
@@ -51,10 +51,9 @@ public class ShowHideFavoritesAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-
-		return application.getSettings().SHOW_FAVORITES.get()
-				? application.getString(R.string.quick_action_favorites_hide)
-				: application.getString(R.string.quick_action_favorites_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
index 34ce197220..49fb552e9f 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
@@ -16,10 +16,10 @@ public class ShowHideGpxTracksAction extends QuickAction {
 
 
 	public static final QuickActionType TYPE = new QuickActionType(28,
-			"gpx.showhide", ShowHideGpxTracksAction.class).
-			nameRes(R.string.quick_action_show_hide_gpx_tracks).iconRes(R.drawable.ic_action_polygom_dark).nonEditable().
-			category(QuickActionType.CONFIGURE_MAP);
-
+			"gpx.showhide", ShowHideGpxTracksAction.class)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.show_gpx).iconRes(R.drawable.ic_action_polygom_dark).nonEditable()
+			.category(QuickActionType.CONFIGURE_MAP);
 
 	public ShowHideGpxTracksAction() {
 		super(TYPE);
@@ -54,9 +54,9 @@ public class ShowHideGpxTracksAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-		return application.getSelectedGpxHelper().isShowingAnyGpxFiles()
-			? application.getString(R.string.quick_action_gpx_tracks_hide)
-			: application.getString(R.string.quick_action_gpx_tracks_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideMapillaryAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideMapillaryAction.java
index ba6c7d7391..82fa73be91 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideMapillaryAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideMapillaryAction.java
@@ -18,7 +18,8 @@ public class ShowHideMapillaryAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(33,
 			"mapillary.showhide", ShowHideMapillaryAction.class)
-			.nameRes(R.string.quick_action_showhide_mapillary_title)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.mapillary)
 			.iconRes(R.drawable.ic_action_mapillary).nonEditable()
 			.category(QuickActionType.CONFIGURE_MAP);
 
@@ -56,10 +57,9 @@ public class ShowHideMapillaryAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-
-		return application.getSettings().SHOW_MAPILLARY.get()
-				? application.getString(R.string.quick_action_mapillary_hide)
-				: application.getString(R.string.quick_action_mapillary_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
index 51b9b300ed..742045809c 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
@@ -37,10 +37,11 @@ public class ShowHidePoiAction extends QuickAction {
 
 
 	public static final QuickActionType TYPE = new QuickActionType(5,
-			"poi.showhide", ShowHidePoiAction.class).
-			nameRes(R.string.quick_action_showhide_poi_title).iconRes(R.drawable.ic_action_info_dark).
-			category(QuickActionType.CONFIGURE_MAP);
-
+			"poi.showhide", ShowHidePoiAction.class)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.poi)
+			.iconRes(R.drawable.ic_action_info_dark)
+			.category(QuickActionType.CONFIGURE_MAP);
 
 	public static final String KEY_FILTERS = "filters";
 
@@ -56,10 +57,8 @@ public class ShowHidePoiAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-
-		return !isCurrentFilters(application)
-				? application.getString(R.string.quick_action_poi_show, getName(application))
-				: application.getString(R.string.quick_action_poi_hide, getName(application));
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, getName(application));
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java
index 61f04f2c6f..2e4dd985ed 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java
@@ -16,7 +16,8 @@ public class ShowHideTransportLinesAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(31,
 			"transport.showhide", ShowHideTransportLinesAction.class)
-			.nameRes(R.string.quick_action_show_hide_transport)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.poi_filter_public_transport)
 			.iconRes(R.drawable.ic_action_transport_bus).nonEditable()
 			.category(QuickActionType.CONFIGURE_MAP);
 
@@ -48,10 +49,9 @@ public class ShowHideTransportLinesAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-
-		return TransportLinesMenu.isShowLines(application)
-				? application.getString(R.string.quick_action_transport_hide)
-				: application.getString(R.string.quick_action_transport_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 9badea394e..22b75072ec 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -513,7 +513,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 						List<HistoryEntry> historyEntries = new ArrayList<HistoryEntry>();
 						List<QuickSearchListItem> selectedItems = historySearchFragment.getListAdapter().getSelectedItems();
 						for (QuickSearchListItem searchListItem : selectedItems) {
-							Object object = searchListItem.getSearchResult().object;
+							Object object = searchListItem.getSearchResult().object;;
 							if (object instanceof HistoryEntry) {
 								historyEntries.add((HistoryEntry) object);
 							}
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java
index 1213f550c1..2cf4226e12 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java
@@ -23,6 +23,8 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.plus.poi.NominatimPoiFilter;
@@ -457,6 +459,15 @@ public class QuickSearchHelper implements ResourceListener {
 						sr.objectType = ObjectType.POI_TYPE;
 						publish = true;
 					}
+				} else if (pd.isGpxFile()) {
+					GPXInfo gpxInfo = GpxUiHelper.getGpxInfoByFileName(app, pd.getName());
+					if (gpxInfo != null) {
+						sr.localeName = gpxInfo.getFileName();
+						sr.object = point;
+						sr.objectType = ObjectType.GPX_TRACK;
+						sr.relatedObject = gpxInfo;
+						publish = true;
+					}
 				} else {
 					sr.localeName = pd.getName();
 					sr.object = point;
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
index 9251e555b0..c9a3d1d5e9 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
@@ -10,12 +10,10 @@ import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -32,8 +30,9 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities.UpdateLocationViewCache;
 import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.search.listitems.QuickSearchBannerListItem;
-import net.osmand.plus.search.listitems.QuickSearchFreeBannerListItem;
 import net.osmand.plus.mapcontextmenu.MenuController;
 import net.osmand.plus.search.listitems.QuickSearchHeaderListItem;
 import net.osmand.plus.search.listitems.QuickSearchListItem;
@@ -41,7 +40,9 @@ import net.osmand.plus.search.listitems.QuickSearchListItemType;
 import net.osmand.plus.search.listitems.QuickSearchMoreListItem;
 import net.osmand.plus.search.listitems.QuickSearchSelectAllListItem;
 import net.osmand.search.SearchUICore;
+import net.osmand.search.core.ObjectType;
 import net.osmand.search.core.SearchPhrase;
+import net.osmand.search.core.SearchResult;
 import net.osmand.search.core.SearchWord;
 import net.osmand.util.Algorithms;
 import net.osmand.util.OpeningHoursParser;
@@ -209,143 +210,326 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 	public View getView(final int position, View convertView, @NonNull ViewGroup parent) {
 		final QuickSearchListItem listItem = getItem(position);
 		QuickSearchListItemType type = listItem.getType();
+
 		LinearLayout view;
 		if (type == QuickSearchListItemType.BANNER) {
-			final QuickSearchBannerListItem banner = (QuickSearchBannerListItem) listItem;
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.search_banner_list_item, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-
-			((TextView) view.findViewById(R.id.empty_search_description)).setText(R.string.nothing_found_descr);
-
-			SearchUICore searchUICore = app.getSearchUICore().getCore();
-			SearchPhrase searchPhrase = searchUICore.getPhrase();
-
-			String textTitle;
-			int minimalSearchRadius = searchUICore.getMinimalSearchRadius(searchPhrase);
-			if (searchUICore.isSearchMoreAvailable(searchPhrase) && minimalSearchRadius != Integer.MAX_VALUE) {
-				double rd = OsmAndFormatter.calculateRoundedDist(minimalSearchRadius, app);
-				textTitle = app.getString(R.string.nothing_found_in_radius) + " "
-						+ OsmAndFormatter.getFormattedDistance((float) rd, app, false);
-			} else {
-				textTitle = app.getString(R.string.search_nothing_found);
-			}
-			((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
-
-			ViewGroup buttonContainer = view.findViewById(R.id.buttons_container);
-			if (buttonContainer != null) {
-				buttonContainer.removeAllViews();
-				for (ButtonItem button : banner.getButtonItems()) {
-					View v = inflater.inflate(R.layout.search_banner_button_list_item, null);
-					TextView title = v.findViewById(R.id.title);
-					title.setText(button.getTitle());
-					ImageView icon = v.findViewById(R.id.icon);
-					if (button.getIconId() != INVALID_ID) {
-						icon.setImageResource(button.getIconId());
-						icon.setVisibility(View.VISIBLE);
-					} else {
-						icon.setVisibility(View.GONE);
-					}
-					v.setOnClickListener(button.getListener());
-					buttonContainer.addView(v);
-				}
-			}
+			view = bindBannerItem(convertView, listItem);
 		} else if (type == QuickSearchListItemType.FREE_VERSION_BANNER) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(
-						R.layout.read_wikipedia_ofline_banner, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-
-			View btnGet = view.findViewById(R.id.btn_get);
-			if (btnGet != null) {
-				btnGet.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						ChoosePlanDialogFragment.showWikipediaInstance(
-								activity.getSupportFragmentManager());
-					}
-				});
-			}
+			view = bindFreeVersionBannerItem(convertView);
 		} else if (type == QuickSearchListItemType.SEARCH_MORE) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.search_more_list_item, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-
-			if (listItem.getSpannableName() != null) {
-				((TextView) view.findViewById(R.id.title)).setText(listItem.getSpannableName());
-			} else {
-				((TextView) view.findViewById(R.id.title)).setText(listItem.getName());
-			}
-
-			final QuickSearchMoreListItem searchMoreItem = (QuickSearchMoreListItem) listItem;
-			int emptyDescId = searchMoreItem.isSearchMoreAvailable() ? R.string.nothing_found_descr : R.string.modify_the_search_query;
-			((TextView) view.findViewById(R.id.empty_search_description)).setText(emptyDescId);
-
-			boolean emptySearchVisible = searchMoreItem.isEmptySearch() && !searchMoreItem.isInterruptedSearch();
-			boolean moreDividerVisible = emptySearchVisible && searchMoreItem.isSearchMoreAvailable();
-			view.findViewById(R.id.empty_search).setVisibility(emptySearchVisible ? View.VISIBLE : View.GONE);
-			view.findViewById(R.id.more_divider).setVisibility(moreDividerVisible ? View.VISIBLE : View.GONE);
-			SearchUICore searchUICore = app.getSearchUICore().getCore();
-			SearchPhrase searchPhrase = searchUICore.getPhrase();
-
-			String textTitle;
-			int minimalSearchRadius = searchUICore.getMinimalSearchRadius(searchPhrase);
-			if (searchUICore.isSearchMoreAvailable(searchPhrase) && minimalSearchRadius != Integer.MAX_VALUE) {
-				double rd = OsmAndFormatter.calculateRoundedDist(minimalSearchRadius, app);
-				textTitle = app.getString(R.string.nothing_found_in_radius) + " "
-						+ OsmAndFormatter.getFormattedDistance((float) rd, app, false);
-			} else {
-				textTitle = app.getString(R.string.search_nothing_found);
-			}
-			((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
-			View primaryButton = view.findViewById(R.id.primary_button);
-
-			((TextView) view.findViewById(R.id.title)).setText(getIncreaseSearchButtonTitle(app, searchPhrase));
-			
-			primaryButton.setVisibility(searchMoreItem.isSearchMoreAvailable() ? View.VISIBLE : View.GONE);
-			primaryButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					((QuickSearchMoreListItem) listItem).onPrimaryButtonClick();
-				}
-			});
-
-			View secondaryButton = view.findViewById(R.id.secondary_button);
-			secondaryButton.setVisibility(searchMoreItem.isSecondaryButtonVisible() ?
-					View.VISIBLE : View.GONE);
-			secondaryButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					searchMoreItem.onSecondaryButtonClick();
-				}
-			});
+			view = bindSearchMoreItem(convertView, listItem);
 		} else if (type == QuickSearchListItemType.BUTTON) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.search_custom_list_item, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-			((ImageView) view.findViewById(R.id.imageView)).setImageDrawable(listItem.getIcon());
-			if (listItem.getSpannableName() != null) {
-				((TextView) view.findViewById(R.id.title)).setText(listItem.getSpannableName());
-			} else {
-				((TextView) view.findViewById(R.id.title)).setText(listItem.getName());
-			}
+			view = bindButtonItem(convertView, listItem);
 		} else if (type == QuickSearchListItemType.SELECT_ALL) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.select_all_list_item, null);
-			} else {
-				view = (LinearLayout) convertView;
+			view = bindSelectAllItem(position, convertView);
+		} else if (type == QuickSearchListItemType.HEADER) {
+			view = bindHeaderItem(convertView, listItem);
+		} else if (type == QuickSearchListItemType.TOP_SHADOW) {
+			return bindTopShadowItem(convertView);
+		} else if (type == QuickSearchListItemType.BOTTOM_SHADOW) {
+			return bindBottomShadowItem(convertView);
+		} else {
+			view = bindSearchResultItem(position, convertView, listItem);
+		}
+
+		setupBackground(view);
+		setupDivider(position, view, listItem);
+		ViewCompat.setAccessibilityDelegate(view, accessibilityAssistant);
+		return view;
+	}
+
+	private LinearLayout bindBannerItem(@Nullable View convertView,
+	                                    @NonNull QuickSearchListItem listItem) {
+		QuickSearchBannerListItem banner = (QuickSearchBannerListItem) listItem;
+		LinearLayout view = getLinearLayout(convertView, R.layout.search_banner_list_item);
+		((TextView) view.findViewById(R.id.empty_search_description)).setText(R.string.nothing_found_descr);
+
+		SearchUICore searchUICore = app.getSearchUICore().getCore();
+		SearchPhrase searchPhrase = searchUICore.getPhrase();
+
+		String textTitle;
+		int minimalSearchRadius = searchUICore.getMinimalSearchRadius(searchPhrase);
+		if (searchUICore.isSearchMoreAvailable(searchPhrase) && minimalSearchRadius != Integer.MAX_VALUE) {
+			double rd = OsmAndFormatter.calculateRoundedDist(minimalSearchRadius, app);
+			textTitle = app.getString(R.string.nothing_found_in_radius) + " "
+					+ OsmAndFormatter.getFormattedDistance((float) rd, app, false);
+		} else {
+			textTitle = app.getString(R.string.search_nothing_found);
+		}
+		((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
+
+		ViewGroup buttonContainer = view.findViewById(R.id.buttons_container);
+		if (buttonContainer != null) {
+			buttonContainer.removeAllViews();
+			for (ButtonItem button : banner.getButtonItems()) {
+				View v = inflater.inflate(R.layout.search_banner_button_list_item, null);
+				TextView title = v.findViewById(R.id.title);
+				title.setText(button.getTitle());
+				ImageView icon = v.findViewById(R.id.icon);
+				if (button.getIconId() != INVALID_ID) {
+					icon.setImageResource(button.getIconId());
+					icon.setVisibility(View.VISIBLE);
+				} else {
+					icon.setVisibility(View.GONE);
+				}
+				v.setOnClickListener(button.getListener());
+				buttonContainer.addView(v);
 			}
-			final CheckBox ch = (CheckBox) view.findViewById(R.id.toggle_item);
+		}
+		return view;
+	}
+
+	private LinearLayout bindFreeVersionBannerItem(@Nullable View convertView) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.read_wikipedia_ofline_banner);
+		View btnGet = view.findViewById(R.id.btn_get);
+		if (btnGet != null) {
+			btnGet.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					ChoosePlanDialogFragment.showWikipediaInstance(
+							activity.getSupportFragmentManager());
+				}
+			});
+		}
+		return view;
+	}
+
+	private LinearLayout bindSearchMoreItem(@Nullable View convertView,
+	                                        @NonNull final QuickSearchListItem listItem) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.search_more_list_item);
+
+		if (listItem.getSpannableName() != null) {
+			((TextView) view.findViewById(R.id.title)).setText(listItem.getSpannableName());
+		} else {
+			((TextView) view.findViewById(R.id.title)).setText(listItem.getName());
+		}
+
+		final QuickSearchMoreListItem searchMoreItem = (QuickSearchMoreListItem) listItem;
+		int emptyDescId = searchMoreItem.isSearchMoreAvailable() ? R.string.nothing_found_descr : R.string.modify_the_search_query;
+		((TextView) view.findViewById(R.id.empty_search_description)).setText(emptyDescId);
+
+		boolean emptySearchVisible = searchMoreItem.isEmptySearch() && !searchMoreItem.isInterruptedSearch();
+		boolean moreDividerVisible = emptySearchVisible && searchMoreItem.isSearchMoreAvailable();
+		view.findViewById(R.id.empty_search).setVisibility(emptySearchVisible ? View.VISIBLE : View.GONE);
+		view.findViewById(R.id.more_divider).setVisibility(moreDividerVisible ? View.VISIBLE : View.GONE);
+		SearchUICore searchUICore = app.getSearchUICore().getCore();
+		SearchPhrase searchPhrase = searchUICore.getPhrase();
+
+		String textTitle;
+		int minimalSearchRadius = searchUICore.getMinimalSearchRadius(searchPhrase);
+		if (searchUICore.isSearchMoreAvailable(searchPhrase) && minimalSearchRadius != Integer.MAX_VALUE) {
+			double rd = OsmAndFormatter.calculateRoundedDist(minimalSearchRadius, app);
+			textTitle = app.getString(R.string.nothing_found_in_radius) + " "
+					+ OsmAndFormatter.getFormattedDistance((float) rd, app, false);
+		} else {
+			textTitle = app.getString(R.string.search_nothing_found);
+		}
+		((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
+		View primaryButton = view.findViewById(R.id.primary_button);
+
+		((TextView) view.findViewById(R.id.title)).setText(getIncreaseSearchButtonTitle(app, searchPhrase));
+
+		primaryButton.setVisibility(searchMoreItem.isSearchMoreAvailable() ? View.VISIBLE : View.GONE);
+		primaryButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				((QuickSearchMoreListItem) listItem).onPrimaryButtonClick();
+			}
+		});
+
+		View secondaryButton = view.findViewById(R.id.secondary_button);
+		secondaryButton.setVisibility(searchMoreItem.isSecondaryButtonVisible() ?
+				View.VISIBLE : View.GONE);
+		secondaryButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				searchMoreItem.onSecondaryButtonClick();
+			}
+		});
+		return view;
+	}
+
+	private LinearLayout bindButtonItem(@Nullable View convertView,
+	                                    @NonNull QuickSearchListItem listItem) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.search_custom_list_item);
+		((ImageView) view.findViewById(R.id.imageView)).setImageDrawable(listItem.getIcon());
+		if (listItem.getSpannableName() != null) {
+			((TextView) view.findViewById(R.id.title)).setText(listItem.getSpannableName());
+		} else {
+			((TextView) view.findViewById(R.id.title)).setText(listItem.getName());
+		}
+		return view;
+	}
+
+	private LinearLayout bindSelectAllItem(final int position,
+	                                       @Nullable View convertView) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.select_all_list_item);
+		final CheckBox ch = (CheckBox) view.findViewById(R.id.toggle_item);
+		ch.setVisibility(View.VISIBLE);
+		ch.setChecked(selectAll);
+		ch.setOnClickListener(new View.OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				toggleCheckbox(position, ch);
+			}
+		});
+		return view;
+	}
+
+	private LinearLayout bindHeaderItem(@Nullable View convertView,
+	                                    @NonNull QuickSearchListItem listItem) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.search_header_list_item);
+		view.findViewById(R.id.top_divider)
+				.setVisibility(((QuickSearchHeaderListItem)listItem).isShowTopDivider() ? View.VISIBLE : View.GONE);
+		if (listItem.getSpannableName() != null) {
+			((TextView) view.findViewById(R.id.title)).setText(listItem.getSpannableName());
+		} else {
+			((TextView) view.findViewById(R.id.title)).setText(listItem.getName());
+		}
+		return view;
+	}
+
+	private LinearLayout bindTopShadowItem(@Nullable View convertView) {
+		return getLinearLayout(convertView, R.layout.list_shadow_header);
+	}
+
+	private LinearLayout bindBottomShadowItem(@Nullable View convertView) {
+		return getLinearLayout(convertView, R.layout.list_shadow_footer);
+	}
+
+	private LinearLayout bindSearchResultItem(int position,
+	                                          @Nullable View convertView,
+	                                          @NonNull QuickSearchListItem listItem) {
+		SearchResult sr = listItem.getSearchResult();
+		if (sr != null && sr.objectType == ObjectType.GPX_TRACK) {
+			return bindGpxTrack(position, convertView, listItem, (GPXInfo) sr.relatedObject);
+		} else {
+			return bindSearchResult(position, convertView, listItem);
+		}
+	}
+
+	private LinearLayout bindGpxTrack(int position,
+	                                  @Nullable View convertView,
+	                                  @NonNull QuickSearchListItem listItem,
+	                                  @NonNull GPXInfo gpxInfo) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.search_gpx_list_item);
+		SearchResult sr = listItem.getSearchResult();
+		setupCheckBox(position, view, listItem);
+		GpxUiHelper.updateGpxInfoView(app, view, sr.localeName, listItem.getIcon(), gpxInfo);
+		return view;
+	}
+
+	private LinearLayout bindSearchResult(int position,
+	                                      @Nullable View convertView,
+	                                      @NonNull QuickSearchListItem listItem) {
+		LinearLayout view = getLinearLayout(convertView, R.layout.search_list_item);
+		setupCheckBox(position, view, listItem);
+
+		ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
+		TextView title = (TextView) view.findViewById(R.id.title);
+		TextView subtitle = (TextView) view.findViewById(R.id.subtitle);
+
+		imageView.setImageDrawable(listItem.getIcon());
+		String name = listItem.getName();
+		if (listItem.getSpannableName() != null) {
+			title.setText(listItem.getSpannableName());
+		} else {
+			title.setText(name);
+		}
+
+		String desc = listItem.getTypeName();
+		Object searchResultObject = listItem.getSearchResult().object;
+		if (searchResultObject instanceof AbstractPoiType) {
+			AbstractPoiType abstractPoiType = (AbstractPoiType) searchResultObject;
+			String synonyms[] = abstractPoiType.getSynonyms().split(";");
+			QuickSearchHelper searchHelper = app.getSearchUICore();
+			SearchUICore searchUICore = searchHelper.getCore();
+			String searchPhrase = searchUICore.getPhrase().getText(true);
+			SearchPhrase.NameStringMatcher nm = new SearchPhrase.NameStringMatcher(searchPhrase,
+					CollatorStringMatcher.StringMatcherMode.CHECK_STARTS_FROM_SPACE);
+
+			if (!searchPhrase.isEmpty() && !nm.matches(abstractPoiType.getTranslation())) {
+				if (nm.matches(abstractPoiType.getEnTranslation())) {
+					desc = listItem.getTypeName() + " (" + abstractPoiType.getEnTranslation() + ")";
+				} else {
+					for (String syn : synonyms) {
+						if (nm.matches(syn)) {
+							desc = listItem.getTypeName() + " (" + syn + ")";
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		boolean hasDesc = false;
+		if (!Algorithms.isEmpty(desc) && !desc.equals(name)) {
+			subtitle.setText(desc);
+			subtitle.setVisibility(View.VISIBLE);
+			hasDesc = true;
+		} else {
+			subtitle.setVisibility(View.GONE);
+		}
+
+		Drawable typeIcon = listItem.getTypeIcon();
+		ImageView group = (ImageView) view.findViewById(R.id.type_name_icon);
+		if (typeIcon != null && hasDesc) {
+			group.setImageDrawable(typeIcon);
+			group.setVisibility(View.VISIBLE);
+		} else {
+			group.setVisibility(View.GONE);
+		}
+
+		LinearLayout timeLayout = (LinearLayout) view.findViewById(R.id.time_layout);
+		TextView timeText = (TextView) view.findViewById(R.id.time);
+		ImageView timeIcon = (ImageView) view.findViewById(R.id.time_icon);
+		if (listItem.getSearchResult().object instanceof Amenity
+				&& ((Amenity) listItem.getSearchResult().object).getOpeningHours() != null) {
+			Amenity amenity = (Amenity) listItem.getSearchResult().object;
+			OpeningHoursParser.OpeningHours rs = OpeningHoursParser.parseOpenedHours(amenity.getOpeningHours());
+			if (rs != null && rs.getInfo() != null) {
+				int colorOpen = R.color.ctx_menu_amenity_opened_text_color;
+				int colorClosed = R.color.ctx_menu_amenity_closed_text_color;
+				SpannableString openHours = MenuController.getSpannableOpeningHours(
+						rs.getInfo(),
+						ContextCompat.getColor(app, colorOpen),
+						ContextCompat.getColor(app, colorClosed));
+				int colorId = rs.isOpenedForTime(Calendar.getInstance()) ? colorOpen : colorClosed;
+				timeLayout.setVisibility(View.VISIBLE);
+				timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_opening_hour_16, colorId));
+				timeText.setText(openHours);
+			} else {
+				timeLayout.setVisibility(View.GONE);
+			}
+		} else {
+			timeLayout.setVisibility(View.GONE);
+		}
+
+		updateCompassVisibility(view, listItem);
+
+		return view;
+	}
+
+	private LinearLayout getLinearLayout(@Nullable View convertView, int layoutId) {
+		if (convertView == null || isLayoutIdChanged(convertView, layoutId)) {
+			convertView = inflater.inflate(layoutId, null);
+			convertView.setTag(layoutId);
+		}
+		return (LinearLayout) convertView;
+	}
+
+	private boolean isLayoutIdChanged(@NonNull View view, int layoutId) {
+		return !Algorithms.objectEquals(view.getTag(), layoutId);
+	}
+
+	private void setupCheckBox(final int position,
+	                           @NonNull View rootView,
+	                           @NonNull QuickSearchListItem listItem) {
+		final CheckBox ch = (CheckBox) rootView.findViewById(R.id.toggle_item);
+		if (selectionMode) {
 			ch.setVisibility(View.VISIBLE);
-			ch.setChecked(selectAll);
+			ch.setChecked(selectedItems.contains(listItem));
 			ch.setOnClickListener(new View.OnClickListener() {
 
 				@Override
@@ -353,139 +537,21 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 					toggleCheckbox(position, ch);
 				}
 			});
-		} else if (type == QuickSearchListItemType.HEADER) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.search_header_list_item, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-			view.findViewById(R.id.top_divider)
-					.setVisibility(((QuickSearchHeaderListItem)listItem).isShowTopDivider() ? View.VISIBLE : View.GONE);
-			if (listItem.getSpannableName() != null) {
-				((TextView) view.findViewById(R.id.title)).setText(listItem.getSpannableName());
-			} else {
-				((TextView) view.findViewById(R.id.title)).setText(listItem.getName());
-			}
-		} else if (type == QuickSearchListItemType.TOP_SHADOW) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.list_shadow_header, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-			return view;
-		} else if (type == QuickSearchListItemType.BOTTOM_SHADOW) {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.list_shadow_footer, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-			return view;
 		} else {
-			if (convertView == null) {
-				view = (LinearLayout) inflater.inflate(R.layout.search_list_item, null);
-			} else {
-				view = (LinearLayout) convertView;
-			}
-
-			final CheckBox ch = (CheckBox) view.findViewById(R.id.toggle_item);
-			if (selectionMode) {
-				ch.setVisibility(View.VISIBLE);
-				ch.setChecked(selectedItems.contains(listItem));
-				ch.setOnClickListener(new View.OnClickListener() {
-
-					@Override
-					public void onClick(View v) {
-						toggleCheckbox(position, ch);
-					}
-				});
-			} else {
-				ch.setVisibility(View.GONE);
-			}
-
-			ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
-			TextView title = (TextView) view.findViewById(R.id.title);
-			TextView subtitle = (TextView) view.findViewById(R.id.subtitle);
-
-			imageView.setImageDrawable(listItem.getIcon());
-			String name = listItem.getName();
-			if (listItem.getSpannableName() != null) {
-				title.setText(listItem.getSpannableName());
-			} else {
-				title.setText(name);
-			}
-
-			String desc = listItem.getTypeName();
-			Object searchResultObject = listItem.getSearchResult().object;
-			if (searchResultObject instanceof AbstractPoiType) {
-				AbstractPoiType abstractPoiType = (AbstractPoiType) searchResultObject;
-				String synonyms[] = abstractPoiType.getSynonyms().split(";");
-				QuickSearchHelper searchHelper = app.getSearchUICore();
-				SearchUICore searchUICore = searchHelper.getCore();
-				String searchPhrase = searchUICore.getPhrase().getText(true);
-				SearchPhrase.NameStringMatcher nm = new SearchPhrase.NameStringMatcher(searchPhrase,
-						CollatorStringMatcher.StringMatcherMode.CHECK_STARTS_FROM_SPACE);
-
-				if (!searchPhrase.isEmpty() && !nm.matches(abstractPoiType.getTranslation())) {
-					if (nm.matches(abstractPoiType.getEnTranslation())) {
-						desc = listItem.getTypeName() + " (" + abstractPoiType.getEnTranslation() + ")";
-					} else {
-						for (String syn : synonyms) {
-							if (nm.matches(syn)) {
-								desc = listItem.getTypeName() + " (" + syn + ")";
-								break;
-							}
-						}
-					}
-				}
-			}
-
-			boolean hasDesc = false;
-			if (!Algorithms.isEmpty(desc) && !desc.equals(name)) {
-				subtitle.setText(desc);
-				subtitle.setVisibility(View.VISIBLE);
-				hasDesc = true;
-			} else {
-				subtitle.setVisibility(View.GONE);
-			}
-
-			Drawable typeIcon = listItem.getTypeIcon();
-			ImageView group = (ImageView) view.findViewById(R.id.type_name_icon);
-			if (typeIcon != null && hasDesc) {
-				group.setImageDrawable(typeIcon);
-				group.setVisibility(View.VISIBLE);
-			} else {
-				group.setVisibility(View.GONE);
-			}
-
-			LinearLayout timeLayout = (LinearLayout) view.findViewById(R.id.time_layout);
-			TextView timeText = (TextView) view.findViewById(R.id.time);
-			ImageView timeIcon = (ImageView) view.findViewById(R.id.time_icon);
-			if (listItem.getSearchResult().object instanceof Amenity
-					&& ((Amenity) listItem.getSearchResult().object).getOpeningHours() != null) {
-				Amenity amenity = (Amenity) listItem.getSearchResult().object;
-				OpeningHoursParser.OpeningHours rs = OpeningHoursParser.parseOpenedHours(amenity.getOpeningHours());
-				if (rs != null && rs.getInfo() != null) {
-					int colorOpen = R.color.ctx_menu_amenity_opened_text_color;
-					int colorClosed = R.color.ctx_menu_amenity_closed_text_color;
-					SpannableString openHours = MenuController.getSpannableOpeningHours(
-							rs.getInfo(),
-							ContextCompat.getColor(app, colorOpen),
-							ContextCompat.getColor(app, colorClosed));
-					int colorId = rs.isOpenedForTime(Calendar.getInstance()) ? colorOpen : colorClosed;
-					timeLayout.setVisibility(View.VISIBLE);
-					timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_opening_hour_16, colorId));
-					timeText.setText(openHours);
-				} else {
-					timeLayout.setVisibility(View.GONE);
-				}
-			} else {
-				timeLayout.setVisibility(View.GONE);
-			}
-
-			updateCompassVisibility(view, listItem);
+			ch.setVisibility(View.GONE);
 		}
-		view.setBackgroundColor(app.getResources().getColor(
-						app.getSettings().isLightContent() ? R.color.list_background_color_light : R.color.list_background_color_dark));
+	}
+
+	private void setupBackground(View view) {
+		int bgColorResId = isNightMode() ?
+				R.color.list_background_color_dark :
+				R.color.list_background_color_light;
+		view.setBackgroundColor(app.getResources().getColor(bgColorResId));
+	}
+
+	private void setupDivider(final int position,
+	                          @NonNull View view,
+	                          @NonNull QuickSearchListItem listItem) {
 		View divider = view.findViewById(R.id.divider);
 		if (divider != null) {
 			if (position == getCount() - 1 || getItem(position + 1).getType() == QuickSearchListItemType.HEADER
@@ -494,7 +560,7 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 			} else {
 				divider.setVisibility(View.VISIBLE);
 				if (getItem(position + 1).getType() == QuickSearchListItemType.SEARCH_MORE
-						|| type == QuickSearchListItemType.SELECT_ALL) {
+						|| listItem.getType() == QuickSearchListItemType.SELECT_ALL) {
 					LinearLayout.LayoutParams p = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp1);
 					p.setMargins(0, 0, 0 ,0);
 					divider.setLayoutParams(p);
@@ -505,8 +571,6 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 				}
 			}
 		}
-		ViewCompat.setAccessibilityDelegate(view, accessibilityAssistant);
-		return view;
 	}
 
 	public static String getIncreaseSearchButtonTitle(OsmandApplication app, SearchPhrase searchPhrase) {
@@ -576,4 +640,8 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 		LatLon toloc = listItem.getSearchResult().location;
 		app.getUIUtilities().updateLocationView(updateLocationViewCache, direction, distanceText, toloc);
 	}
+
+	private boolean isNightMode() {
+		return !app.getSettings().isLightContent();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
index f667595650..410f011154 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
@@ -11,6 +11,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
 import net.osmand.GPXUtilities;
+import net.osmand.IndexConstants;
 import net.osmand.data.Amenity;
 import net.osmand.data.City;
 import net.osmand.data.FavouritePoint;
@@ -23,6 +24,8 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.OsmAndListFragment;
+import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
+import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
 import net.osmand.plus.search.listitems.QuickSearchBottomShadowListItem;
@@ -30,10 +33,12 @@ import net.osmand.plus.search.listitems.QuickSearchButtonListItem;
 import net.osmand.plus.search.listitems.QuickSearchListItem;
 import net.osmand.plus.search.listitems.QuickSearchListItemType;
 import net.osmand.plus.search.listitems.QuickSearchTopShadowListItem;
+import net.osmand.plus.track.TrackMenuFragment;
 import net.osmand.search.core.ObjectType;
 import net.osmand.search.core.SearchResult;
 import net.osmand.util.Algorithms;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -95,7 +100,8 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
 							|| sr.objectType == ObjectType.FAVORITE
 							|| sr.objectType == ObjectType.RECENT_OBJ
 							|| sr.objectType == ObjectType.WPT
-							|| sr.objectType == ObjectType.STREET_INTERSECTION) {
+							|| sr.objectType == ObjectType.STREET_INTERSECTION
+							|| sr.objectType == ObjectType.GPX_TRACK) {
 
 						showResult(sr);
 					} else {
@@ -165,7 +171,9 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
 
 	public void showResult(SearchResult searchResult) {
 		showResult = false;
-		if (searchResult.location != null) {
+		if (searchResult.objectType == ObjectType.GPX_TRACK) {
+			showTrackMenuFragment((GPXInfo) searchResult.relatedObject);
+		} else if (searchResult.location != null) {
 			OsmandApplication app = getMyApplication();
 			String lang = searchResult.requiredSearchPhrase.getSettings().getLang();
 			boolean transliterate = searchResult.requiredSearchPhrase.getSettings().isTransliterate();
@@ -292,6 +300,16 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
 		}
 	}
 
+	private void showTrackMenuFragment(GPXInfo gpxInfo) {
+		OsmandApplication app = getMyApplication();
+		MapActivity mapActivity = getMapActivity();
+		SearchHistoryHelper.getInstance(app).addNewItemToHistory(gpxInfo);
+		File file = new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), gpxInfo.getFileName());
+		String path = file.getAbsolutePath();
+		TrackMenuFragment.showInstance(mapActivity, path, false, null, QuickSearchDialogFragment.TAG);
+		dialogFragment.dismiss();
+	}
+
 	public MapActivity getMapActivity() {
 		return (MapActivity) getActivity();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
index 204c31de88..56b0b7a572 100644
--- a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
+++ b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
@@ -359,6 +359,8 @@ public class QuickSearchListItem {
 				} else {
 					return icon;
 				}
+			case GPX_TRACK:
+				return getIcon(app, R.drawable.ic_action_polygom_dark);
 			case LOCATION:
 				return getIcon(app, R.drawable.ic_action_world_globe);
 			case FAVORITE:
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
index 309c89ec47..b649ccf8cd 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
@@ -23,12 +23,24 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.routing.RouteService;
-import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.UiUtilities.DialogButtonType;
@@ -42,7 +54,7 @@ import net.osmand.plus.profiles.SelectProfileBottomSheet.DialogMode;
 import net.osmand.plus.profiles.SelectProfileBottomSheet.OnSelectProfileCallback;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard.CardListener;
-import net.osmand.plus.routing.RouteProvider;
+import net.osmand.plus.routing.RouteService;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.backup.ProfileSettingsItem;
 import net.osmand.plus.settings.backend.backup.SettingsHelper;
@@ -59,21 +71,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-import androidx.recyclerview.widget.RecyclerView;
-
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
 import static net.osmand.plus.profiles.SelectProfileBottomSheet.PROFILES_LIST_UPDATED_ARG;
 import static net.osmand.plus.profiles.SelectProfileBottomSheet.PROFILE_KEY_ARG;
@@ -313,7 +310,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 		outState.putString(PROFILE_STRINGKEY_KEY, changedProfile.stringKey);
 		outState.putInt(PROFILE_ICON_RES_KEY, changedProfile.iconRes);
 		outState.putSerializable(PROFILE_COLOR_KEY, changedProfile.color);
-		outState.putInt(PROFILE_CUSTOM_COLOR_KEY, changedProfile.customColor);
+		outState.putSerializable(PROFILE_CUSTOM_COLOR_KEY, changedProfile.customColor);
 		if (changedProfile.parent != null) {
 			outState.putString(PROFILE_PARENT_KEY, changedProfile.parent.getStringKey());
 		}
@@ -328,7 +325,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 		changedProfile.stringKey = savedInstanceState.getString(PROFILE_STRINGKEY_KEY);
 		changedProfile.iconRes = savedInstanceState.getInt(PROFILE_ICON_RES_KEY);
 		changedProfile.color = (ProfileIconColors) savedInstanceState.getSerializable(PROFILE_COLOR_KEY);
-		changedProfile.customColor = savedInstanceState.getInt(PROFILE_CUSTOM_COLOR_KEY);
+		changedProfile.customColor = (Integer) savedInstanceState.getSerializable(PROFILE_CUSTOM_COLOR_KEY);
 		String parentStringKey = savedInstanceState.getString(PROFILE_PARENT_KEY);
 		changedProfile.parent = ApplicationMode.valueOfStringKey(parentStringKey, null);
 		isBaseProfileImported = savedInstanceState.getBoolean(IS_BASE_PROFILE_IMPORTED);
@@ -387,7 +384,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 			profileName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
 				@Override
 				public void onFocusChange(View v, boolean hasFocus) {
-					if(hasFocus){
+					if (hasFocus) {
 						profileName.setSelection(profileName.getText().length());
 						AndroidUtils.showSoftKeyboard(getMyActivity(), profileName);
 					}
@@ -434,7 +431,9 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 			ArrayList<Integer> icons = ProfileIcons.getIcons();
 			for (int iconRes : icons) {
 				View iconItem = createIconItemView(iconRes, iconItems);
-				iconItems.addView(iconItem, new FlowLayout.LayoutParams(0, 0));
+				int minimalPaddingBetweenIcon = app.getResources().getDimensionPixelSize(R.dimen.favorites_select_icon_button_right_padding);
+				iconItems.addView(iconItem, new FlowLayout.LayoutParams(minimalPaddingBetweenIcon, 0));
+				iconItems.setHorizontalAutoSpacing(true);
 			}
 			setIconColor(changedProfile.iconRes);
 		} else if (LOCATION_ICON_ITEMS.equals(preference.getKey())) {
@@ -511,7 +510,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 		ImageView coloredCircle = iconItemView.findViewById(R.id.background);
 		AndroidUtils.setBackground(coloredCircle,
 				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.circle_background_light),
-				UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f)));
+						UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f)));
 		coloredCircle.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -859,11 +858,11 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 		}
 		return false;
 	}
-	
+
 	private boolean nameIsEmpty() {
 		return changedProfile.name.trim().isEmpty();
 	}
-	
+
 	private void disableSaveButtonWithErrorMessage(String errorMessage) {
 		saveButton.setEnabled(false);
 		profileNameOtfb.setError(errorMessage, true);
@@ -1039,7 +1038,8 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
 			if (parent != null ? !parent.equals(that.parent) : that.parent != null) return false;
 			if (name != null ? !name.equals(that.name) : that.name != null) return false;
 			if (color != that.color) return false;
-			if (customColor != null ? !customColor.equals(that.customColor) : that.customColor != null) return false;
+			if (customColor != null ? !customColor.equals(that.customColor) : that.customColor != null)
+				return false;
 			if (routingProfile != null ? !routingProfile.equals(that.routingProfile) : that.routingProfile != null)
 				return false;
 			if (routeService != that.routeService) return false;
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java
index 15d33c8fa3..13210ed6fc 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java
@@ -21,11 +21,10 @@ import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_DISABLED_VALUE
 public class ContourLinesAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(29,
-			"contourlines.showhide", ContourLinesAction.class).
-			nameRes(R.string.quick_action_show_hide_contour_lines).iconRes(R.drawable.ic_plugin_srtm).nonEditable().
-			category(QuickActionType.CONFIGURE_MAP);
-
-
+			"contourlines.showhide", ContourLinesAction.class)
+			.nameActionRes(R.string.quick_action_show_hide_title)
+			.nameRes(R.string.srtm_plugin_name).iconRes(R.drawable.ic_plugin_srtm).nonEditable()
+			.category(QuickActionType.CONFIGURE_MAP);
 
 	public ContourLinesAction() {
 		super(TYPE);
@@ -74,8 +73,14 @@ public class ContourLinesAction extends QuickAction {
 	}
 
 	@Override
-	public String getActionText(OsmandApplication app) {
-		return SRTMPlugin.isContourLinesLayerEnabled(app) ? app.getString(R.string.quick_action_contour_lines_hide)
-				: app.getString(R.string.quick_action_contour_lines_show);
+	public String getActionText(OsmandApplication application) {
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
+	}
+
+	@Override
+	public boolean isActionWithSlash(OsmandApplication application) {
+		return SRTMPlugin.isContourLinesLayerEnabled(application);
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainAction.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainAction.java
index fdeb099cfa..61d09399e2 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainAction.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainAction.java
@@ -16,8 +16,8 @@ import net.osmand.plus.quickaction.QuickActionType;
 public class TerrainAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(30,
-			"terrain.showhide", TerrainAction.class).
-			nameRes(R.string.quick_action_show_hide_terrain).iconRes(R.drawable.ic_action_hillshade_dark).nonEditable().
+			"terrain.showhide", TerrainAction.class).nameActionRes(R.string.quick_action_show_hide_title).
+			nameRes(R.string.shared_string_terrain).iconRes(R.drawable.ic_action_hillshade_dark).nonEditable().
 			category(QuickActionType.CONFIGURE_MAP);
 
 
@@ -62,7 +62,13 @@ public class TerrainAction extends QuickAction {
 
 	@Override
 	public String getActionText(OsmandApplication application) {
-		return application.getSettings().TERRAIN.get() ? application.getString(R.string.quick_action_terrain_hide)
-				: application.getString(R.string.quick_action_terrain_show);
+		String nameRes = application.getString(getNameRes());
+		String actionName = isActionWithSlash(application) ? application.getString(R.string.shared_string_hide) : application.getString(R.string.shared_string_show);
+		return application.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
+	}
+
+	@Override
+	public boolean isActionWithSlash(OsmandApplication application) {
+		return application.getSettings().TERRAIN.get();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/track/ColorsCard.java b/OsmAnd/src/net/osmand/plus/track/ColorsCard.java
index 5f83dfc6c8..e6da7e736f 100644
--- a/OsmAnd/src/net/osmand/plus/track/ColorsCard.java
+++ b/OsmAnd/src/net/osmand/plus/track/ColorsCard.java
@@ -3,13 +3,13 @@ package net.osmand.plus.track;
 import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
-import com.google.android.material.internal.FlowLayout;
+import androidx.annotation.ColorInt;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.fragment.app.Fragment;
 
-import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -19,6 +19,8 @@ import net.osmand.plus.routepreparationmenu.cards.BaseCard;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.ListStringPreference;
 import net.osmand.plus.track.CustomColorBottomSheet.ColorPickerListener;
+import net.osmand.plus.widgets.FlowLayout;
+import net.osmand.plus.widgets.FlowLayout.LayoutParams;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -27,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.fragment.app.Fragment;
@@ -34,19 +37,19 @@ import androidx.fragment.app.Fragment;
 public class ColorsCard extends BaseCard implements ColorPickerListener {
 
 	public static final int MAX_CUSTOM_COLORS = 6;
-	public static final int MINIMUM_CONTRAST_RATIO = 3;
+	public static final double MINIMUM_CONTRAST_RATIO = 1.5;
 
 	private static final Log log = PlatformUtil.getLog(TrackColoringCard.class);
 
 	public static final int INVALID_VALUE = -1;
 
-	private Fragment targetFragment;
+	private final Fragment targetFragment;
 
 	private ApplicationMode appMode;
 	private ListStringPreference colorsListPreference;
 
-	private List<Integer> colors;
-	private List<Integer> customColors;
+	private final List<Integer> colors;
+	private final List<Integer> customColors;
 
 	private int selectedColor;
 
@@ -94,35 +97,41 @@ public class ColorsCard extends BaseCard implements ColorPickerListener {
 	@Override
 	protected void updateContent() {
 		createColorSelector();
-		updateColorSelector(selectedColor, view);
+		updateColorSelector(selectedColor);
 	}
 
 	private void createColorSelector() {
-		FlowLayout selectColor = view.findViewById(R.id.select_color);
-		selectColor.removeAllViews();
+		FlowLayout selectCustomColor = view.findViewById(R.id.select_custom_color);
+		selectCustomColor.removeAllViews();
+		selectCustomColor.setHorizontalAutoSpacing(true);
+		int minimalPaddingBetweenIcon = app.getResources().getDimensionPixelSize(R.dimen.favorites_select_icon_button_right_padding);
 
 		for (int color : customColors) {
-			selectColor.addView(createColorItemView(color, selectColor, true));
+			selectCustomColor.addView(createColorItemView(color, selectCustomColor, true), new LayoutParams(minimalPaddingBetweenIcon, 0));
 		}
 		if (customColors.size() < 6) {
-			selectColor.addView(createAddCustomColorItemView(selectColor));
+			selectCustomColor.addView(createAddCustomColorItemView(selectCustomColor), new LayoutParams(minimalPaddingBetweenIcon, 0));
 		}
-		selectColor.addView(createDividerView(selectColor));
+
+		FlowLayout selectDefaultColor = view.findViewById(R.id.select_default_color);
+		selectDefaultColor.removeAllViews();
+		selectDefaultColor.setHorizontalAutoSpacing(true);
 
 		for (int color : colors) {
-			selectColor.addView(createColorItemView(color, selectColor, false));
+			selectDefaultColor.addView(createColorItemView(color, selectDefaultColor, false), new LayoutParams(minimalPaddingBetweenIcon, 0));
 		}
-		updateColorSelector(selectedColor, selectColor);
+		updateColorSelector(selectedColor);
 	}
 
-	private void updateColorSelector(int color, View rootView) {
-		View oldColor = rootView.findViewWithTag(selectedColor);
+	private void updateColorSelector(int color) {
+		View oldColor = view.findViewWithTag(selectedColor);
 		if (oldColor != null) {
 			oldColor.findViewById(R.id.outline).setVisibility(View.INVISIBLE);
 			ImageView icon = oldColor.findViewById(R.id.icon);
-			icon.setImageDrawable(UiUtilities.tintDrawable(icon.getDrawable(), R.color.icon_color_default_light));
+			icon.setImageDrawable(UiUtilities.tintDrawable(icon.getDrawable(),
+					getResolvedColor(nightMode ? R.color.icon_color_default_dark : R.color.icon_color_default_light)));
 		}
-		View newColor = rootView.findViewWithTag(color);
+		View newColor = view.findViewWithTag(color);
 		if (newColor != null) {
 			newColor.findViewById(R.id.outline).setVisibility(View.VISIBLE);
 		}
@@ -136,7 +145,11 @@ public class ColorsCard extends BaseCard implements ColorPickerListener {
 		Drawable transparencyIcon = getTransparencyIcon(app, color);
 		Drawable colorIcon = app.getUIUtilities().getPaintedIcon(R.drawable.bg_point_circle, color);
 		Drawable layeredIcon = UiUtilities.getLayeredIcon(transparencyIcon, colorIcon);
-		double contrastRatio = ColorUtils.calculateContrast(color, ContextCompat.getColor(app, nightMode ? R.color.card_and_list_background_dark : R.color.card_and_list_background_light));
+		int listBgColorId = nightMode ?
+				R.color.card_and_list_background_dark :
+				R.color.card_and_list_background_light;
+		int listBgColor = getResolvedColor(listBgColorId);
+		double contrastRatio = ColorUtils.calculateContrast(color, listBgColor);
 		if (contrastRatio < MINIMUM_CONTRAST_RATIO) {
 			backgroundCircle.setBackgroundResource(nightMode ? R.drawable.circle_contour_bg_dark : R.drawable.circle_contour_bg_light);
 		}
@@ -144,7 +157,7 @@ public class ColorsCard extends BaseCard implements ColorPickerListener {
 		backgroundCircle.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				updateColorSelector(color, rootView);
+				updateColorSelector(color);
 				selectedColor = color;
 
 				CardListener listener = getListener();
@@ -194,18 +207,7 @@ public class ColorsCard extends BaseCard implements ColorPickerListener {
 		return colorItemView;
 	}
 
-	private View createDividerView(FlowLayout rootView) {
-		LayoutInflater themedInflater = UiUtilities.getInflater(view.getContext(), nightMode);
-		View divider = themedInflater.inflate(R.layout.simple_divider_item, rootView, false);
-
-		LinearLayout dividerContainer = new LinearLayout(view.getContext());
-		dividerContainer.addView(divider);
-		dividerContainer.setPadding(0, AndroidUtils.dpToPx(app, 1), 0, AndroidUtils.dpToPx(app, 5));
-
-		return dividerContainer;
-	}
-
-	private View createCircleView(ViewGroup rootView) {
+	private View createCircleView(FlowLayout rootView) {
 		LayoutInflater themedInflater = UiUtilities.getInflater(view.getContext(), nightMode);
 		View circleView = themedInflater.inflate(R.layout.point_editor_button, rootView, false);
 		ImageView outline = circleView.findViewById(R.id.outline);
diff --git a/OsmAnd/src/net/osmand/plus/track/SplitIntervalBottomSheet.java b/OsmAnd/src/net/osmand/plus/track/SplitIntervalBottomSheet.java
index 15d94db2cc..7d36e90b27 100644
--- a/OsmAnd/src/net/osmand/plus/track/SplitIntervalBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/track/SplitIntervalBottomSheet.java
@@ -3,7 +3,7 @@ package net.osmand.plus.track;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.RadioGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -25,6 +25,9 @@ import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener;
+import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
 
 import org.apache.commons.logging.Log;
 
@@ -93,7 +96,6 @@ public class SplitIntervalBottomSheet extends MenuBottomSheetDialogFragment {
 	@Override
 	public void createMenuItems(Bundle savedInstanceState) {
 		items.add(new TitleItem(getString(R.string.gpx_split_interval)));
-		items.add(new LongDescriptionItem(getString(R.string.gpx_split_interval_descr)));
 
 		LayoutInflater themedInflater = UiUtilities.getInflater(requireContext(), nightMode);
 		View view = themedInflater.inflate(R.layout.track_split_interval, null);
@@ -106,29 +108,10 @@ public class SplitIntervalBottomSheet extends MenuBottomSheetDialogFragment {
 		selectedSplitValue = view.findViewById(R.id.split_value_tv);
 		splitIntervalNoneDescr = view.findViewById(R.id.split_interval_none_descr);
 
-		UiUtilities.setupSlider(slider, nightMode, null);
+		UiUtilities.setupSlider(slider, nightMode, null, true);
 
-		RadioGroup splitTypeGroup = view.findViewById(R.id.split_type);
-		if (selectedSplitType == GpxSplitType.NO_SPLIT) {
-			splitTypeGroup.check(R.id.no_split);
-		} else if (selectedSplitType == GpxSplitType.TIME) {
-			splitTypeGroup.check(R.id.time_split);
-		} else if (selectedSplitType == GpxSplitType.DISTANCE) {
-			splitTypeGroup.check(R.id.distance_split);
-		}
-		splitTypeGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(RadioGroup group, int checkedId) {
-				if (checkedId == R.id.no_split) {
-					selectedSplitType = GpxSplitType.NO_SPLIT;
-				} else if (checkedId == R.id.time_split) {
-					selectedSplitType = GpxSplitType.TIME;
-				} else if (checkedId == R.id.distance_split) {
-					selectedSplitType = GpxSplitType.DISTANCE;
-				}
-				updateSlider();
-			}
-		});
+		LinearLayout radioGroup = (LinearLayout) view.findViewById(R.id.custom_radio_buttons);
+		setupTypeRadioGroup(radioGroup);
 
 		SimpleBottomSheetItem titleItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
 				.setCustomView(view)
@@ -136,6 +119,35 @@ public class SplitIntervalBottomSheet extends MenuBottomSheetDialogFragment {
 		items.add(titleItem);
 	}
 
+	private void setupTypeRadioGroup(LinearLayout buttonsContainer) {
+		RadioItem none = createRadioButton(GpxSplitType.NO_SPLIT, R.string.shared_string_none);
+		RadioItem time = createRadioButton(GpxSplitType.TIME, R.string.shared_string_time);
+		RadioItem distance = createRadioButton(GpxSplitType.DISTANCE, R.string.distance);
+
+		MultiStateToggleButton radioGroup = new MultiStateToggleButton(app, buttonsContainer, nightMode);
+		radioGroup.setItems(none, time, distance);
+
+		if (selectedSplitType == GpxSplitType.NO_SPLIT) {
+			radioGroup.setSelectedItem(none);
+		} else {
+			radioGroup.setSelectedItem(selectedSplitType == GpxSplitType.TIME ? time : distance);
+		}
+	}
+
+	private RadioItem createRadioButton(final GpxSplitType splitType, int titleId) {
+		String title = app.getString(titleId);
+		RadioItem item = new RadioItem(title);
+		item.setOnClickListener(new OnRadioItemClickListener() {
+			@Override
+			public boolean onRadioItemClick(RadioItem radioItem, View view) {
+				selectedSplitType = splitType;
+				updateSlider();
+				return true;
+			}
+		});
+		return item;
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
diff --git a/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
index 4642175b09..43b0c78eca 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
@@ -409,15 +409,17 @@ public class TrackAppearanceFragment extends ContextMenuScrollFragment implement
 			RotatedTileBox tb = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
 			int tileBoxWidthPx = 0;
 			int tileBoxHeightPx = 0;
+			int marginLeftPx = 0;
 
 			if (!isPortrait()) {
 				tileBoxWidthPx = tb.getPixWidth() - getWidth();
+				marginLeftPx = getWidth();
 			} else {
 				int fHeight = getViewHeight() - y - AndroidUtils.getStatusBarHeight(mapActivity);
 				tileBoxHeightPx = tb.getPixHeight() - fHeight;
 			}
 			if (r.left != 0 && r.right != 0) {
-				mapActivity.getMapView().fitRectToMap(r.left, r.right, r.top, r.bottom, tileBoxWidthPx, tileBoxHeightPx, 0);
+				mapActivity.getMapView().fitRectToMap(r.left, r.right, r.top, r.bottom, tileBoxWidthPx, tileBoxHeightPx, 0, marginLeftPx);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
index c674ea82ab..357ea3ba8a 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
@@ -59,6 +59,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.UiUtilities.UpdateLocationViewCache;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode;
 import net.osmand.plus.activities.MapActivityActions;
 import net.osmand.plus.base.ContextMenuFragment;
 import net.osmand.plus.base.ContextMenuScrollFragment;
@@ -81,6 +82,7 @@ import net.osmand.plus.myplaces.TrackActivityFragmentAdapter;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard.CardListener;
+import net.osmand.plus.search.QuickSearchDialogFragment;
 import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.track.SaveGpxAsyncTask.SaveGpxListener;
 import net.osmand.plus.track.TrackSelectSegmentBottomSheet.OnSegmentSelectedListener;
@@ -270,6 +272,8 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 						if (contextMenu.isActive() && contextMenu.getPointDescription() != null
 								&& contextMenu.getPointDescription().isGpxPoint()) {
 							contextMenu.show();
+						} else if (Algorithms.objectEquals(returnScreenName, QuickSearchDialogFragment.TAG)) {
+							mapActivity.showQuickSearch(ShowQuickSearchMode.CURRENT, false);
 						} else {
 							mapActivity.launchPrevActivityIntent();
 						}
diff --git a/OsmAnd/src/net/osmand/plus/track/TrackWidthCard.java b/OsmAnd/src/net/osmand/plus/track/TrackWidthCard.java
index 2a8f34c024..9e98414d34 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackWidthCard.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackWidthCard.java
@@ -45,6 +45,7 @@ public class TrackWidthCard extends BaseCard {
 
 	private GpxWidthAdapter widthAdapter;
 	private View sliderContainer;
+	private RecyclerView groupRecyclerView;
 
 	public TrackWidthCard(MapActivity mapActivity, TrackDrawInfo trackDrawInfo,
 	                      OnNeedScrollListener onNeedScrollListener) {
@@ -65,9 +66,10 @@ public class TrackWidthCard extends BaseCard {
 		updateCustomWidthSlider();
 
 		widthAdapter = new GpxWidthAdapter(appearanceItems);
-		RecyclerView groupRecyclerView = view.findViewById(R.id.recycler_view);
+		groupRecyclerView = view.findViewById(R.id.recycler_view);
 		groupRecyclerView.setAdapter(widthAdapter);
 		groupRecyclerView.setLayoutManager(new LinearLayoutManager(app, RecyclerView.HORIZONTAL, false));
+		scrollMenuToSelectedItem();
 
 		AndroidUiHelper.updateVisibility(view.findViewById(R.id.top_divider), isShowDivider());
 	}
@@ -155,7 +157,7 @@ public class TrackWidthCard extends BaseCard {
 					}
 				}
 			});
-			UiUtilities.setupSlider(widthSlider, nightMode, null);
+			UiUtilities.setupSlider(widthSlider, nightMode, null, true);
 			ScrollUtils.addOnGlobalLayoutListener(sliderContainer, new Runnable() {
 				@Override
 				public void run() {
@@ -175,6 +177,13 @@ public class TrackWidthCard extends BaseCard {
 		mapActivity.refreshMap();
 	}
 
+	private void scrollMenuToSelectedItem() {
+		int position = widthAdapter.getItemPosition(selectedItem);
+		if (position != -1) {
+			groupRecyclerView.scrollToPosition(position);
+		}
+	}
+
 	private class GpxWidthAdapter extends RecyclerView.Adapter<TrackAppearanceViewHolder> {
 
 		private List<AppearanceListItem> items;
@@ -219,6 +228,7 @@ public class TrackWidthCard extends BaseCard {
 
 					updateHeader();
 					updateCustomWidthSlider();
+					scrollMenuToSelectedItem();
 
 					CardListener listener = getListener();
 					if (listener != null) {
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 475e7879aa..ad1a8bb190 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -638,8 +638,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		} else if (mapPosition == OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT) {
 			ratiox = 0.7f;
 		} else {
-			boolean isLayoutRtl = AndroidUtils.isLayoutRtl(application);
-			ratiox = mapPositionX == 0 ? 0.5f : (isLayoutRtl ? 0.25f : 0.75f);
+			ratiox = mapPositionX == 0 ? 0.5f : (isLayoutRtl() ? 0.25f : 0.75f);
 		}
 		final int cy = (int) (ratioy * view.getHeight());
 		final int cx = (int) (ratiox * view.getWidth());
@@ -959,7 +958,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		if (tileBoxWidthPx > 0) {
 			tbw = (int) (tileBoxWidthPx * border);
 			if (marginLeftPx > 0) {
-				dx = (tb.getPixWidth() - tileBoxWidthPx) / 2 - marginLeftPx;
+				int offset = (tb.getPixWidth() - tileBoxWidthPx) / 2 - marginLeftPx;
+				dx = isLayoutRtl() ? -offset : offset;
 			}
 		} else if (tileBoxHeightPx > 0) {
 			tbh = (int) (tileBoxHeightPx * border);
@@ -1425,4 +1425,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	public Context getContext() {
 		return activity;
 	}
+
+	public boolean isLayoutRtl() {
+		return AndroidUtils.isLayoutRtl(application);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
index 945796a726..ed425c0993 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
@@ -876,9 +876,13 @@ public class MapControlsLayer extends OsmandMapLayer {
 		routePlanningBtn.updateVisibility(showBottomMenuButtons);
 		menuControl.updateVisibility(showBottomMenuButtons);
 
-		boolean showZoomButtons = !routeDialogOpened && !shouldHideTopControls && !isInTrackAppearanceMode()
-				&& (!isInGpxApproximationMode() || !isPotrait())
-				&& !isInFollowTrackMode() && (!isInChoosingRoutesMode() || !isInWaypointsChoosingMode() || !portrait);
+		boolean additionalDialogsHide = !isInGpxApproximationMode()
+				&& !isInTrackAppearanceMode()
+				&& !isInChoosingRoutesMode()
+				&& !isInWaypointsChoosingMode();
+		boolean showZoomButtons = !routeDialogOpened && !shouldHideTopControls
+				&& !isInFollowTrackMode()
+				&& (additionalDialogsHide || !portrait);
 		mapZoomIn.updateVisibility(showZoomButtons);
 		mapZoomOut.updateVisibility(showZoomButtons);
 
@@ -1020,9 +1024,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	public void updateMyLocationVisibility(MapHudButton backToLocationControl, RoutingHelper rh, boolean dialogOpened) {
 		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
-		boolean visible = !(tracked && rh.isFollowingMode()) && (!isInGpxApproximationMode() || !isPotrait());
+		boolean visible = !(tracked && rh.isFollowingMode());
+		boolean additionalDialogsHide = !isInTrackAppearanceMode()
+				&& !isInGpxApproximationMode()
+				&& !isInChoosingRoutesMode()
+				&& !isInWaypointsChoosingMode()
+				&& !isInFollowTrackMode();
 		backToLocationControl.updateVisibility(visible && !dialogOpened && !isInPlanRouteMode()
-				&& !isInTrackAppearanceMode() && (!isInChoosingRoutesMode() || !isInWaypointsChoosingMode() || !isInFollowTrackMode() || !isPotrait()));
+				&& (additionalDialogsHide || !isPotrait()));
 	}
 
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
index ac0765cee5..52801776cd 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
@@ -33,7 +33,6 @@ public class MapMarkersWidgetsFactory {
 
 	private final MapActivity map;
 	private MapMarkersHelper helper;
-	private int screenOrientation;
 	private boolean portraitMode;
 
 	private View topBar;
@@ -59,7 +58,6 @@ public class MapMarkersWidgetsFactory {
 	public MapMarkersWidgetsFactory(final MapActivity map) {
 		this.map = map;
 		helper = map.getMyApplication().getMapMarkersHelper();
-		screenOrientation = map.getMyApplication().getUIUtilities().getScreenOrientation();
 		portraitMode = AndroidUiHelper.isOrientationPortrait(map);
 
 		addressTopBar = map.findViewById(R.id.map_top_bar);
@@ -245,7 +243,7 @@ public class MapMarkersWidgetsFactory {
 		}
 		dd.setImage(R.drawable.ic_arrow_marker_diretion, MapMarker.getColorId(marker.colorIndex));
 		if (heading != null && loc != null) {
-			dd.setAngle(mes[1] - heading + 180 + screenOrientation);
+			dd.setAngle(mes[1] - heading + 180);
 		}
 		if (newImage) {
 			arrowImg.setImageDrawable(dd);
diff --git a/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java b/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java
index 63a43e56ad..16f87a9561 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.widgets;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,22 +10,7 @@ import net.osmand.AndroidUtils;
 public class FlowLayout extends ViewGroup {
 
 	private int line_height;
-
-	public static class LayoutParams extends ViewGroup.LayoutParams {
-
-		final int horizontal_spacing;
-		final int vertical_spacing;
-
-		/**
-		 * @param horizontal_spacing Pixels between items, horizontally
-		 * @param vertical_spacing   Pixels between items, vertically
-		 */
-		public LayoutParams(int horizontal_spacing, int vertical_spacing) {
-			super(0, 0);
-			this.horizontal_spacing = horizontal_spacing;
-			this.vertical_spacing = vertical_spacing;
-		}
-	}
+	private boolean horizontalAutoSpacing;
 
 	public FlowLayout(Context context) {
 		super(context);
@@ -36,16 +20,22 @@ public class FlowLayout extends ViewGroup {
 		super(context, attrs);
 	}
 
+	// If true, available horizontal space is added to items horizontalSpacing to fit the screen width.
+	public void setHorizontalAutoSpacing(boolean horizontalAutoSpacing) {
+		this.horizontalAutoSpacing = horizontalAutoSpacing;
+	}
+
 	@Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		if ((MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.UNSPECIFIED)) throw new AssertionError();
+		if ((MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.UNSPECIFIED))
+			throw new AssertionError();
 
 		final int width = MeasureSpec.getSize(widthMeasureSpec) - getPaddingLeft() - getPaddingRight();
 		int height = MeasureSpec.getSize(heightMeasureSpec) - getPaddingTop() - getPaddingBottom();
 		final int count = getChildCount();
 		int line_height = 0;
-		int xpos = getPaddingLeft();
-		int ypos = getPaddingTop();
+		int horizontalPosition = getPaddingLeft();
+		int verticalPosition = getPaddingTop();
 		int childHeightMeasureSpec;
 
 		if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
@@ -59,22 +49,22 @@ public class FlowLayout extends ViewGroup {
 			if (child.getVisibility() != GONE) {
 				final LayoutParams lp = (LayoutParams) child.getLayoutParams();
 				child.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), childHeightMeasureSpec);
-				final int childw = child.getMeasuredWidth();
-				line_height = Math.max(line_height, child.getMeasuredHeight() + lp.vertical_spacing);
-				if (xpos + childw > width) {
-					xpos = getPaddingLeft();
-					ypos += line_height;
+				final int childWidth = child.getMeasuredWidth();
+				line_height = Math.max(line_height, child.getMeasuredHeight() + lp.verticalSpacing);
+				if (horizontalPosition + childWidth > width) {
+					horizontalPosition = getPaddingLeft();
+					verticalPosition += line_height;
 				}
-				xpos += childw + lp.horizontal_spacing;
+				horizontalPosition += childWidth + lp.horizontalSpacing;
 			}
 		}
 
 		this.line_height = line_height;
 		if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) {
-			height = ypos + line_height;
+			height = verticalPosition + line_height;
 		} else if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
-			if (ypos + line_height < height) {
-				height = ypos + line_height;
+			if (verticalPosition + line_height < height) {
+				height = verticalPosition + line_height;
 			}
 		}
 		setMeasuredDimension(width, height);
@@ -95,30 +85,60 @@ public class FlowLayout extends ViewGroup {
 		final int count = getChildCount();
 		final int width = r - l;
 		boolean isLayoutRtl = AndroidUtils.isLayoutRtl(getContext());
-		int xpos = isLayoutRtl ? width - getPaddingRight() : getPaddingLeft();
-		int ypos = getPaddingTop();
+		int horizontalPosition = isLayoutRtl ? width - getPaddingRight() : getPaddingLeft();
+		int verticalPosition = getPaddingTop();
 		for (int i = 0; i < count; i++) {
 			final View child = getChildAt(i);
 			if (child.getVisibility() != GONE) {
-				final int childw = child.getMeasuredWidth();
-				final int childh = child.getMeasuredHeight();
 				final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+				final int childWidth = child.getMeasuredWidth();
+				final int childHeight = child.getMeasuredHeight();
+				int freeSizeSpacing = getFreeSizeSpacing(width, lp, childWidth);
 				if (isLayoutRtl) {
-					if (xpos - childw < l) {
-						xpos = width - getPaddingRight();
-						ypos += line_height;
+					if (horizontalPosition - childWidth < getPaddingLeft()) {
+						horizontalPosition = width - getPaddingRight();
+						verticalPosition += line_height;
 					}
-					child.layout(xpos - childw, ypos, xpos, ypos + childh);
-					xpos -= childw + lp.horizontal_spacing;
+					child.layout(horizontalPosition - childWidth, verticalPosition, horizontalPosition, verticalPosition + childHeight);
+					horizontalPosition -= freeSizeSpacing;
 				} else {
-					if (xpos + childw > width) {
-						xpos = getPaddingLeft();
-						ypos += line_height;
+					if (horizontalPosition + childWidth > width) {
+						horizontalPosition = getPaddingLeft();
+						verticalPosition += line_height;
 					}
-					child.layout(xpos, ypos, xpos + childw, ypos + childh);
-					xpos += childw + lp.horizontal_spacing;
+					child.layout(horizontalPosition, verticalPosition, horizontalPosition + childWidth, verticalPosition + childHeight);
+					horizontalPosition += freeSizeSpacing;
 				}
 			}
 		}
 	}
+
+	private int getFreeSizeSpacing(int width, LayoutParams lp, int childWidth) {
+		int freeSizeSpacing;
+		int itemsCount = width / (childWidth + lp.horizontalSpacing);
+		if (itemsCount > 1 && horizontalAutoSpacing) {
+			freeSizeSpacing = (width - childWidth) / (itemsCount-1);
+		} else if (!horizontalAutoSpacing) {
+			freeSizeSpacing = childWidth + lp.horizontalSpacing;
+		} else {
+			freeSizeSpacing = (width % childWidth / itemsCount);
+		}
+		return freeSizeSpacing;
+	}
+
+	public static class LayoutParams extends ViewGroup.LayoutParams {
+
+		final int horizontalSpacing;
+		final int verticalSpacing;
+
+		/**
+		 * @param horizontalSpacing Pixels between items, horizontally
+		 * @param verticalSpacing   Pixels between items, vertically
+		 */
+		public LayoutParams(int horizontalSpacing, int verticalSpacing) {
+			super(0, 0);
+			this.horizontalSpacing = horizontalSpacing;
+			this.verticalSpacing = verticalSpacing;
+		}
+	}
 }
\ No newline at end of file