diff --git a/OsmAnd/res/drawable-hdpi/map_note_audio.png b/OsmAnd/res/drawable-hdpi/map_note_audio.png
index 871ebf7635..f0e556a8b0 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_audio.png and b/OsmAnd/res/drawable-hdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_note_photo.png b/OsmAnd/res/drawable-hdpi/map_note_photo.png
index e8dd083904..356a271d88 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_photo.png and b/OsmAnd/res/drawable-hdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_note_video.png b/OsmAnd/res/drawable-hdpi/map_note_video.png
index 6fd6304d57..93f0899c89 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_video.png and b/OsmAnd/res/drawable-hdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_limit.png b/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_limit.png
index f0be347077..b245c57063 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_limit.png and b/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_limit.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_no_limit.png
index 31360bbaca..0482c4597b 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_no_limit.png and b/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_no_limit.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_audio.png b/OsmAnd/res/drawable-mdpi/map_note_audio.png
new file mode 100644
index 0000000000..c051d84ea6
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_photo.png b/OsmAnd/res/drawable-mdpi/map_note_photo.png
new file mode 100644
index 0000000000..d33bdfb616
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_video.png b/OsmAnd/res/drawable-mdpi/map_note_video.png
new file mode 100644
index 0000000000..5a0dd204d6
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_poi_parking_pos_limit.png b/OsmAnd/res/drawable-mdpi/map_poi_parking_pos_limit.png
new file mode 100644
index 0000000000..e653e094a5
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_poi_parking_pos_limit.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-mdpi/map_poi_parking_pos_no_limit.png
new file mode 100644
index 0000000000..03f3645b1c
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_poi_parking_pos_no_limit.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_audio.png b/OsmAnd/res/drawable-xhdpi/map_note_audio.png
new file mode 100644
index 0000000000..1cb2800aef
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_photo.png b/OsmAnd/res/drawable-xhdpi/map_note_photo.png
new file mode 100644
index 0000000000..6372f98e22
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_video.png b/OsmAnd/res/drawable-xhdpi/map_note_video.png
new file mode 100644
index 0000000000..23ee46a72f
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_poi_parking_pos_limit.png b/OsmAnd/res/drawable-xhdpi/map_poi_parking_pos_limit.png
new file mode 100644
index 0000000000..a8727b56c4
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_poi_parking_pos_limit.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-xhdpi/map_poi_parking_pos_no_limit.png
new file mode 100644
index 0000000000..fe29b1b09e
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_poi_parking_pos_no_limit.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_audio.png b/OsmAnd/res/drawable-xxhdpi/map_note_audio.png
new file mode 100644
index 0000000000..d017538da1
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_photo.png b/OsmAnd/res/drawable-xxhdpi/map_note_photo.png
new file mode 100644
index 0000000000..94e129c1cf
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_video.png b/OsmAnd/res/drawable-xxhdpi/map_note_video.png
new file mode 100644
index 0000000000..53fff4f716
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_poi_parking_pos_limit.png b/OsmAnd/res/drawable-xxhdpi/map_poi_parking_pos_limit.png
new file mode 100644
index 0000000000..7a353b4776
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_poi_parking_pos_limit.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-xxhdpi/map_poi_parking_pos_no_limit.png
new file mode 100644
index 0000000000..548ecc4fee
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_poi_parking_pos_no_limit.png differ
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 8d6cf76779..8f1e9f2c33 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -709,4 +709,9 @@
 	<string name="poi_smoking_area">Зона для паленьня</string>
 	<string name="poi_training">Навучальны цэнтар</string>
 	<string name="poi_quarter">Квартал</string>
+	<string name="poi_rest_area">Зона адпачынку</string>
+
+	<string name="poi_reservoir">Рэзэрвуар</string>
+	<string name="poi_gasometer">Газасховішча</string>
+	<string name="poi_silo">Сілас</string>
 	</resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index e8cea4dac9..4c6ddc9398 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -728,4 +728,21 @@
 	<string name="poi_field_hockey">Hockey</string>
 	<string name="poi_smoking_area">Rygeområde</string>
 	<string name="poi_quarter">Kvarter</string>
+	<string name="poi_rest_area">Hvileområde</string>
+
+	<string name="poi_reservoir">Reservoir</string>
+	<string name="poi_silo">Silo</string>
+	<string name="poi_storage_tank">Lagertank</string>
+
+	<string name="piste_downhill">Styrtløb</string>
+	<string name="piste_nordic">Nordisk</string>
+	<string name="piste_skitour">Skitur</string>
+	<string name="piste_hike">Vandretur</string>
+	<string name="piste_sleigh">Slæde</string>
+	<string name="piste_sled">Slæde</string>
+	<string name="piste_snow_park">Snepark</string>
+	<string name="piste_playground">Legeplads</string>
+	<string name="piste_ice_skate">Isskøjte</string>
+
+	<string name="poi_gasometer">Gasbeholder</string>
 	</resources>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 4bb7310251..f10a554118 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -694,4 +694,9 @@
 	<string name="poi_field_hockey">Hockey sur gazon</string>
 	<string name="poi_smoking_area">Zone fumeur</string>
 	<string name="poi_quarter">Quartier</string>
+	<string name="poi_rest_area">Aire de repos</string>
+
+	<string name="poi_reservoir">Réservoir</string>
+	<string name="piste_ice_skate">Patinoire</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 1ea645467e..3a6fde4280 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -140,7 +140,7 @@
   <string name="map_version_changed_info">Les fichiers de cartes sur le serveur sont incompatibles avec votre version de l\'application. Pour les télécharger et les utiliser, installez une version plus récente de votre application.</string>
   <string name="shared_string_rename">Renommer</string>
   
-  <string name="poi_filter_nominatim">Recherche OSM Nominatim (en ligne)</string>
+  <string name="poi_filter_nominatim">Recherche OSM en ligne</string>
   <string name="search_position_current_location_search">Recherche de la position…</string>
   <string name="search_position_current_location_found">Position trouvée</string>
   <string name="search_position_address">Adresse…</string>
@@ -257,7 +257,7 @@
   <string name="map_overlay_descr">Choisir la carte en sur-couche</string>
   <string name="tile_source_already_installed">Carte déjà installée, paramètres seront mis à jour</string>
   <string name="select_tile_source_to_install">Sélectionnez les cartes à installer ou mettre à jour</string>
-  <string name="internet_not_available">Une connexion Internet est nécessaire pour cette opération mais est indisponible</string>
+  <string name="internet_not_available">Une connexion Internet est nécessaire pour cette opération</string>
   <string name="install_more">Installer plus…</string>
   <string name="tip_update_index">Mise à jour des cartes hors-ligne</string>
   <string name="tip_update_index_t">"Il est très important d\'avoir des données cartographiques à jour pour la visualisation des cartes hors-ligne, la recherche de points d\'intérêt ou d\'adresses, et la navigation hors-ligne. OsmAnd fournit un gestionnaire de données qui permet de télécharger ces cartes hors-ligne (et d\'autres données), et de vérifier si des mises à jour sont disponibles.
@@ -558,7 +558,7 @@
   <string name="search_nothing_found">Rien n\'a été trouvé</string>
   <string name="searching">Recherche en cours…</string>
   <string name="searching_address">Recherche de l\'adresse…</string>
-  <string name="search_osm_nominatim">Recherche avec le service web OSM Nominatim</string>
+  <string name="search_osm_nominatim">Rechercher en ligne avec OSM Nominatim</string>
   <string name="hint_search_online">Recherche en ligne : Numéro, rue, ville</string>
   <string name="search_offline_address">Hors-ligne</string>
   <string name="search_online_address">Internet</string>
@@ -658,7 +658,7 @@
   <string name="show_poi_over_map_description">Afficher PI sur la carte (utiliser le dernier filtre)</string>
   <string name="show_poi_over_map">Afficher PI</string>
   <string name="map_tile_source_descr">Choisir la source des tuiles de carte (en ligne ou en cache)</string>
-  <string name="map_tile_source">Source de la carte</string>
+  <string name="map_tile_source">Source de la carte (tuiles)</string>
   <string name="map_source">Source cartographique</string>
   <string name="use_internet">Utiliser internet</string>
   <string name="show_location">Afficher votre position</string>
@@ -1924,7 +1924,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="plugin_install_needs_network">Vous devez être connecté à Internet pour installer ce greffon.</string>
 <string name="shared_string_enable">Activer</string>
 	<string name="shared_string_disable">Désactiver</string>
-	<string name="get_plugin">Obtenir</string>
+	<string name="get_plugin">Installer</string>
 <string name="plugin_ski_name">Pistes de ski</string>
     <string name="plugin_nautical_name">Carte marine</string>
     <string name="world_ski_missing">Pour afficher les pistes de ski, une carte hors ligne doit être téléchargée.</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index dbb563f43a..4b9afe59fd 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -695,4 +695,11 @@
 	<string name="poi_quarter">Квартал</string>
 	<string name="poi_field_hockey">Хоккейная площадка</string>
 	<string name="poi_team_handball">Командный гандбол</string>
+	<string name="poi_rest_area">Зона отдыха</string>
+
+	<string name="poi_reservoir">Резервуар</string>
+	<string name="poi_gasometer">Хранилище газа</string>
+	<string name="poi_silo"></string>
+	<string name="poi_apartment">Квартира</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 416aca2f12..b7057f83d7 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -647,4 +647,6 @@
 	<string name="poi_road_obstacle">Impèigu/ostàculu istradale</string>
 		<string name="poi_accomodation">Allògiu</string>
 		<string name="poi_smoking_area">Àrea fumatores</string>
+	<string name="piste_playground">Parcu giogos</string>
+	<string name="poi_car_sharing"></string>
 	</resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 62460d3b76..870b4ed45a 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -227,6 +227,7 @@
 	<string name="poi_speed_camera">Speed camera</string>
 	<string name="poi_turning_circle">Turning circle</string>
 	<string name="poi_motorway_junction">Motorway junction</string>
+	<string name="poi_rest_area">Rest area</string>
 
 	<string name="poi_water_well">Water well</string>
 	<string name="poi_standpipe">Standpipe</string>
@@ -274,7 +275,11 @@
 	<string name="poi_vineyard">Vineyard</string>
 	<string name="poi_orchard">Orchard</string>
 	<string name="poi_salt_pond">Salt pond</string>
+	<string name="poi_reservoir">Reservoir</string>
 	<string name="poi_cricket_nets">Cricket nets</string>
+	<string name="poi_gasometer">Gasometer</string>
+	<string name="poi_silo">Silo</string>
+	<string name="poi_storage_tank">Storage tank</string>
 
 	<string name="poi_college">College</string>
 	<string name="poi_driving_school">Driving school</string>
@@ -520,6 +525,16 @@
 	<string name="poi_club_tourism">Tourism club</string>
 	<string name="poi_club_charity">Charity club</string>
 
+	<string name="piste_downhill">Downhill</string>
+	<string name="piste_nordic">Nordic</string>
+	<string name="piste_skitour">Skitour</string>
+	<string name="piste_hike">Hike</string>
+	<string name="piste_sleigh">Sleigh</string>
+	<string name="piste_sled">Sled</string>
+	<string name="piste_snow_park">Snow park</string>
+	<string name="piste_playground">Playground</string>
+	<string name="piste_ice_skate">Ice skate</string>
+
 	<string name="poi_library">Library</string>
 	<string name="poi_arts_centre">Arts centre</string>
 	<string name="poi_cinema">Cinema</string>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java
index 79c8b00279..17623a63aa 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java
@@ -187,8 +187,8 @@ public class DashWaypointsFragment extends DashLocationFragment {
 		final boolean target = point == getMyApplication().getTargetPointsHelper().getPointToNavigate();
 		Builder builder = new AlertDialog.Builder(view.getContext());
 		// Stop the navigation
-		builder.setTitle(getString(R.string.clear_destination));
-		builder.setMessage(getString(R.string.delete_target_point));
+		builder.setTitle(getString(R.string.delete_target_point));
+		builder.setMessage(getString(R.string.clear_destination));
 		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {