diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png
index 2ea354119c..6aea76546c 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png and b/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-hdpi/ic_action_device_topbar_two.png
new file mode 100644
index 0000000000..55cd34bd10
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_device_topbar_two.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png
index ee2abf80f8..6f303c7419 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png and b/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-hdpi/ic_action_device_widget_two.png
new file mode 100644
index 0000000000..0a671c5481
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_device_widget_two.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png
index 9fd6ca7d18..91e5a0904d 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png and b/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-mdpi/ic_action_device_topbar_two.png
new file mode 100644
index 0000000000..547d66eaa9
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_device_topbar_two.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png
index 042f8d8991..3182f3c1a9 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png and b/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-mdpi/ic_action_device_widget_two.png
new file mode 100644
index 0000000000..413a5d1d2e
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_device_widget_two.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png
index afd531cde9..1c5171c8a0 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png and b/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar_two.png
new file mode 100644
index 0000000000..a15f8d3054
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar_two.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png
index 246aac7041..d7990198c4 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png and b/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_widget_two.png
new file mode 100644
index 0000000000..4afc6c16dd
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_device_widget_two.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png
index ea92278360..3559edc1d6 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png and b/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar_two.png
new file mode 100644
index 0000000000..3be8f835b5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar_two.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png
index 670655881b..c21b7b24f1 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png and b/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget_two.png
new file mode 100644
index 0000000000..725f6f6f5c
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget_two.png differ
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 5c9f588e18..225720d1c6 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -631,8 +631,8 @@
 	<string name="shared_string_favorites">Favoriten</string>
 	<string name="layer_osm_bugs">OSM-Notizen (online)</string>
 	
-	<string name="layer_poi">POI…</string>
-	<string name="layer_amenity_label">Punktbezeichnungen</string>
+	<string name="layer_poi">POI Overlay…</string>
+	<string name="layer_amenity_label">POI-Overlay-Bezeichnungen</string>
 	<string name="layer_map">Kartenquelle…</string>
 	<string name="menu_layers">Kartenebenen</string>
 	<string name="context_menu_item_search_poi">Suche POI</string>
@@ -807,8 +807,8 @@
 	<string name="show_view_angle">Blickrichtung einblenden</string>
 	<string name="map_view_3d_descr">3D-Kartenansicht verwenden.</string>
 	<string name="map_view_3d">3D-Kartenansicht</string>
-	<string name="show_poi_over_map_description">Zuletzt gewählte POIs auf der Karte anzeigen.</string>
-	<string name="show_poi_over_map">POIs anzeigen</string>
+	<string name="show_poi_over_map_description">Zuletzt gewähltes POIs Overlax auf der Karte anzeigen.</string>
+	<string name="show_poi_over_map">POI Overlay anzeigen</string>
 	<string name="map_tile_source_descr">Online- oder Offline-Quelle für Karte (Kacheln).</string>
 	<string name="map_tile_source">Kartenquelle (Kacheln)</string>
 	<string name="map_source">Kartenquelle</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 09d0e537d8..7616ff2e6f 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2856,4 +2856,12 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="show_on_top_bar">Montri en supra breto</string>
     <string name="mark_passed">Marki pasigitajn</string>
     <string name="rename_marker">Alinomi markon</string>
+    <string name="digits_quantity">Nombro da ciferoj</string>
+    <string name="shared_string_right">Dekstre</string>
+    <string name="shared_string_left">Maldekstre</string>
+    <string name="show_number_pad">Montri nombran klavaron</string>
+    <string name="shared_string_paste">Englui</string>
+    <string name="coordinate_input_accuracy_description">Aŭtomate baskuli al sekva kampo post entajpi %1$d ciferojn post la komo</string>
+    <string name="coordinate_input_accuracy">%1$d ciferoj</string>
+    <string name="go_to_next_field">Iri al la sekva kampo</string>
     </resources>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 030c934892..52fd039b33 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -2931,4 +2931,12 @@
     <string name="show_on_top_bar">در نوار بالا نشان بده</string>
     <string name="mark_passed">از این عبور کردم</string>
     <string name="rename_marker">تغییر نام نشانه</string>
+    <string name="digits_quantity">تعداد ارقام</string>
+    <string name="shared_string_right">راست</string>
+    <string name="shared_string_left">چپ</string>
+    <string name="show_number_pad">نمایش صفحه‌کلید عددی</string>
+    <string name="shared_string_paste">الصاق</string>
+    <string name="coordinate_input_accuracy_description">پس از واردکردن %1$d رقم بعد از ممیز، به‌صورت خودکار خانۀ بعدی فعال شود</string>
+    <string name="coordinate_input_accuracy">%1$d رقم</string>
+    <string name="go_to_next_field">رفتن به خانهٔ بعدی</string>
     </resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 8391fe4c77..49056734a4 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2841,4 +2841,13 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="tap_on_map_to_hide_interface">Modalidade a ischermu intreu</string>
     <string name="show_on_top_bar">Ammustra in sa barra superiore</string>
     <string name="mark_passed">Sinna comente coladu</string>
+    <string name="digits_quantity">Nùmeru de tzifras</string>
+    <string name="shared_string_right">Destra</string>
+    <string name="shared_string_left">Manca</string>
+    <string name="show_number_pad">Ammustra tecladu numèricu</string>
+    <string name="shared_string_paste">Incolla</string>
+    <string name="coordinate_input_accuracy_description">Cola automaticamente a su campu imbeniente a pustis de àere iscritu %1$d tzifras a pustis de sa vìrgula</string>
+    <string name="coordinate_input_accuracy">%1$d tzifras</string>
+    <string name="go_to_next_field">Cola a su campu imbeniente</string>
+    <string name="rename_marker">Torra a numenare su marcadore</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 3fa273cb3c..f85496483e 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2926,4 +2926,12 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="show_on_top_bar">在頂列上顯示</string>
     <string name="mark_passed">已經過標記</string>
     <string name="rename_marker">重新命名標記</string>
+    <string name="digits_quantity">數位量</string>
+    <string name="shared_string_right">右方</string>
+    <string name="shared_string_left">左方</string>
+    <string name="show_number_pad">顯示數字鍵盤</string>
+    <string name="shared_string_paste">貼上</string>
+    <string name="coordinate_input_accuracy_description">在小數點後面輸入 %1$d 個數字以後，自動切換到下一段</string>
+    <string name="coordinate_input_accuracy">%1$d 個數字</string>
+    <string name="go_to_next_field">到下一段</string>
     </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 43f7b3f5d7..9d46a9d272 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1204,7 +1204,7 @@
     <string name="show_zoom_buttons_navigation">Show zoom buttons</string>
     <string name="save_as_favorites_points">Save as group of favorites</string>
     <string name="select_destination_and_intermediate_points">Select destinations</string>
-    <string name="layer_amenity_label">Point labels</string>
+    <string name="layer_amenity_label">POI overlay labels</string>
     <string name="loading_smth">Loading %1$s…</string>
     <string name="map_widget_plain_time">Current time</string>
     <string name="gpx_wpt">Waypoint</string>
@@ -2053,7 +2053,7 @@
     <string name="live_monitoring_max_interval_to_send_desrc">Specify a time buffer to keep locations to send without connection</string>
     <string name="gpx_monitoring_disabled_warn">Log track using GPX widget or via \'Trip recording\' settings.</string>
     <string name="show_current_gpx_title">Show current track</string>
-    <string name="free_version_message">This free OsmAnd version is limited to %1$s map downloads (including update downloads) and does not support offline Wikipedia articles.</string>
+    <string name="free_version_message">This free OsmAnd version is limited to %1$s map downloads (to add or update maps) and does not support offline Wikipedia articles.</string>
     <string name="free_version_title">Free version</string>
     <string name="poi_context_menu_showdescription">Show POI description.</string>
     <string name="index_name_north_america">North America</string>
@@ -2346,7 +2346,7 @@
     <string name="layer_yandex_traffic">Yandex traffic</string>
     <string name="layer_route">Route</string>
     <string name="layer_osm_bugs">OSM Notes (online)</string>
-    <string name="layer_poi">POI…</string>
+    <string name="layer_poi">POI Overlay…</string>
     <string name="layer_map">Map source…</string>
     <string name="menu_layers">Map layers</string>
     <string name="context_menu_item_search_poi">Search POI</string>
@@ -2498,8 +2498,8 @@
     <string name="show_view_angle">Display viewing direction</string>
     <string name="map_view_3d_descr">Enable 3D view of the map.</string>
     <string name="map_view_3d">Map View 3D</string>
-    <string name="show_poi_over_map_description">Show POI over map (use last chosen filter).</string>
-    <string name="show_poi_over_map">Show POI</string>
+    <string name="show_poi_over_map_description">Show the last selected POI overlay on the map.</string>
+    <string name="show_poi_over_map">Show POI overlay</string>
     <string name="map_tile_source_descr">Choose the source of online or cached map tiles.</string>
     <string name="map_tile_source">Tile map source</string>
     <string name="map_source">Map source</string>
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index abf2e5eb5c..9bf8c5d691 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -271,6 +271,13 @@ public class ConfigureMapMenu {
 				.setIcon(R.drawable.ic_action_info_dark)
 				.setSecondaryIcon(R.drawable.ic_action_additional_option)
 				.setListener(l).createItem());
+		selected = settings.SHOW_POI_LABEL.get();
+		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setTitleId(R.string.layer_amenity_label, activity)
+				.setSelected(settings.SHOW_POI_LABEL.get())
+				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setIcon(R.drawable.ic_action_text_dark)
+				.setListener(l).createItem());
 
 		/*
 		ContextMenuItem item = createProperties(customRules, null, R.string.rendering_category_transport, R.drawable.ic_action_bus_dark,
@@ -451,13 +458,6 @@ public class ConfigureMapMenu {
 						b.show();
 					}
 				}).createItem());
-		selected = settings.SHOW_POI_LABEL.get();
-		adapter.addItem(new ContextMenuItem.ItemBuilder()
-				.setTitleId(R.string.layer_amenity_label, activity)
-				.setSelected(settings.SHOW_POI_LABEL.get())
-				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
-				.setIcon(R.drawable.ic_action_text_dark)
-				.setListener(l).createItem());
 		selected = app.getSelectedGpxHelper().isShowingAnyGpxFiles();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setTitleId(R.string.layer_gpx_layer, activity)