diff --git a/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000..c2718a056d
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000..15784a07ab
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000..da2257e427
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000..b555ffea04
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png differ
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 52d61851d5..c5630bb40e 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
     <string name="osb_author_or_password_not_specified">Моля, въведете потребителско име и парола за сайта на OSM</string>
     <string name="clear_intermediate_points">Изчистване на междинните точки</string>
     <string name="keep_intermediate_points">Запази междинните точки</string>
@@ -2039,4 +2040,15 @@
     <string name="weekly">Всяка седмица</string>
     <string name="morning">Сутрин</string>
     <string name="Night">През нощта</string>
-</resources>
\ No newline at end of file
+<string name="switch_start_finish">Размяна на началната с крайна точка</string>
+    <string name="rendering_attr_hideIcons_name">Скриване на POI иконите</string>
+    <string name="item_deleted">Изтрито</string>
+    <string name="n_items_deleted">изтрити елемента</string>
+    <string name="shared_string_undo_all">ВРЪЩАНЕ НА ВСИЧКО</string>
+    <string name="shared_string_type">Тип</string>
+    <string name="starting_point">Начална точка</string>
+    <string name="select_month_and_country">Изберете месец и държава</string>
+    <string name="number_of_contributors">Брой участници</string>
+    <string name="number_of_edits">Брой редакции</string>
+    <string name="reports_for">Отчет за:</string>
+</resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index dcb4efd4ad..b696e7465a 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -2642,4 +2642,7 @@
 <string name="poi_atm_yes">Hæveautomat: ja</string>
 	<string name="poi_atm_no">Hæveautomat: nej</string>
 
+<string name="poi_firepit">Bålplads</string>
+	<string name="poi_street_cabinet">Gadeskab</string>
+
 </resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index aea7de43c8..19b1e0b8bd 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2226,7 +2226,7 @@
     <string name="n_items_deleted">Emner slettet</string>
     <string name="shared_string_undo_all">FORTRYD ALLE</string>
     <string name="rendering_attr_hideIcons_name">Skjul IP ikoner</string>
-    <string name="switch_start_finish">Byt rundt på startpunkt &amp; destination</string>
+    <string name="switch_start_finish">Byt om på startpunkt og destination</string>
     <string name="number_of_contributors">Antallet af bidragydere</string>
     <string name="number_of_edits">Antal redigeringer</string>
     <string name="reports_for">Rapport for:</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 120265009f..e2a8b4a5fa 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1997,5 +1997,8 @@
     <string name="starting_point">Startpunkt</string>
     <string name="shared_string_undo_all">Alles rückgängig machen</string>
     <string name="rendering_attr_hideIcons_name">POI Symbole ausblenden</string>
-    <string name="switch_start_finish">Startpunkt und Ziel vertauschen</string>
+    <string name="switch_start_finish">Startpunkt und Ziel tauschen</string>
+<string name="number_of_edits">Anzahl der Bearbeitungen</string>
+    <string name="number_of_contributors">Anzahl der Mitwirkenden</string>
+    <string name="reports_for">Bericht für:</string>
 </resources>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index b9cfbdf387..ee3fe9a919 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -1872,4 +1872,40 @@
 	<string name="poi_content_manure">Contenu : fumier</string>
 	<string name="poi_nudism_permissive">Nudisme autorisé</string>
 
+	<string name="poi_construction_yes">En cours de construction</string>
+	<string name="poi_dolphin">Duc-d’Albe</string>
+
+	<string name="poi_official_name">Nom officiel</string>
+
+	<string name="poi_rc_car">Courses de voitures radio-commandées</string>
+	<string name="poi_futsal">Football en salle</string>
+	<string name="poi_judo">Judo</string>
+	<string name="poi_badminton">Badminton</string>
+	<string name="poi_karting">Karting</string>
+	<string name="poi_fitness">Remise en forme</string>
+
+	<string name="poi_water_heater_yes">Chauffe-eau : Oui</string>
+	<string name="poi_water_heater_no">Chauffe-eau : non</string>
+
+	<string name="poi_parking_surface">Type : surface</string>
+	<string name="poi_historic_civilization_prehistoric">Civilisation : préhistorique</string>
+	<string name="poi_historic_civilization_roman">Civilisation : romaine</string>
+	<string name="poi_historic_civilization_ancient_egyptian">Civilisation : ancienne égypte (jusqu\'en 332 av. J.-C.)</string>
+	<string name="poi_historic_civilization_greek_egyptian">Civilisations : grecque égyptienne (332 av. J.C. – 30 av. J.C.)</string>
+	<string name="poi_animal_training">Formation animale</string>
+	<string name="poi_animal_training_dog">Dressage de chiens</string>
+	<string name="poi_animal_training_horse">Entrainement de chevaux</string>
+
+	<string name="poi_surveillance_public">Surveillance : publique</string>
+
+	<string name="poi_historic_manor">Manoir historique</string>
+	<string name="poi_castle_type_kremlin">Type de château : kremlin</string>
+	<string name="poi_sanitary_dump_station_yes">Station de vidange sanitaire : oui</string>
+	<string name="poi_sanitary_dump_station_no">Station de vidange sanitaire : non</string>
+	<string name="poi_sanitary_dump_station_customers">Station de vidange sanitaire : clients uniquement</string>
+	<string name="poi_refugee_no">Réfugiés : non</string>
+
+	<string name="poi_product_charcoal">Produit : charbon</string>
+	<string name="poi_tomb_war_grave">Type : tombe de guerre</string>
+	<string name="poi_surface_paving_stones">Surface : pavés</string>
 	</resources>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index d9d7f471f2..85a57daa40 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -731,4 +731,7 @@
 	<string name="poi_parish">Ufficio parrocchiale</string>
 	<string name="poi_street_lamp">Lampione</string>
 
+	<string name="poi_ski_rental">Noleggio sci</string>
+
+	<string name="poi_ski_resort">Stazione sciistica</string>
 	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e10d594ec2..211cc911c5 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1646,7 +1646,7 @@
     <string name="rendering_attr_pisteGrooming_name">Piste da fondo</string>
     <string name="free">"Libera %1$s "</string>
     <string name="device_memory">Memoria dispositivo</string>
-    <string name="rendering_attr_pisteRoutes_name">Discese sciistiche</string>
+    <string name="rendering_attr_pisteRoutes_name">Piste da sci</string>
     <string name="roads_only">Solo strade</string>
     <string name="watch">Guarda</string>
     <string name="notes">Note</string>
@@ -2141,4 +2141,5 @@
     <string name="switch_start_finish">Inverti punti di partenza e destinazione</string>
     <string name="rendering_attr_hideIcons_name">Nascondi le icone dei PDI</string>
     <string name="number_of_edits">Numero di modifiche</string>
+    <string name="number_of_contributors">Numero di contributori</string>
     </resources>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 2c838f39de..cc1f7d0083 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2163,6 +2163,8 @@
     <string name="item_deleted">Item verwijderd</string>
     <string name="n_items_deleted">items verwijderd</string>
     <string name="shared_string_undo_all">Alles terugzetten</string>
-    <string name="rendering_attr_hideIcons_name">Verberg iconen</string>
-    <string name="switch_start_finish">Verwissel start en einde</string>
+    <string name="rendering_attr_hideIcons_name">Verberg POI-iconen</string>
+    <string name="switch_start_finish">Verwissel start en bestemming</string>
+    <string name="number_of_contributors">Aantal bijdragers</string>
+    <string name="number_of_edits">Aantal bewerkingen</string>
     </resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 6b440c770e..0908aa22dd 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -2587,4 +2587,7 @@
 	<string name="poi_atm_yes">С банкоматом</string>
 	<string name="poi_atm_no">Без банкомата</string>
 
+	<string name="poi_firepit">Место для разведения огня</string>
+	<string name="poi_street_cabinet">Распределительный шкаф</string>
+
 </resources>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 67905b7176..14547163bc 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2066,4 +2066,7 @@
     <string name="shared_string_undo_all">ÅNGRA ALLA</string>
     <string name="rendering_attr_hideIcons_name">Dölj POI-ikoner</string>
     <string name="switch_start_finish">Skifta startpunkt och destination</string>
-    </resources>
+    <string name="number_of_contributors">Antal bidragsgivare</string>
+    <string name="number_of_edits">Antal redigeringar</string>
+    <string name="reports_for">Rapport för:</string>
+</resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 94bafd2fe4..ca64fec682 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2073,4 +2073,7 @@
     <string name="shared_string_undo_all">全部取消</string>
     <string name="rendering_attr_hideIcons_name">隱藏 POI 圖示</string>
     <string name="switch_start_finish">起始點與目的地對調</string>
-    </resources>
+    <string name="number_of_contributors">貢獻者數</string>
+    <string name="number_of_edits">編輯次數</string>
+    <string name="reports_for">報告：</string>
+</resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index c4f0f04f46..477471bff1 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -2584,4 +2584,7 @@
 	<string name="poi_atm_yes">Atm: yes</string>
 	<string name="poi_atm_no">Atm: no</string>
 
+	<string name="poi_firepit">Firepit</string>
+	<string name="poi_street_cabinet">Street cabinet</string>
+
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index a42e15b70d..1370c6e007 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -611,8 +611,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 		if (switched) {
 			mapControlsLayer.switchToRouteFollowingLayout();
 		}
-		//Fix for Issue 2136(a)
-		if (getTargets().getPointToNavigate() == null) {
+		if (getTargets().getPointToNavigate() == null && !selectFromMapTouch) {
 			mapActivity.getMapActions().stopNavigationWithoutConfirm();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java b/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
index 741bdce1d2..90c92f5f79 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
@@ -310,7 +310,7 @@ public class DynamicListView extends ObservableListView {
 				tag.onClick();
 			}
 			touchEventsCancelled();
-			return true;
+			return super.onTouchEvent(event);
 		}
 
 		switch (event.getAction() & MotionEvent.ACTION_MASK) {