diff --git a/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
index b8f66f4878c..7e1b23cc9fa 100644
--- a/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
+++ b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
@@ -195,7 +195,7 @@ private static String alignChars(String fullText) {
 		return fullText;
 	}
 
-	public static boolean isSpace(char c){
+	private static boolean isSpace(char c){
 		return !Character.isLetter(c) && !Character.isDigit(c);
 	}
 	
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java b/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java
index f50474769e7..286040ce68d 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java
@@ -1,6 +1,5 @@
 package net.osmand.binary;
 
-import net.osmand.CollatorStringMatcher;
 import net.osmand.CollatorStringMatcher.StringMatcherMode;
 import net.osmand.PlatformUtil;
 import net.osmand.ResultMatcher;
@@ -200,7 +199,7 @@ public List<String> prepareStreetName(String s, boolean addCommonWords) {
 		List<String> ls = new ArrayList<String>();
 		int beginning = 0;
 		for (int i = 1; i < s.length(); i++) {
-			if (CollatorStringMatcher.isSpace(s.charAt(i))) {
+			if (Character.isWhitespace(s.charAt(i))) {
 				addWord(ls, s.substring(beginning, i), addCommonWords);
 				beginning = i + 1;
 			} else if (s.charAt(i) == '(') {
diff --git a/OsmAnd/res/drawable/ic_action_lanes_outlined.xml b/OsmAnd/res/drawable/ic_action_lanes_outlined.xml
new file mode 100644
index 00000000000..58a2ddf9037
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_lanes_outlined.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,12L8,8L5,12L7,12V16H9V12L11,12Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M19,12L16,8L13,12L15,12V16H17V12L19,12Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M2,6C2,4.8954 2.8954,4 4,4H20C21.1046,4 22,4.8954 22,6V18C22,19.1046 21.1046,20 20,20H4C2.8954,20 2,19.1046 2,18V6ZM4,6H20V18H4V6Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_speed_limit.xml b/OsmAnd/res/drawable/ic_action_speed_limit.xml
index 41c5acafcf3..bcd50340bcd 100644
--- a/OsmAnd/res/drawable/ic_action_speed_limit.xml
+++ b/OsmAnd/res/drawable/ic_action_speed_limit.xml
@@ -4,16 +4,15 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeAlpha="0.2"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.2"/>
+      android:pathData="M9.7499,13.622V14C9.7499,14.6904 9.1903,15.25 8.4999,15.25H7.9999V16.75H8.4999C10.0187,16.75 11.2499,15.5188 11.2499,14V11.5093L11.2499,11.5L11.25,9.5C11.25,8.2574 10.2426,7.25 9,7.25C7.7573,7.25 6.75,8.2573 6.75,9.5V11.5C6.75,12.7427 7.7573,13.75 9,13.75C9.2629,13.75 9.5153,13.7049 9.7499,13.622ZM9.7499,11.5054C9.747,11.9171 9.4124,12.25 9,12.25C8.5857,12.25 8.25,11.9142 8.25,11.5V9.5C8.25,9.0858 8.5857,8.75 9,8.75C9.4142,8.75 9.75,9.0858 9.75,9.5L9.7499,11.5054Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
   <path
-      android:pathData="M12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20ZM12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
-      android:fillColor="#ffffff"
+      android:pathData="M12.2499,9.5C12.2499,8.2574 13.2573,7.25 14.4999,7.25C15.7425,7.25 16.7499,8.2574 16.7499,9.5V14.5C16.7499,15.7426 15.7425,16.75 14.4999,16.75C13.2573,16.75 12.2499,15.7426 12.2499,14.5V9.5ZM14.4999,8.75C14.0857,8.75 13.7499,9.0858 13.7499,9.5V14.5C13.7499,14.9142 14.0857,15.25 14.4999,15.25C14.9141,15.25 15.2499,14.9142 15.2499,14.5V9.5C15.2499,9.0858 14.9141,8.75 14.4999,8.75Z"
+      android:fillColor="#727272"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="M10,8C8.3432,8 7,9.3432 7,11V14C7,15.1046 7.8954,16 9,16H10C11.1046,16 12,15.1046 12,14V13.5C12,14.8807 13.1193,16 14.5,16C15.8807,16 17,14.8807 17,13.5V10.5C17,9.1193 15.8807,8 14.5,8C13.1193,8 12,9.1193 12,10.5V13C12,11.8954 11.1046,11 10,11H9C9,10.4477 9.4477,10 10,10H11V8H10ZM9,14V13H10V14H9ZM14.5,14C14.2239,14 14,13.7761 14,13.5V10.5C14,10.2239 14.2239,10 14.5,10C14.7761,10 15,10.2239 15,10.5V13.5C15,13.7761 14.7761,14 14.5,14Z"
-      android:fillColor="#ffffff"
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#727272"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/OsmAnd/res/drawable/ic_action_steep_ascent.xml b/OsmAnd/res/drawable/ic_action_steep_ascent.xml
new file mode 100644
index 00000000000..fd6dcfd24e6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_steep_ascent.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.9267,13.7862L15,10.0932L10.7937,9.5998L11.5075,11.0009L7.6646,12.9224L8.3354,14.264L12.1885,12.3374L12.9267,13.7862Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M4.5886,18.7057L4.423,19H19.577L16.157,12.9215L4.5886,18.7057Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M22.6976,18.4589L14.2317,3.3094C13.7799,2.5009 12.9262,2 12,2C11.0738,2 10.2201,2.5009 9.7683,3.3094L1.3024,18.4589C1.1041,18.8137 1,19.2134 1,19.6199C1,20.9344 2.0656,22 3.3801,22H20.6199C21.9344,22 23,20.9344 23,19.6199C23,19.2134 22.8959,18.8137 22.6976,18.4589ZM20.9532,19.4068L12.4314,4.2601C12.3469,4.1001 12.1809,4 12,4C11.8191,4 11.6531,4.1001 11.5686,4.2601L3.0468,19.4068C3.0161,19.465 3,19.5298 3,19.5956C3,19.8189 3.1811,20 3.4044,20H20.5956C20.8189,20 21,19.8189 21,19.5956C21,19.5298 20.9839,19.465 20.9532,19.4068Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_uneven_road.xml b/OsmAnd/res/drawable/ic_action_uneven_road.xml
new file mode 100644
index 00000000000..3a7644e9892
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_uneven_road.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,17V19H19V17H18C17.5858,17 17.3431,16.6569 17.0589,16.2548C16.6569,15.6863 16.1716,15 15,15C13.8284,15 13.3431,15.6863 12.9411,16.2548C12.6569,16.6569 12.4142,17 12,17C11.5858,17 11.3431,16.6569 11.0589,16.2548C10.6569,15.6863 10.1716,15 9,15C7.8284,15 7.3432,15.6863 6.9411,16.2548C6.6568,16.6569 6.4142,17 6,17H5Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M22.6976,18.4589L14.2317,3.3094C13.7799,2.5009 12.9262,2 12,2C11.0738,2 10.2201,2.5009 9.7683,3.3094L1.3024,18.4589C1.1041,18.8137 1,19.2134 1,19.6199C1,20.9344 2.0656,22 3.3801,22H20.6199C21.9344,22 23,20.9344 23,19.6199C23,19.2134 22.8959,18.8137 22.6976,18.4589ZM20.9532,19.4068L12.4314,4.2601C12.3469,4.1001 12.1809,4 12,4C11.8191,4 11.6531,4.1001 11.5686,4.2601L3.0468,19.4068C3.0161,19.465 3,19.5298 3,19.5956C3,19.8189 3.1811,20 3.4044,20H20.5956C20.8189,20 21,19.8189 21,19.5956C21,19.5298 20.9839,19.465 20.9532,19.4068Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 8784fe9999b..b0de9b914cf 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -43,7 +43,7 @@
     <string name="poi_furniture">Møbelforretning</string>
     <string name="poi_garden_centre">Havecenter</string>
     <string name="poi_gas">Flaskegas</string>
-    <string name="poi_shop_yes">Landhandel</string>
+    <string name="poi_shop_yes">Butik</string>
     <string name="poi_gift">Gavebutik</string>
     <string name="poi_glaziery">Glarmester</string>
     <string name="poi_hardware">Værktøj</string>
@@ -96,7 +96,7 @@
     <string name="poi_fire_water_pond">Branddam</string>
     <string name="poi_grit_bin">Grusbeholder</string>
     <string name="poi_ambulance_station">Ambulancestation</string>
-    <string name="poi_disaster_response">SES station</string>
+    <string name="poi_disaster_response">Katastrofe beredskabsstation</string>
     <string name="poi_emergency_access_point">Nødstilfælde punkt</string>
     <string name="poi_ford">Vadested</string>
     <string name="poi_mountain_pass">Bjergpas</string>
@@ -118,7 +118,7 @@
     <string name="poi_vehicle_inspection">Bilsyn</string>
     <string name="poi_car_wash">Bilvask</string>
     <string name="poi_fuel">Tankstation;Benzintank;Servicestation</string>
-    <string name="poi_electricity_combined_charging">Ladestation</string>
+    <string name="poi_electricity_combined_charging">Opladningsstation;Elektrisk bil opladningsstation;El-bil opladningsstation;Elektrisk opladningspunkt;Opladningspunkt;Elektrisk ladningspunkt;Elektrisk bil forsyninger;Ladestation</string>
     <string name="poi_vehicle_ramp">Kørerampe</string>
     <string name="poi_compressed_air">Trykluft</string>
     <string name="poi_parking">Parkering</string>
@@ -133,12 +133,12 @@
     <string name="poi_tram_stop">Sporvognsstoppested</string>
     <string name="poi_public_transport_station">Offentligtransport station</string>
     <string name="poi_bus_station">Busstation</string>
-    <string name="poi_railway_station">Banegård</string>
-    <string name="poi_railway_platform">Perron</string>
+    <string name="poi_railway_station">Banegård:Banegård;Togstation</string>
+    <string name="poi_railway_platform">Jernbaneperron;Togperron</string>
     <string name="poi_subway_entrance">Metroindgang</string>
-    <string name="poi_subway_station">Ja</string>
+    <string name="poi_subway_station">Ja;Undergrunds station</string>
     <string name="poi_taxi">Taxaholdeplads</string>
-    <string name="poi_aerodrome">Lufthavn</string>
+    <string name="poi_aerodrome">Lufthavn;Flyveplads</string>
     <string name="poi_helipad">Helikopterlandingsplads</string>
     <string name="poi_runway">Landingsbane</string>
     <string name="poi_aeroway_terminal">Lufthavnsterminal</string>
@@ -280,7 +280,7 @@
     <string name="poi_horse_racing">Hestevæddeløb</string>
     <string name="poi_ice_skating">Skøjteløb</string>
     <string name="poi_ice_stock">Isstok</string>
-    <string name="poi_korfbal">Korfbal</string>
+    <string name="poi_korfbal">Korfball</string>
     <string name="poi_sport_motor">Motorsport</string>
     <string name="poi_sport_multi">Multisport</string>
     <string name="poi_orienteering">Orienteringsløb</string>
@@ -326,7 +326,7 @@
     <string name="poi_hostel">Vandrerhjem</string>
     <string name="poi_motel">Motel</string>
     <string name="poi_alpine_hut">Bjerghytte;Shelter</string>
-    <string name="poi_chalet">Udlejningshytte</string>
+    <string name="poi_chalet">Udlejningshytte;Shelter</string>
     <string name="poi_place_of_worship">Sted for tilbedelse</string>
     <string name="poi_religion_christian">Kristendom</string>
     <string name="poi_religion_jewish">Jødedom</string>
@@ -625,7 +625,7 @@
     <string name="poi_clothes_children">Børnetøj</string>
     <string name="poi_apartment">Lejlighed</string>
     <string name="poi_public_transport_stop_position">Offentlig transport stoppested</string>
-    <string name="poi_halt">Trinbræt</string>
+    <string name="poi_halt">Trinbræt;Togstation</string>
     <string name="poi_lodging">Logi</string>
     <string name="poi_internet_access_wlan">Internetadgang: wlan</string>
     <string name="poi_internet_access_terminal">Internetadgang: terminal</string>
@@ -713,7 +713,7 @@
     <string name="poi_village_green">Grønning</string>
     <string name="poi_junction">Vejkryds</string>
     <string name="poi_sailing">Sejlads</string>
-    <string name="poi_charity">Genbrugsbutik, velgørenhed</string>
+    <string name="poi_charity">Velgørenhedsbutik</string>
     <string name="poi_photo">Fotoforretning</string>
     <string name="poi_tomb">Gravkammer</string>
     <string name="poi_wilderness_hut">Vildmarkshytte;Shelter</string>
@@ -723,8 +723,8 @@
     <string name="poi_bell_tower">Klokketårn</string>
     <string name="poi_ski_rental">Skiudlejning</string>
     <string name="poi_ski_resort">Skisportssted</string>
-    <string name="poi_cabin">Hytte</string>
-    <string name="poi_hunting_lodge">Jagthytte</string>
+    <string name="poi_cabin">Hytte;Shelter</string>
+    <string name="poi_hunting_lodge">Jagthytte;Shelter</string>
     <string name="poi_picnic_table">Bordbænkesæt</string>
     <string name="poi_hanami">Hanami</string>
     <string name="poi_wine_cellar">Vinkælder</string>
@@ -859,7 +859,7 @@
     <string name="poi_enforcement_access">Kontrol: adgang</string>
     <string name="poi_enforcement_toll">Kontrol: vejafgift</string>
     <string name="poi_country">Land</string>
-    <string name="poi_fee_yes">Ja</string>
+    <string name="poi_fee_yes">Ja;Gratis</string>
     <string name="poi_abandoned_poi">Forladt objekt</string>
     <string name="poi_route_hiking_iwn_poi">International vandrerute</string>
     <string name="poi_route_hiking_nwn_poi">National vandrerute</string>
@@ -877,7 +877,7 @@
     <string name="poi_access_delivery">Adgang for levering</string>
     <string name="poi_access_agricultural">Adgang for landbrug</string>
     <string name="poi_monitoring_station">Målestation</string>
-    <string name="poi_capital">Ja</string>
+    <string name="poi_capital">Ja;Hovedstad</string>
     <string name="poi_fee_no">Nej</string>
     <string name="poi_email">E-mail</string>
     <string name="poi_fax">Fax</string>
@@ -955,11 +955,11 @@
     <string name="poi_recycling_car_batteries">Bilbatterier</string>
     <string name="poi_recycling_cars">Biler</string>
     <string name="poi_recycling_bicycles">Cykler</string>
-    <string name="poi_drinking_water_yes">Ja</string>
+    <string name="poi_drinking_water_yes">Ja;Drikkevand</string>
     <string name="poi_drinking_water_no">Nej</string>
     <string name="poi_supervised_yes">Overvåget</string>
     <string name="poi_supervised_no">Ikke overvåget</string>
-    <string name="poi_seasonal_yes">Ja</string>
+    <string name="poi_seasonal_yes">Ja;Season bestemt</string>
     <string name="poi_seasonal_no">Nej</string>
     <string name="poi_seasonal_dry_season">Tørre årstid</string>
     <string name="poi_seasonal_wet_season">Våde årstid</string>
@@ -1058,7 +1058,7 @@
     <string name="poi_denomination_scientist">Kristen Videnskab</string>
     <string name="poi_landfill_waste_nuclear">Atomaffald</string>
     <string name="poi_start_date">Startdato</string>
-    <string name="poi_wheelchair_yes">Ja</string>
+    <string name="poi_wheelchair_yes">Ja;Kørestol</string>
     <string name="poi_content_silage">Indhold: ensilage</string>
     <string name="poi_content_water">Indhold: vand</string>
     <string name="poi_content_slurry">Indhold: gylle</string>
@@ -1159,7 +1159,7 @@
     <string name="poi_pump_powered">Motordrevet</string>
     <string name="poi_pump_no">Ingen pumpe</string>
     <string name="poi_water_characteristic_mineral">Mineralsk</string>
-    <string name="poi_water_characteristic_mud">Vandkarakteristisk: mudret</string>
+    <string name="poi_water_characteristic_mud">Mudret</string>
     <string name="poi_water_characteristic_sulfuric">Svovlholdig</string>
     <string name="poi_water_point">Vandtilslutning</string>
     <string name="poi_species">Arter</string>
@@ -1189,9 +1189,9 @@
     <string name="poi_board_type_notice">Opslagstavle</string>
     <string name="poi_commercial">Forretningsområde</string>
     <string name="poi_retail">Detailhandelsområde</string>
-    <string name="poi_fireplace_yes">Ja</string>
+    <string name="poi_fireplace_yes">Ja;Bålsted</string>
     <string name="poi_fireplace_no">Intet ildsted</string>
-    <string name="poi_covered_yes">Ja</string>
+    <string name="poi_covered_yes">Ja;Overdækket</string>
     <string name="poi_covered_no">Ikke overdækket</string>
     <string name="poi_smoking_no">Ikke tilladt</string>
     <string name="poi_smoking_outside">Kun udendørs</string>
@@ -1203,8 +1203,8 @@
     <string name="poi_toll_yes">Vejafgift</string>
     <string name="poi_tactile_paving_yes">Ja</string>
     <string name="poi_tactile_paving_no">Uden taktilbelægning</string>
-    <string name="poi_traffic_signals_sound_yes">Ja</string>
-    <string name="poi_traffic_signals_sound_no">Nej</string>
+    <string name="poi_traffic_signals_sound_yes">Ja;Trafiklys lyd</string>
+    <string name="poi_traffic_signals_sound_no">Lyd: nej</string>
     <string name="poi_traffic_signals_sound_walk">Kun når det er tilladt at gå</string>
     <string name="poi_ford_stepping_stones">Trædestensbro</string>
     <string name="poi_toll_hgv_yes">HGV vejafgift</string>
@@ -1232,7 +1232,7 @@
     <string name="poi_leisure_common">Fælles rekreativt område</string>
     <string name="poi_level">Niveau</string>
     <string name="poi_rtsa_scale">RTSA skala</string>
-    <string name="poi_pump_yes">Ja</string>
+    <string name="poi_pump_yes">Ja;Pumpe</string>
     <string name="poi_piste_difficulty_easy">Let</string>
     <string name="poi_piste_difficulty_intermediate">Mellem</string>
     <string name="poi_piste_difficulty_advanced">Avanceret</string>
@@ -1256,7 +1256,7 @@
     <string name="poi_garden_style_kitchen">Havestil: køkken</string>
     <string name="poi_garden_style_rosarium">Havestil: rosenhave</string>
     <string name="poi_capacity">Kapacitet</string>
-    <string name="poi_capacity_disabled_yes">Ja</string>
+    <string name="poi_capacity_disabled_yes">Ja;Plads til handicappede</string>
     <string name="poi_capacity_disabled_no">Ingen pladser forbeholdt handicappede</string>
     <string name="poi_capacity_disabled">Pladser forbeholdt handicappede</string>
     <string name="poi_capacity_women_yes">Pladser forbeholdt kvinder</string>
@@ -1271,8 +1271,8 @@
     <string name="poi_aerialway_capacity">Kapacitet pr. time</string>
     <string name="poi_aerialway_duration">Gennemsnitlige rejsetid, minutter</string>
     <string name="poi_aerialway_bubble_yes">Boble lukket</string>
-    <string name="poi_aerialway_bubble_no">Ingen boble</string>
-    <string name="poi_aerialway_heating_yes">Ja</string>
+    <string name="poi_aerialway_bubble_no">Ingen bobbel</string>
+    <string name="poi_aerialway_heating_yes">Ja;Opvarmning</string>
     <string name="poi_aerialway_heating_no">Ikke opvarmet</string>
     <string name="poi_aerialway_bicycle_yes">Tilladt</string>
     <string name="poi_aerialway_bicycle_no">Cykel: ikke tilladt</string>
@@ -1463,12 +1463,12 @@
     <string name="poi_diet_lactose_free_yes">Laktosefri</string>
     <string name="poi_diet_lactose_free_no">Laktosefri kost: nej</string>
     <string name="poi_diet_pescetarian_yes">Pesco-vegetar</string>
-    <string name="poi_drive_in_yes">Ja</string>
+    <string name="poi_drive_in_yes">Ja;Drive-in</string>
     <string name="poi_drive_in_no">Drive-in: nej</string>
-    <string name="poi_drive_through_yes">Ja</string>
+    <string name="poi_drive_through_yes">Ja;Drive through</string>
     <string name="poi_drive_through_no">Drive-through: nej</string>
     <string name="poi_brewery_additional">Bryggerinavn</string>
-    <string name="poi_microbrewery_yes">Ja</string>
+    <string name="poi_microbrewery_yes">Ja;Mikrobryggeri</string>
     <string name="poi_microbrewery_no">Ingen mikrobryggeri</string>
     <string name="poi_takeaway_yes">Take Away</string>
     <string name="poi_takeaway_no">Ingen takeaway</string>
@@ -1483,22 +1483,22 @@
     <string name="poi_outdoor_seating_pedestrian_zone">Udendørs siddepladser: gågade</string>
     <string name="poi_outdoor_seating_garden">Udendørs siddepladser: have</string>
     <string name="poi_outdoor_seating_patio">Udendørs siddepladser: gårdhave</string>
-    <string name="poi_cocktails_yes">Ja</string>
-    <string name="poi_second_hand_yes">Brugte varer</string>
+    <string name="poi_cocktails_yes">Ja;Cocktails</string>
+    <string name="poi_second_hand_yes">Ja</string>
     <string name="poi_second_hand_no">Ingen brugte varer</string>
-    <string name="poi_second_hand_only">Kun brugte varer</string>
+    <string name="poi_second_hand_only">Kun</string>
     <string name="poi_service_parts">Dele</string>
     <string name="poi_service_dealer">Forhandler</string>
     <string name="poi_service_repair">Reparation</string>
     <string name="poi_service_repair_no">Ingen reparation</string>
     <string name="poi_service_electrical">Reparation af elektriske køretøjer</string>
     <string name="poi_motorcycle_repair">Motorcykel reparation</string>
-    <string name="poi_self_service_yes">Ja</string>
-    <string name="poi_self_service_no">Nej</string>
-    <string name="poi_automated_yes">Ja</string>
+    <string name="poi_self_service_yes">Ja;Selvbetjening</string>
+    <string name="poi_self_service_no">Nej;Ingen selvbetjening</string>
+    <string name="poi_automated_yes">Ja;Automatiseret</string>
     <string name="poi_automated_no">Ikke automatiseret</string>
     <string name="poi_full_service_yes">Fuld service</string>
-    <string name="poi_brushless_yes">Ja</string>
+    <string name="poi_brushless_yes">Ja;Børsteløs</string>
     <string name="poi_brushless_no">Børsteløs: nej</string>
     <string name="poi_aeroway_fuel">Flytankstation</string>
     <string name="poi_public_bath">Offentligt bad</string>
@@ -1508,7 +1508,7 @@
     <string name="poi_female_no">Forbudt for kvinder</string>
     <string name="poi_indoor_yes">Indendørs</string>
     <string name="poi_indoor_no">Udendørs</string>
-    <string name="poi_toilets_yes">Ja</string>
+    <string name="poi_toilets_yes">Ja;Toiletter</string>
     <string name="poi_toilets_no">Uden toiletter</string>
     <string name="poi_toilets_wheelchair_yes">Adgang til toiletter for kørestole: ja</string>
     <string name="poi_toilets_wheelchair_no">Adgang til toiletter for kørestole: nej</string>
@@ -1520,7 +1520,7 @@
     <string name="poi_diaper_no">Ingen puslebord</string>
     <string name="poi_diaper_room">Puslerum</string>
     <string name="poi_events_venue">Selskabslokale</string>
-    <string name="poi_car_wash_no">Nej</string>
+    <string name="poi_car_wash_no">Nej;Bilvask: nej</string>
     <string name="poi_maxstay">Parkeringstidsgrænse</string>
     <string name="poi_vending_parking_tickets">Parkeringsbilletter</string>
     <string name="poi_vending_cigarettes">Cigaretter</string>
@@ -1565,7 +1565,7 @@
     <string name="poi_memorial_koshinto">Koshinto</string>
     <string name="poi_memorial_blue_plaque">Blå plakette</string>
     <string name="poi_memorial_jizo">Jizo</string>
-    <string name="poi_memorial_cross">Korsformet</string>
+    <string name="poi_memorial_cross">Korsform</string>
     <string name="poi_memorial_vehicle">Køretøj</string>
     <string name="poi_memorial_obelisk">Obelisk</string>
     <string name="poi_vending_excrement_bags">Hundeposer</string>
@@ -1642,7 +1642,7 @@
     <string name="poi_palm">Palme</string>
     <string name="poi_cypress">Cypres</string>
     <string name="poi_flagpole">Flagstang</string>
-    <string name="poi_bench_yes">Ja</string>
+    <string name="poi_bench_yes">Ja;Bænk</string>
     <string name="poi_bench_no">Uden bænk</string>
     <string name="poi_bin_yes">Med affaldskurv</string>
     <string name="poi_bin_no">Uden affaldskurv</string>
@@ -1785,7 +1785,7 @@
     <string name="poi_service_bicycle_cleaning_no">Cykelrengøring: nej</string>
     <string name="poi_service_bicycle_chaintool_yes">Kædeværktøj;Cykelkædeværktøj</string>
     <string name="poi_service_bicycle_chaintool_no">Cykelkædeværktøj: nej</string>
-    <string name="poi_service_bicycle_second_hand_yes">Salg af brugte cykler</string>
+    <string name="poi_service_bicycle_second_hand_yes">Salg af brugte cykler;Brugte cykler;Brugte cykler</string>
     <string name="poi_service_bicycle_second_hand_no">Salg af brugte cykler: nej</string>
     <string name="poi_wildlife_hide">Vildtskjul</string>
     <string name="poi_training_language">Uddannelse: sprog</string>
@@ -1849,7 +1849,7 @@
     <string name="poi_fuel_100ll">100LL brændstof</string>
     <string name="poi_fuel_autogas">Autogas</string>
     <string name="poi_fuel_jeta1">Jet A-1 brændstof</string>
-    <string name="poi_fuel_adblue">AdBlue brændstof</string>
+    <string name="poi_fuel_adblue">Dieseludstødningsvæske</string>
     <string name="poi_fuel_wood">Brændstof: træ</string>
     <string name="poi_fuel_charcoal">Brwændstof: trækul</string>
     <string name="poi_fuel_coal">Brændstof: kul</string>
@@ -1934,11 +1934,11 @@
     <string name="poi_openfire_no">Åben ild ikke tilladt</string>
     <string name="poi_backcountry_yes">Ja;Vildmark</string>
     <string name="poi_backcountry_no">Nej</string>
-    <string name="poi_scout_yes">Ja</string>
+    <string name="poi_scout_yes">Ja;Spejder</string>
     <string name="poi_scout_no">Spejderlejr: nej</string>
     <string name="poi_group_only_yes">Kun grupper: ja</string>
     <string name="poi_group_only_no">Kun grupper: nej</string>
-    <string name="poi_washing_machine_yes">Ja</string>
+    <string name="poi_washing_machine_yes">Ja;Vaskemaskine</string>
     <string name="poi_washing_machine_no">Vaskemaskine: nej</string>
     <string name="poi_shower_yes">Bruser: ja</string>
     <string name="poi_shower_no">Brusebad: nej</string>
@@ -1948,8 +1948,8 @@
     <string name="poi_shower_indoor">Bruser: indendørs</string>
     <string name="poi_caravans_yes">Ja</string>
     <string name="poi_caravans_no">Campingvogne: nej</string>
-    <string name="poi_impromptu_yes">Improviseret: ja</string>
-    <string name="poi_impromptu_no">Improviseret: nej</string>
+    <string name="poi_impromptu_yes">Ja</string>
+    <string name="poi_impromptu_no">Nej</string>
     <string name="poi_sanitary_dump_station_yes">Sanitær tømmestation: ja</string>
     <string name="poi_sanitary_dump_station_no">Sanitær tømmestation: nej</string>
     <string name="poi_power_supply_yes">Ja</string>
@@ -2997,16 +2997,16 @@
     <string name="poi_cuisine_diner">Diner</string>
     <string name="poi_cuisine_fine_dining">Haute cuisine</string>
     <string name="poi_cuisine_tea_shop">Tehus</string>
-    <string name="poi_outdoor_seating_filter_yes">Ja</string>
-    <string name="poi_delivery_filter_yes">Ja</string>
+    <string name="poi_outdoor_seating_filter_yes">Ja;Udendørs siddepladser</string>
+    <string name="poi_delivery_filter_yes">Ja;Levering</string>
     <string name="poi_diet_vegetarian_filter_yes">Vegetar</string>
     <string name="poi_diet_vegan_filter_yes">Vegan</string>
     <string name="poi_diet_gluten_free_filter_yes">Glutenfri</string>
     <string name="poi_diet_kosher_filter_yes">Kosher</string>
     <string name="poi_diet_halal_filter_yes">Halal</string>
     <string name="poi_diet_lactose_free_filter_yes">Laktosefri</string>
-    <string name="poi_takeaway_filter_yes">Ja</string>
-    <string name="poi_shower_filter_yes">Ja</string>
+    <string name="poi_takeaway_filter_yes">Ja;Takeaway</string>
+    <string name="poi_shower_filter_yes">Ja;Bruser filter</string>
     <string name="poi_payment_transport_type">Betalingstype (transport)</string>
     <string name="poi_social_facility_type">Type</string>
     <string name="poi_social_facility_for">Målgruppe</string>
@@ -4120,4 +4120,25 @@
     <string name="poi_climbing_bolts_filter">Klatrebolte</string>
     <string name="poi_climbing_quality">Klatre kvalitet</string>
     <string name="poi_second_hand_filter">Brugte varer</string>
-</resources>
\ No newline at end of file
+    <string name="poi_shop_general">Landhandel</string>
+    <string name="poi_live_music">Live musik</string>
+    <string name="poi_healthcare_speciality_clinic">Helbreds specialist: klinik</string>
+    <string name="poi_us_maps_recreation_area_open_status">Adgangsstatus til rekreativt område</string>
+    <string name="poi_us_maps_recreation_area_activity">Aktivitet i rekreativt område</string>
+    <string name="poi_impromptu">Improviseret</string>
+    <string name="poi_reservation">Reservation</string>
+    <string name="poi_healthcare_speciality_psychotherapist">Sundhedsfagligt speciale: psykoterapeut</string>
+    <string name="poi_healthcare_speciality_laboratory">Sundhedsfagligt speciale: laboratorium</string>
+    <string name="poi_indoor_seating_no">Ingen indendørs siddepladser</string>
+    <string name="poi_route_activity_type_caving">Grotte udforskning</string>
+    <string name="poi_route_activity_type_golfing">Golf</string>
+    <string name="poi_route_activity_type_inline_skates">Rulleskøjter</string>
+    <string name="poi_music_venue">Musiksted</string>
+    <string name="poi_indoor_seating_yes">Indendørs siddepladser: ja</string>
+    <string name="poi_photo_booth">Foto station</string>
+    <string name="poi_route_activity_type_rafting">Rafting</string>
+    <string name="poi_route_activity_type_fitness">Fitness</string>
+    <string name="poi_climbing_boulder">Klatre boulder</string>
+    <string name="poi_route_activity_type_windsurfing">Windsurfing</string>
+    <string name="poi_route_activity_type_motorboat">Motorbåd</string>
+</resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index e5c9b5aadde..b92ea0f939c 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -4868,7 +4868,7 @@
     <string name="poi_property_management">Immobilienverwaltung</string>
     <string name="poi_engineer">Ingenieurbüro</string>
     <string name="poi_mcdonalds">McDonald\'s</string>
-    <string name="poi_cash_in">Kaution</string>
+    <string name="poi_cash_in">Einzahlung möglich</string>
     <string name="poi_cash_in_yes">Ja</string>
     <string name="poi_cash_in_no">Nein</string>
     <string name="poi_cash_in_customers">Kunden</string>
@@ -4968,4 +4968,4 @@
     <string name="poi_route_activity_type_touring">Touring</string>
     <string name="poi_route_activity_type_gravel_biking">Gravel-Bike fahren</string>
     <string name="poi_climbing_route_bottom">Anfangsstück der Kletterroute</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 92aa72107f2..8604de1afbc 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -3174,7 +3174,7 @@
     <string name="live_monitoring_adress">Webadresse</string>
     <string name="monitoring_notification">Benachrichtigung</string>
     <string name="monitoring_min_speed">Mindestgeschwindigkeit</string>
-    <string name="monitoring_min_accuracy">Minimale Genauigkeit</string>
+    <string name="monitoring_min_accuracy">Mindestgenauigkeit</string>
     <string name="monitoring_min_distance">Minimale Verschiebung</string>
     <string name="reset_plugin_to_default">Plugin-Einstellungen auf Voreinstellung zurücksetzen</string>
     <string name="osm_authorization_success">Autorisierung ist erfolgreich</string>
@@ -5683,4 +5683,4 @@
     <string name="rendering_attr_showClimbingRoutes_description">Kletterrouten anzeigen</string>
     <string name="display_distance_to_first_intermediate_summary">Zeigt zuerst die Zeit und Entfernung für den nächsten Halt an. Schalte um, um immer Details zum Ziel anzuzeigen.</string>
     <string name="display_distance_to_first_intermediate">Zeige Routendetails zum nächsten Halt</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index b8089b9fac4..a22e8d5a485 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -4666,7 +4666,7 @@
     <string name="choose_what_to_sync">Elektu kion samtempigi</string>
     <string name="changes">Ŝanĝoj %1$s</string>
     <string name="cloud_changes">Ŝanĝoj en la nubo</string>
-    <string name="cloud_sync_progress">Samtempigado…%1$s</string>
+    <string name="cloud_sync_progress">Samtempigado… %1$s</string>
     <string name="checking_progress">Kontrolado…</string>
     <string name="shared_string_modified">Modifita</string>
     <string name="res_unknown">Nekonata</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index e247c17a5f0..c035fc7bd12 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -103,7 +103,7 @@
     <string name="shared_string_unexpected_error">Error inesperado</string>
     <string name="shared_string_action_template">Acción {0}</string>
     <string name="shared_string_close">Cerrar</string>
-    <string name="shared_string_exit">Salida</string>
+    <string name="shared_string_exit">Salir</string>
     <string name="shared_string_show">Mostrar</string>
     <string name="shared_string_show_all">Mostrar todo</string>
     <string name="shared_string_collapse">Contraer</string>
@@ -5539,4 +5539,4 @@
     <string name="rendering_attr_showClimbingRoutes_description">Mostrar rutas de escalada</string>
     <string name="display_distance_to_first_intermediate">Mostrar detalles de la ruta para la siguiente parada</string>
     <string name="display_distance_to_first_intermediate_summary">Muestra primero el tiempo y la distancia a la siguiente parada. Desactivarla mostrará siempre los detalles del destino.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index a5553f30f07..997bab404be 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -467,7 +467,7 @@
     <string name="map_imported_successfully">Kaart imporditud</string>
     <string name="enter_the_file_name">Sisesta failinimi.</string>
     <string name="transport_nearby_routes_within">Lähedalolevad teekonnad</string>
-    <string name="transport_nearby_routes">Ulatus</string>
+    <string name="transport_nearby_routes">Ümbruses</string>
     <string name="dd_mm_ss_format">DD°MM′SS″</string>
     <string name="dd_dddddd_format">DD.DDDDDD°</string>
     <string name="dd_ddddd_format">DD.DDDDD°</string>
@@ -1214,7 +1214,7 @@
     <string name="map_widget_right">Parempoolne paneel</string>
     <string name="map_widget_left">Vasakpoolne paneel</string>
     <string name="configure_map">Seadista kaarti</string>
-    <string name="search_radius_proximity">Ulatus</string>
+    <string name="search_radius_proximity">Ümbruses</string>
     <string name="anonymous_user_hint">Anonüümsed kasutajad ei saa:
 \n- Luua gruppe;
 \n- Serveriga gruppe ja seadmeid sünkroonida;
@@ -1310,13 +1310,9 @@
     <string name="layer_amenity_label">Punktide sildid (huvipunktid, lemmikud)</string>
     <string name="loading_smth">%1$s laadimine…</string>
     <string name="map_widget_plain_time">Praegune aeg</string>
-    <string name="selected_gpx_info_show">"
-\n
-\nKaardil vaatamiseks puuduta pikalt"</string>
+    <string name="selected_gpx_info_show">\n\nKaardil vaatamiseks puuduta pikalt</string>
     <string name="delay_navigation_start">Alusta pöörangupõhist juhendamist automaatselt</string>
-    <string name="local_index_gpx_info_show">"
-\n
-\nValikuteks puuduta pikemalt"</string>
+    <string name="local_index_gpx_info_show">\n\nValikuteks puuduta pikemalt</string>
     <string name="gpx_info_subtracks">Alamrajad: %1$s</string>
     <string name="gpx_info_waypoints">Teekonnapunktid: %1$s</string>
     <string name="gpx_info_distance">Kaugus: %1$s (%2$s punkti)</string>
@@ -2452,14 +2448,7 @@
     <string name="do_not_show_startup_messages">Ära kuva käivitusteateid</string>
     <string name="do_not_show_startup_messages_desc">Ära kuva rakenduse allahindlusi ega kohalike sündmuste teateid.</string>
     <string name="osmand_extended_description_part2">GPS-navigeerimine \n • Vali võrguühenduseta (välismaal viibides rändlustasudeta) või võrgus (kiirem) vahel \n • Hääljuhised pöörangupõhisel suunamisel juhatavad sind mööda teed (salvestatud ja sünteesitud hääled) \n • Teekond arvutatakse sellest kõrvale kaldudes alati ümber \n • Teeäärsed juhised, tänavanimed ja eeldatav saabumisaeg on teel olles abiks \n • Reisi turvalisemaks muutmiseks lülitatakse päeval/öösel ekraani režiim automaatselt ümber \n • Näitame kiiruspiiranguid ja saad selle ületamise korral meeldetuletusi \n • Kaardi suurendustaset kohandame vastavalt sinu kiirusele \n • Otsi sihtkohti aadressi, liigi (nt parkimine, restoran, hotell, bensiinijaam, muuseum) või geograafiliste koordinaatide järgi \n • Toetab teekonna vahepunkte \n • Salvesta oma andmed või laadi üles GPX rada ja liigu mööda seda</string>
-    <string name="osmand_plus_extended_description_part2">Navigeerimine
-\n • Töötab võrgus (kiire) või võrguühenduseta (välismaal viibides puuduvad rändlustasud)
-\n • Täpsed hääljuhised (salvestatud ja sünteesitud hääled)
-\n • Valikuline sõiduradade juhendamine, tänavanime kuvamine ja eeldatav saabumisaeg
-\n • Toetab teekonna vahepunkte
-\n • Automaatne teekonnast kõrvale kaldumisel selle ümberarvutamine
-\n • Otsige kohti aadressi, tüübi (nt restoran, hotell, bensiinijaam, muuseum) või geograafiliste koordinaatide järgi
-\n</string>
+    <string name="osmand_plus_extended_description_part2">"Tee juhatamine \n • Töötab võrgus (kiire) või võrguühenduseta (välismaal viibides puuduvad rändlustasud) \n • Täpsed hääljuhised (salvestatud ja sünteesitud hääled) \n • Valikuline sõiduradade juhendamine, tänavanime kuvamine ja eeldatav saabumisaeg \n • Toetab teekonna vahepunkte \n • Automaatne teekonnast kõrvale kaldumisel selle ümberarvutamine \n • Otsige kohti aadressi, tüübi (nt restoran, hotell, bensiinijaam, muuseum) või geograafiliste koordinaatide järgi "</string>
     <string name="analyze_on_map">Analüüsi kaardil</string>
     <string name="subscribe_email_desc">Rakenduse allahindluste kohta teabe saamiseks liitu meie postiloendiga ja saad veel 3 kaardi allalaadimist!</string>
     <string name="quick_action_add_destination_desc">Nupp ekraani keskkoha teekonna sihtkohaks muutmiseks; ühest varem valitud sihtkohast saab viimane vahesihtkoht.</string>
@@ -2467,7 +2456,7 @@
     <string name="quick_action_add_first_intermediate_desc">Nupp ekraani keskkoha esimeseks vahesihtkohaks muutmiseks.</string>
     <string name="quick_action_auto_zoom_desc">Nupp, mis lülitab automaatse kiirusetundliku suumimise sisse või välja.</string>
     <string name="shared_string_paused">Peatatud</string>
-    <string name="animate_my_location_desc">Lülita sisse animeeritud oma asukohas kaardi panoraamimine navigeerimise ajal.</string>
+    <string name="animate_my_location_desc">Sujuv kaardi panoraamvaade liikumise ajal. Toob kaasa väikese viivituse.</string>
     <string name="srtm_menu_download_descr">Laadi alla selle piirkonna „Kõrgusjoonte“ kaart.</string>
     <string name="srtm_purchase_header">Osta ja paigalda „Topograafia“ lisamoodul astmestatud vertikaalsete alade kuvamiseks.</string>
     <string name="quick_action_showhide_osmbugs_descr">Nupp, mis lülitab OSM märkmete kaardil kuvamise sisse või välja.</string>
@@ -3877,7 +3866,7 @@
     <string name="show_start_dialog">Kuva algdialoog</string>
     <string name="purchases_feature_desc_terrain">Maastiku kõrgusjooned, tumedate toonidega täielik mäe- ja nõlvakaart, millel on värvid tippude ja madalike eristamiseks.</string>
     <string name="purchases_feature_desc_wikivoyage">Sirvi Wikivoyage saiti ilma võrguühenduseta. Artiklid on jaotatud riikide ja piirkondade kaupa ning saadaval kõigis keeltes.</string>
-    <string name="purchases_feature_desc_wikipedia">Sirvi Vikipeediat võrguühenduseta. Artiklid on jaotatud riikide ja piirkondade kaupa ning saadaval kõigis keeltes.</string>
+    <string name="purchases_feature_desc_wikipedia">Tagab asukohaga seotud Vikipeedia andmed vallasrežiimis ning võimaldab sul mugavalt uurida lisateavet antud objekti ja tema lähiümbruse kohta. Ära unusta sind huvitava piirkonna Vikipeedia andmeid alla laadida.</string>
     <string name="purchases_feature_desc_combined_wiki">Tutvu Vikipeedia artiklitega liikvel olles, ilma internetiühenduseta. Võrguühenduseta andmed on jaotatud riikide kaupa ja saadaval kõigis keeltes.</string>
     <string name="purchases_feature_desc_monthly_map_updates">Hangi juurdepääs regulaarsetele igakuistele võrguühenduseta kaartide uuendustele.</string>
     <string name="purchases_feature_desc_hourly_map_updates">Hangi juurdepääs sagedasematele kaardiuuendustele. Tundide, päevade või nädalate kaupa uuendused. Uuendused laaditakse alla järk-järgult, ainult muutunud piirkonna osas.</string>
@@ -4658,4 +4647,52 @@
     <string name="map_settings_weather_cloud">Pilved</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="show_minor_turns">Liikumisel otse, kuva väikestel ristmikel</string>
-</resources>
\ No newline at end of file
+    <string name="obd_nothing_found_text">Skännereid ei leidunud</string>
+    <string name="obd_support">ODB tugi</string>
+    <string name="obd_fuel_type">Kütuse tüüp</string>
+    <string name="obd_fuel_type_propane">Propaan</string>
+    <string name="obd_battery_voltage">Aku pinge</string>
+    <string name="obd_plugin_name">Sõiduki andmed</string>
+    <string name="obd_widget_vehicle_speed">Sõiduki kiirus</string>
+    <string name="display_distance_to_first_intermediate_summary">Näitab aega ja vahemaad kuni esimese peatuseni. Kui lülitad välja, siis kuvatakse aega ja vahemaad kuni lõppsihtkohani.</string>
+    <string name="rendering_attr_showClimbingRoutes_description">Näita ronimismarsruute</string>
+    <string name="default_buttons_opacity_original_description">Iga nupp säilitab oma tausta läbipaistmatuse.</string>
+    <string name="vehicle_metrics_recording_description">Vali GPX-faili salvestatavad parameetrid.</string>
+    <string name="av_audio_sample_rate">Heli diskreetimissagedus</string>
+    <string name="av_audio_sample_rate_descr">Vali heli diskreetimissagedus.</string>
+    <string name="vehicle_metrics_obd_ii">Mootori tööandmed (OBD-II)</string>
+    <string name="purchase_feature_desc_vehicle_metrics_obd_ii">Jälgi mootori olulisi tööandmeid OBD-II protokolli abil - sealhulgas kiirust, mootori pöördeid, kütusetarbimist ja muudki.</string>
+    <string name="obd_vin">VIN-kood</string>
+    <string name="obd_vin_desc">VIN-kood ODB kaudu</string>
+    <string name="weather_wind_kilimeters_per_hour">Kilomeetrit tunnis</string>
+    <string name="default_buttons_corners_original_description">Iga nupp säilitab oma nurgaraadiuse.</string>
+    <string name="obd_air_intake_temp">Välisõhu temperatuur</string>
+    <string name="obd_fuel_type_lpg">LPG</string>
+    <string name="obd_fuel_type_electric">Elekter</string>
+    <string name="obd_engine_runtime_desc">Näitab kui kaua mootor on käivitamisest alates töötanud.</string>
+    <string name="obd_engine_runtime">Mootori tööaeg</string>
+    <string name="shared_string_interpolation">Interpoleerimine</string>
+    <string name="location_interpolation_percent">Asukoha interpoleerimise protsent</string>
+    <string name="connect_new_scanner">Ühenda uus skänner</string>
+    <string name="shared_string_hour">Tund</string>
+    <string name="ltr_or_rtl_combine_via_per">%1$s / %2$s</string>
+    <string name="shared_string_volume">Maht</string>
+    <string name="calculating_indication_message">Arvutame…</string>
+    <string name="calculate_size">Arvuta suurus/maht</string>
+    <string name="default_buttons_size_original_description">Iga nupp säilitab oma suuruse.</string>
+    <string name="selected_delayed_profile">Valitud profiil „%s“</string>
+    <string name="obd_fuel_type_not_provided">Kütuse tüüp on määramata</string>
+    <string name="obd_fuel_type_gasoline">Bensiin</string>
+    <string name="obd_fuel_type_methanol">Metanool</string>
+    <string name="obd_fuel_type_ethanol">Etanool</string>
+    <string name="obd_fuel_type_diesel">Diisel</string>
+    <string name="obd_fuel_type_cng">CNG</string>
+    <string name="obd_fuel_left_liters">Kütust alles (liitrites)</string>
+    <string name="obd_fuel_consumption_rate">Kütusetarbimine</string>
+    <string name="obd_engine_coolant_temp">Jahutusvedeliku temperatuur</string>
+    <string name="obd_widget_engine_speed">Mootori kiirus</string>
+    <string name="display_distance_to_first_intermediate">Näita teekonna üksikasju kuni järgmise peatuseni</string>
+    <string name="preview_next_turn">Näita järgmise pöörde eelvaadet</string>
+    <string name="obd_ambient_air_temp">Reisijatesalongi õhutemperatuur</string>
+    <string name="rendering_attr_showClimbingRoutes_name">Ronimismarsruudid</string>
+</resources>
diff --git a/OsmAnd/res/values-ga/strings.xml b/OsmAnd/res/values-ga/strings.xml
index a1ff12f9977..c5429ec1e8b 100644
--- a/OsmAnd/res/values-ga/strings.xml
+++ b/OsmAnd/res/values-ga/strings.xml
@@ -449,7 +449,7 @@
     <string name="m_s">m/s</string>
     <string name="prefs_plugins">Breiseáin</string>
     <string name="help_article_personal_profiles_name">Próifílí (Socruithe)</string>
-    <string name="cloud_sync_progress">Ag sioncronú…%1$s</string>
+    <string name="cloud_sync_progress">Sioncronaigh… %1$s</string>
     <string name="lang_sc">Sairdínis</string>
     <string name="lang_ru">Rúisis</string>
     <string name="shared_string_buttons">Cnaipí</string>
@@ -5464,4 +5464,4 @@
     <string name="rendering_attr_showClimbingRoutes_description">Taispeáin bealaí dreapadóireachta</string>
     <string name="display_distance_to_first_intermediate_summary">Taispeánann sé am agus fad don chéad stad eile ar dtús. Múch chun sonraí an chinn scríbe a thaispeáint i gcónaí.</string>
     <string name="display_distance_to_first_intermediate">Taispeáin sonraí bealaigh don chéad stad eile</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 6027f116fce..79ba2e62bd3 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -1736,4 +1736,5 @@
     <string name="app_mode_wheelchair_forward">Invalidska kolica naprijed</string>
     <string name="shared_string_custom">Prilagođeno</string>
     <string name="track_show_start_finish_icons">Prikaži ikone početka i kraja</string>
+    <string name="shared_string_toolbar">Traka alata</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index e8389d5a29a..be9c604092d 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -174,7 +174,7 @@
     <string name="poi_hamlet">Piccolo borgo</string>
     <string name="poi_isolated_dwelling">Abitazione isolata</string>
     <string name="poi_suburb">Grande quartiere</string>
-    <string name="poi_neighbourhood">Quartiere</string>
+    <string name="poi_neighbourhood">Quartiere minore</string>
     <string name="poi_locality">Località non popolata</string>
     <string name="poi_pharmacy">Farmacia</string>
     <string name="poi_hospital">Ospedale</string>
@@ -1793,7 +1793,7 @@
     <string name="poi_summer_camp">Campo estivo</string>
     <string name="poi_crossing_bell_yes">Campana di attraversamento</string>
     <string name="poi_crossing_bell_no">Campana di attraversamento: no</string>
-    <string name="poi_crossing_light_yes">Luce di passaggio</string>
+    <string name="poi_crossing_light_yes">Luce di segnalazione</string>
     <string name="poi_crossing_on_demand_yes">Attraversamento su richiesta</string>
     <string name="poi_crossing_on_demand_no">Attraversamento su richiesta: no</string>
     <string name="poi_dispensing_yes">Sì</string>
@@ -2000,7 +2000,7 @@
     <string name="poi_crossing_barrier_full">Barriera di attraversamento: completo</string>
     <string name="poi_crossing_barrier_half">Barriera di attraversamento: metà</string>
     <string name="poi_crossing_barrier_double_half">Barriera di attraversamento: doppio metà</string>
-    <string name="poi_crossing_light_no">Luce di attraversamento: no</string>
+    <string name="poi_crossing_light_no">Luce di segnalazione: no</string>
     <string name="poi_locksmith">Negozio del fabbro (chiavi)</string>
     <string name="poi_lighting">Apparecchi di illuminazione</string>
     <string name="poi_cliff">Falesia</string>
@@ -2449,8 +2449,8 @@
     <string name="poi_resource_vanadium">Vanadio</string>
     <string name="poi_resource_zinc">Zinco</string>
     <string name="poi_resource_zircon">Zirconio</string>
-    <string name="poi_lit_yes">Luce: sì</string>
-    <string name="poi_lit_no">Luce: no</string>
+    <string name="poi_lit_yes">Illuminazione: sì</string>
+    <string name="poi_lit_no">Illuminazione: no</string>
     <string name="poi_surface_sett">Superficie: pavé</string>
     <string name="poi_surface_paving_stones">Superficie: mattonelle per pavimentazione stradale</string>
     <string name="poi_surface_pebblestone">Superficie: ciottoli</string>
@@ -3728,7 +3728,7 @@
     <string name="poi_substation_minor_distribution">Distribuzione minore</string>
     <string name="poi_park_ride_hov">HOV</string>
     <string name="poi_foot_private">Accesso pedoni: privato</string>
-    <string name="poi_shelter_no">Riparo: np</string>
+    <string name="poi_shelter_no">Riparo: no</string>
     <string name="poi_agrarian_agricultural_machinery">Macchinari agricoli</string>
     <string name="poi_generator_type_bwr_6">Tipo generatore: BWR-6</string>
     <string name="poi_generator_type_bwr_5">Tipo generatore: BWR-5</string>
@@ -4422,4 +4422,4 @@
     <string name="poi_satellite_dish">Antenna parabolica</string>
     <string name="poi_checkpoint_hiking">Punto di controllo per escursioni</string>
     <string name="poi_groundskeeping">Negozio di giardinaggio</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index fcb15a4b263..3b1e1ffd31c 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1941,7 +1941,7 @@
     <string name="postcode">Codice postale</string>
     <string name="shared_string_from">da</string>
     <string name="city_type_district">Distretto</string>
-    <string name="city_type_neighbourhood">Quartiere</string>
+    <string name="city_type_neighbourhood">Quartiere minore</string>
     <string name="map_widget_search">Cerca</string>
     <string name="lang_hsb">Sorabo superiore</string>
     <string name="rendering_attr_hideOverground_name">Oggetti sopra il terreno</string>
@@ -5689,4 +5689,4 @@
     <string name="rendering_attr_showClimbingRoutes_name">Percorsi arrampicata</string>
     <string name="display_distance_to_first_intermediate_summary">Mostra il tempo e la distanza per la prossima fermata. Disattiva per mostrare sempre i dettagli per la destinazione.</string>
     <string name="display_distance_to_first_intermediate">Mostra i dettagli del percorso per la prossima fermata</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index 951096f9268..6d318fbd442 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -4629,7 +4629,7 @@
     <string name="x_axis">ציר X</string>
     <string name="av_audio_format_bottom_sheet_descr">נא לבחור תצורת שמע. תצורת מכולת סוג קובץ השמע היא 3GPP‏ (‎.3gp).</string>
     <string name="shared_string_modified">נערך</string>
-    <string name="cloud_sync_progress">מתבצע סנכרון…%1$s</string>
+    <string name="cloud_sync_progress">מתבצע סנכרון… %1$s</string>
     <string name="checking_progress">מתבצעת בדיקה…</string>
     <string name="res_unknown">לא ידוע</string>
     <string name="shared_string_unsynced">לא מסונכרן</string>
@@ -4991,4 +4991,4 @@
     <string name="obd_not_connected_to_device">מנותק מ־%s</string>
     <string name="obd_connecting_to_device">התחברות אל %s</string>
     <string name="wheel_circumference">היקף גלגל</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-pt/phrases.xml b/OsmAnd/res/values-pt/phrases.xml
index 6e622ba6d7e..012863d43e2 100644
--- a/OsmAnd/res/values-pt/phrases.xml
+++ b/OsmAnd/res/values-pt/phrases.xml
@@ -4901,4 +4901,23 @@
     <string name="poi_route_article">Artigos de viagem</string>
     <string name="poi_route_article_point">Pontos de viagem</string>
     <string name="poi_route_activity_type_car">Carro</string>
-</resources>
\ No newline at end of file
+    <string name="poi_route_activity_type_off_road">Todo-o-terreno</string>
+    <string name="poi_route_activity_type_all_terrain_vehicle">ATV (veículo todo-o-terreno)</string>
+    <string name="poi_route_activity_type_truck_hgv">Camião (pesado de mercadorias)</string>
+    <string name="poi_route_activity_type_karting">Karting</string>
+    <string name="poi_route_activity_type_road_motorcycling">Motociclismo de estrada</string>
+    <string name="poi_route_activity_type_off_road_motorcycling_dirt_biking">Motociclismo todo-o-terreno</string>
+    <string name="poi_route_activity_type_touring_motorcycling">Motociclismo de turismo</string>
+    <string name="poi_route_activity_type_sport_motorcycling">Motociclismo desportivo</string>
+    <string name="poi_route_activity_type_hiking">Caminhada</string>
+    <string name="poi_route_activity_type_track_racing">Corrida em pista</string>
+    <string name="poi_route_activity_type_backpacking">Viajem de mochila às costas</string>
+    <string name="poi_route_activity_type_road_running">Corrida em estrada</string>
+    <string name="poi_route_activity_type_walking">A pé</string>
+    <string name="poi_cafe_filter">Café</string>
+    <string name="poi_route_activity_type_motocross">Motocrosse</string>
+    <string name="poi_route_activity_type_trail_running">Corrida em trilhos</string>
+    <string name="poi_route_activity_type_trekking">Caminhada</string>
+    <string name="poi_route_activity_type_adventure_motorcycling">Motociclismo de aventura</string>
+    <string name="poi_route_activity_type_enduro_motorcycling">Motociclismo enduro</string>
+</resources>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 6e77af3e9e6..ada722bf91a 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -3466,7 +3466,7 @@
     <string name="app_mode_enduro_motorcycle">Motorizada de 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ã ligado\" em \"tempo limite após a ativação\".</string>
-    <string name="release_3_7">• Novos mapas de inclinação offline \n \n • Personalização completa de Favoritos e Waypoints GPX - cores, ícones e formas personalizados \n \n • Personalize a ordem dos itens no menu de contexto, configurar mapa, gaveta \n \n • Wikipédia como uma camada separada no mapa Configurar, selecione apenas os idiomas necessários \n \n • Crie seu próprio filtro / mapa de POI com total flexibilidade \n \n • Adicionadas opções para restaurar configurações de perfis personalizados \n \n • Rotas GPX completas das vias de tráfego e instruções completas de curvas \n \n • Correção de tamanhos de interface do utilizador em tablets \n \n • Correção de erros com RTL \n \n</string>
+    <string name="release_3_7">• Novos mapas de inclinação offline \n \n • Personalização completa de favoritos e pontos de rotas GPX - cores, ícones e formas personalizados \n \n • Personalize a ordem dos itens no \"menu de contexto\", \"configurar mapa\" e \"gaveta\" \n \n • Wikipédia como uma camada separada no mapa Configurar, selecione apenas os idiomas necessários \n \n • Crie seu próprio filtro / mapa de POI com total flexibilidade \n \n • Adicionadas opções para restaurar configurações de perfis personalizados \n \n • Rotas GPX completas das vias de tráfego e instruções completas de viragens\n \n • Correção de tamanhos de interface do utilizador em tablets \n \n • Correção de erros em RTL\n\n</string>
     <string name="quick_action_remove_next_destination_descr">Elimina o próximo destino na sua rota. Se for o destino final, a navegação será interrompida.</string>
     <string name="vessel_height_limit_description">Defina a altura da embarcação para evitar pontes baixas. Tenha em conta que se a ponte for móvel, o cálculo utiliza a altura da ponte no estado aberto.</string>
     <string name="add_online_source">Adicionar origem online</string>
@@ -3707,7 +3707,7 @@
     <string name="activity_type_cycling_name">Ciclismo</string>
     <string name="activity_type_running_name">Correr</string>
     <string name="activity_type_walking_name">A pé</string>
-    <string name="activity_type_offroad_name">Todo o terreno</string>
+    <string name="activity_type_offroad_name">Todo-o-terreno</string>
     <string name="activity_type_motorbike_name">Moto</string>
     <string name="activity_type_car_name">Carro</string>
     <string name="add_online_routing_engine">Adicionar motor de roteamento online</string>
@@ -4660,7 +4660,7 @@
     <string name="shared_string_expires">Expira</string>
     <string name="shared_string_purchased_on">Comprado em</string>
     <string name="choose_what_to_sync">Escolha o que sincronizar</string>
-    <string name="cloud_sync_progress">A sincronizar…%1$s</string>
+    <string name="cloud_sync_progress">A sincronizar… %1$s</string>
     <string name="checking_progress">A verificar…</string>
     <string name="shared_string_modified">Alterado</string>
     <string name="res_unknown">Desconhecido</string>
@@ -5659,4 +5659,10 @@
     <string name="calculate_size">Calcular o tamanho</string>
     <string name="default_buttons_size_original_description">Cada botão manteria o seu próprio tamanho.</string>
     <string name="calculating_indication_message">A calcular…</string>
-</resources>
\ No newline at end of file
+    <string name="rendering_attr_showClimbingRoutes_name">Rotas de escalada</string>
+    <string name="rendering_attr_showClimbingRoutes_description">Mostrar rotas de escalada</string>
+    <string name="default_buttons_corners_original_description">Cada botão manteria o seu próprio raio de cantos.</string>
+    <string name="default_buttons_opacity_original_description">Cada botão manteria a sua própria opacidade de fundo.</string>
+    <string name="display_distance_to_first_intermediate_summary">Mostra primeiro a hora e a distância para a próxima paragem. Desativar para mostrar sempre os detalhes do destino.</string>
+    <string name="display_distance_to_first_intermediate">Mostrar detalhes do itinerário para a próxima paragem</string>
+</resources>
diff --git a/OsmAnd/res/values-ro/phrases.xml b/OsmAnd/res/values-ro/phrases.xml
index 1b3c30dc496..b013e318113 100644
--- a/OsmAnd/res/values-ro/phrases.xml
+++ b/OsmAnd/res/values-ro/phrases.xml
@@ -820,7 +820,7 @@
     <string name="poi_ford_stepping_stones">Pod de piatră în trepte</string>
     <string name="poi_ford">Vad</string>
     <string name="poi_emergency_access_point">Punct de acces pentru urgențe</string>
-    <string name="poi_disaster_response">Stație SES</string>
+    <string name="poi_disaster_response">Centru de răspuns la situații de urgență</string>
     <string name="poi_ambulance_station">Stație de ambulanță</string>
     <string name="poi_grit_bin">Coș cu nisip</string>
     <string name="poi_fire_water_pond">Bazin apă antiincendiu</string>
@@ -4875,4 +4875,96 @@
     <string name="poi_diet_pescetarian_no">Dietă pescărească: nu</string>
     <string name="poi_camp_site_type">Tipul de camping</string>
     <string name="poi_cafe_filter">Cafea</string>
+    <string name="poi_routes_driving">Condus</string>
+    <string name="poi_route_activity_type_motocross">Motocross</string>
+    <string name="poi_route_activity_type_snowboarding">Snowboarding</string>
+    <string name="poi_route_activity_type_snowmobiling">Snowmobiling</string>
+    <string name="poi_route_activity_type_mountain_biking">Ciclism montan</string>
+    <string name="poi_route_activity_type_road_cycling">Ciclism rutier</string>
+    <string name="poi_route_activity_type_hot_air_ballooning">Zborul cu balon cu aer cald</string>
+    <string name="poi_route_activity_type_swimming_outdoor">Înot în aer liber</string>
+    <string name="poi_route_activity_type_mushrooms_picking">Cules ciuperci</string>
+    <string name="poi_route_activity_type_caving">Speologie</string>
+    <string name="poi_payment_parco_no">Parco nu este acceptat</string>
+    <string name="poi_payment_parkster_yes">Parkster</string>
+    <string name="poi_camp_site_basic">Condiții de bază</string>
+    <string name="poi_camp_site_standard">Condiții standard</string>
+    <string name="poi_camp_site_serviced">întreținut</string>
+    <string name="poi_camp_site_deluxe">Condiții deluxe</string>
+    <string name="poi_name_etymology">Etimologia numelui</string>
+    <string name="poi_name_left">Nume (partea stângă)</string>
+    <string name="poi_name_right">Nume (partea dreaptă)</string>
+    <string name="poi_route_article">Articole de călătorie</string>
+    <string name="poi_route_article_point">Puncte de călătorie</string>
+    <string name="poi_route_activity_type_tree_climbing">Urcat în copac</string>
+    <string name="poi_route_activity_type_gravel_biking">Ciclism Gravel</string>
+    <string name="poi_osmand_access_main_tag">Acces</string>
+    <string name="poi_route_activity_type_scuba_diving">Scufundări Scuba</string>
+    <string name="poi_payment_parco_yes">Parco</string>
+    <string name="poi_route_activity_type_off_road">Off-Road</string>
+    <string name="poi_route_activity_type_all_terrain_vehicle">ATV (All-Terrain Vehicle)</string>
+    <string name="poi_route_activity_type_enduro_motorcycling">Motociclism Enduro</string>
+    <string name="poi_route_activity_type_inline_skates">Role</string>
+    <string name="poi_cafe_yes">Da</string>
+    <string name="poi_climbing_boulder">Escaladă bouldering</string>
+    <string name="poi_payment_parkster_no">Parkster nu este acceptat</string>
+    <string name="poi_osmand_foot_prohibited_tunnel">Accesul interzis pietonilor în tunel</string>
+    <string name="poi_osmand_bicycle_prohibited_tunnel">Accesul interzis bicicliștilor în tunel</string>
+    <string name="poi_route_track_point">Puncte de traseu</string>
+    <string name="poi_routes_motorcycling">Motociclism</string>
+    <string name="poi_routes_foot">Pedestru</string>
+    <string name="poi_routes_winter_sport">Sporturi de iarnă</string>
+    <string name="poi_routes_cycling">Ciclism</string>
+    <string name="poi_routes_air_sports">Sporturi aeronautice</string>
+    <string name="poi_routes_water_sport">Sporturi nautice</string>
+    <string name="poi_routes_other">Alte trasee</string>
+    <string name="poi_route_activity_type_car">Mașină</string>
+    <string name="poi_route_activity_type_truck_hgv">Camion (Transport greu marfă)</string>
+    <string name="poi_route_activity_type_karting">Karting</string>
+    <string name="poi_route_activity_type_adventure_motorcycling">Motociclism de aventură</string>
+    <string name="poi_route_activity_type_off_road_motorcycling_dirt_biking">Motociclism Off-Road</string>
+    <string name="poi_route_activity_type_road_motorcycling">Motociclism rutier</string>
+    <string name="poi_route_activity_type_sport_motorcycling">Motociclism sport</string>
+    <string name="poi_route_activity_type_touring_motorcycling">Motociclism Touring</string>
+    <string name="poi_route_activity_type_track_racing">Circuit moto</string>
+    <string name="poi_route_activity_type_motor_scooter">Scuter cu motor</string>
+    <string name="poi_route_activity_type_backpacking">Backpacking</string>
+    <string name="poi_route_activity_type_hiking">Drumeție</string>
+    <string name="poi_route_activity_type_hill_climbing">Urcat dealuri</string>
+    <string name="poi_route_activity_type_road_running">Alergat rutier</string>
+    <string name="poi_route_activity_type_trail_running">Alergare pe poteci</string>
+    <string name="poi_route_activity_type_trekking">Trekking</string>
+    <string name="poi_route_activity_type_walking">Umblat</string>
+    <string name="poi_route_activity_type_ice_skating">Patinaj</string>
+    <string name="poi_route_activity_type_cross_country_skiing">Schi cross-country</string>
+    <string name="poi_route_activity_type_ski_touring">Schi de tură</string>
+    <string name="poi_route_activity_type_skiing">Schiat</string>
+    <string name="poi_route_activity_type_snowshoeing">Rachete de zăpadă</string>
+    <string name="poi_route_activity_type_e_biking">E-Biking</string>
+    <string name="poi_route_activity_type_e_mountain_bike">E-mountain bike</string>
+    <string name="poi_route_activity_type_touring">Touring</string>
+    <string name="poi_route_activity_type_aviation">Aviație</string>
+    <string name="poi_route_activity_type_drone_flying">Zburatul dronelor</string>
+    <string name="poi_route_activity_type_gliding_sailplane">Planorism</string>
+    <string name="poi_route_activity_type_hang_gliding">Deltaplanorism</string>
+    <string name="poi_route_activity_type_parachuting_skydiving">Parașutism</string>
+    <string name="poi_route_activity_type_paragliding">Parapantism</string>
+    <string name="poi_route_activity_type_powered_paragliding_paramotoring">Parapantism motorizat</string>
+    <string name="poi_route_activity_type_ultralight_aviation">Aviație ultra-ușoară</string>
+    <string name="poi_route_activity_type_canoe">Canoe</string>
+    <string name="poi_route_activity_type_diving">Scufundări</string>
+    <string name="poi_route_activity_type_kayak">Caiac</string>
+    <string name="poi_route_activity_type_surfing">Surfing</string>
+    <string name="poi_route_activity_type_waterskiing">Schi nautic</string>
+    <string name="poi_route_activity_type_windsurfing">Windsurfing</string>
+    <string name="poi_route_activity_type_motorboat">Navigație cu barcă motorizată</string>
+    <string name="poi_route_activity_type_rafting">Rafting</string>
+    <string name="poi_route_activity_type_horse_riding">Echitație</string>
+    <string name="poi_route_activity_type_harvesting">Cules</string>
+    <string name="poi_route_activity_type_train_riding">Călătorit cu trenul</string>
+    <string name="poi_route_activity_type_golfing">Golf</string>
+    <string name="poi_route_activity_type_fitness">Fitness</string>
+    <string name="poi_climbing_area">Zonă de escaladă</string>
+    <string name="poi_climbing_route">Traseu de escaladă</string>
+    <string name="poi_climbing_route_bottom">Începutul traseului de escalată</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index ea77c5e331c..6605af336dc 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1107,7 +1107,7 @@
     <string name="rendering_attr_moreDetailed_name">Mai multe detalii</string>
     <string name="rendering_attr_lessDetailed_name">Mai puține detalii</string>
     <string name="rendering_attr_hideAccess_name">Restricții de acces</string>
-    <string name="rendering_attr_showAccess_name">Afișarea restricțiilor de acces și de taxare</string>
+    <string name="rendering_attr_showAccess_name">Afișarea restricțiilor de acces</string>
     <string name="rendering_attr_showSurfaceGrade_name">Arată calitatea drumului</string>
     <string name="rendering_attr_showSurfaces_name">Arată suprafața drumului</string>
     <string name="rendering_attr_showCycleRoutes_name">Rute pentru biciclete</string>
@@ -4941,7 +4941,7 @@
     <string name="mtb_scale">Dificultate MTB</string>
     <string name="mtb_imba">IMBA</string>
     <string name="mtb_imba_full">Asociația Internațională de Ciclism Montan</string>
-    <string name="cloud_sync_progress">Se sincronizează…%1$s</string>
+    <string name="cloud_sync_progress">Se sincronizează… %1$s</string>
     <string name="checking_progress">Se verifică…</string>
     <string name="shared_string_modified">Modificat</string>
     <string name="shared_string_open">Deschis</string>
@@ -5316,7 +5316,7 @@
     <string name="write_heading_description">Salvează orientarea în fiecare punct al traseului, în timpul înregistrării</string>
     <string name="write_heading">Scrie orientarea</string>
     <string name="shared_string_included">Inclus</string>
-    <string name="local_indexes_category_terrain">Hărți de teren (3D)</string>
+    <string name="local_indexes_category_terrain">Hărți de teren (3D</string>
     <string name="map_widget_group_glide_desc">Widgeturile arată raportul de planare față de țintă sau raportul de planare mediu pentru cursa curentă.</string>
     <string name="hillshade_slope">Relief umbrit, Pantă</string>
     <string name="map_widget_glide_average_desc">Arată raportul mediu de planare pentru intervalul setat.</string>
@@ -6057,7 +6057,7 @@
     <string name="obd_battery_voltage">Tensiunea bateriei</string>
     <string name="obd_fuel_type">Tipul de combustibil</string>
     <string name="obd_support">Suport OBD</string>
-    <string name="obd_plugin_name"/>
+    <string name="obd_plugin_name">Parametrii vehicul</string>
     <string name="obd_plugin_description">Monitorizați parametrii cheie ai vehiculului utilizând protocolul OBD-II. Accesați date care includ:\n • turația motorului, timpul de funcționare al motorului, sarcina calculată a motorului \n • Consumul de combustibil, presiunea combustibilului, combustibilul rămas\n • Temperatura de admisie, temperatura ambiantă, temperatura lichidului de răcire, temperatura uleiului de motor\n• Viteza vehiculului, Poziția accelerației, Tensiunea bateriei\n</string>
     <string name="obd_fuel_level">Eficiența combustibilului (%)</string>
     <string name="obd_fuel_consumption_rate">Rata consumului de combustibil</string>
@@ -6065,4 +6065,6 @@
     <string name="obd_fuel_left_liters">Combustibil rămas (litri)</string>
     <string name="display_distance_to_first_intermediate_summary">Afișează mai întâi ora și distanța pentru următoarea oprire. Dezactivați pentru a afișa întotdeauna detaliile pentru destinație.</string>
     <string name="display_distance_to_first_intermediate">Afișați detaliile traseului pentru următoarea oprire</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="import_export">Import/export</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 354ac8396d2..81543096fab 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -4671,7 +4671,7 @@
     <string name="shared_string_purchased_on">Придбано</string>
     <string name="shared_string_expires">Спливає</string>
     <string name="choose_what_to_sync">Виберіть, що синхронізувати</string>
-    <string name="cloud_sync_progress">Синхронізація…%1$s</string>
+    <string name="cloud_sync_progress">Синхронізація… %1$s</string>
     <string name="checking_progress">Перевірка…</string>
     <string name="shared_string_modified">Змінено</string>
     <string name="shared_string_unsynced">Не синхронізовано</string>
@@ -5680,4 +5680,4 @@
     <string name="rendering_attr_showClimbingRoutes_name">Скелелазні маршрути</string>
     <string name="display_distance_to_first_intermediate">Показати деталі маршруту до наступної зупинки</string>
     <string name="display_distance_to_first_intermediate_summary">Спочатку показує час і відстань до наступної зупинки. Вимкніть, щоб завжди показувати деталі до кінцевої точки.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 559a760c93a..d1dd24cbf23 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -5916,4 +5916,6 @@
     <string name="obd_fuel_left_liters">剩余燃料（升）</string>
     <string name="obd_fuel_left_distance_desc">通过 OBD 传感器显示车辆剩余油量下的行驶距离</string>
     <string name="obd_fuel_type_desc">通过 OBD 传感器显示车辆燃料类型</string>
+    <string name="display_distance_to_first_intermediate_summary">首先显示下一站的时间和距离。关闭此功能以始终显示目的地的详细信息。</string>
+    <string name="display_distance_to_first_intermediate">显示下一站的路线详情</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/importfiles/tasks/ObfImportTask.java b/OsmAnd/src/net/osmand/plus/importfiles/tasks/ObfImportTask.java
index 0287d3c4cd9..0eea1ffbf3a 100644
--- a/OsmAnd/src/net/osmand/plus/importfiles/tasks/ObfImportTask.java
+++ b/OsmAnd/src/net/osmand/plus/importfiles/tasks/ObfImportTask.java
@@ -29,6 +29,10 @@ protected String doInBackground(Void... voids) {
 		boolean unzip = name.endsWith(IndexConstants.ZIP_EXT);
 		String fileName = unzip ? name.replace(IndexConstants.ZIP_EXT, "") : name;
 		File dest = getObfDestFile(fileName);
+		File parent = dest.getParentFile();
+		if (parent != null) {
+			parent.mkdirs();
+		}
 		String error = ImportHelper.copyFile(app, dest, uri, false, unzip);
 		if (error == null) {
 			app.getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS, new ArrayList<>());
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/gallery/tasks/GetImageCardsTask.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/gallery/tasks/GetImageCardsTask.java
index 208e0d96089..918d764dae4 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/gallery/tasks/GetImageCardsTask.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/gallery/tasks/GetImageCardsTask.java
@@ -92,14 +92,14 @@ protected ImageCardsHolder doInBackground(Void... voids) {
 			for (WikiImage wikiImage : wikimediaImageList) {
 				holder.addCard(WIKIMEDIA, new WikiImageCard(mapActivity, wikiImage));
 			}
-
-			if (!Algorithms.isEmpty(params.get(Amenity.MAPILLARY))) {
-				JSONObject imageObject = MapillaryOsmTagHelper.getImageByKey(params.get(Amenity.MAPILLARY));
+			String key = params.remove(Amenity.MAPILLARY);
+			if (!Algorithms.isEmpty(key)) {
+				JSONObject imageObject = MapillaryOsmTagHelper.getImageByKey(key);
 				if (imageObject != null) {
 					holder.addCard(MAPILLARY_AMENITY, new MapillaryImageCard(mapActivity, imageObject));
 				}
 			}
-			PluginsHelper.populateContextMenuImageCards(holder, httpPms, params, listener);
+			httpPms.putAll(params);
 			String response = AndroidNetworkUtils.sendRequest(app, "https://osmand.net/api/cm_place", httpPms,
 					"Requesting location images...", false, false);
 			if (!Algorithms.isEmpty(response)) {
diff --git a/OsmAnd/src/net/osmand/plus/plugins/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/plugins/OsmandPlugin.java
index 6e948e04b7a..5f4af827ebb 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/OsmandPlugin.java
@@ -260,13 +260,6 @@ protected PoiUIFilter getPoiFilterById(@NonNull String filterId) {
 	protected void attachAdditionalInfoToRecordedTrack(@NonNull Location location, @NonNull JSONObject json) throws JSONException {
 	}
 
-
-	protected void collectContextMenuImageCards(@NonNull ImageCardsHolder holder,
-	                                            @NonNull Map<String, String> params,
-	                                            @Nullable Map<String, String> additionalParams,
-	                                            @Nullable GetImageCardsListener listener) {
-	}
-
 	protected boolean createContextMenuImageCard(@NonNull ImageCardsHolder holder,
 	                                             @NonNull JSONObject imageObject) {
 		return false;
diff --git a/OsmAnd/src/net/osmand/plus/plugins/PluginsHelper.java b/OsmAnd/src/net/osmand/plus/plugins/PluginsHelper.java
index 756a1e0c4f3..42d41e82431 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/PluginsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/PluginsHelper.java
@@ -773,13 +773,6 @@ public static Collection<DashFragmentData> getPluginsCardsList() {
 		return collection;
 	}
 
-	public static void populateContextMenuImageCards(@NonNull ImageCardsHolder holder, @NonNull Map<String, String> params,
-	                                                 @Nullable Map<String, String> additionalParams, @Nullable GetImageCardsListener listener) {
-		for (OsmandPlugin plugin : getEnabledPlugins()) {
-			plugin.collectContextMenuImageCards(holder, params, additionalParams, listener);
-		}
-	}
-
 	/**
 	 * @param holder      an object to collect results
 	 * @param imageObject json object that contains data for create an image card
diff --git a/OsmAnd/src/net/osmand/plus/plugins/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/plugins/mapillary/MapillaryPlugin.java
index 2a5832555e2..c8812d466bd 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/mapillary/MapillaryPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/mapillary/MapillaryPlugin.java
@@ -339,24 +339,6 @@ public void setWidgetVisible(MapActivity mapActivity, boolean visible) {
 		}
 	}
 
-	@Override
-	protected void collectContextMenuImageCards(@NonNull ImageCardsHolder holder,
-	                                            @NonNull Map<String, String> params,
-	                                            @Nullable Map<String, String> additionalParams,
-	                                            @Nullable GetImageCardsListener listener) {
-		if (mapActivity != null && additionalParams != null) {
-			String key = additionalParams.get(Amenity.MAPILLARY);
-			if (key != null) {
-				JSONObject imageObject = MapillaryOsmTagHelper.getImageByKey(key);
-				if (imageObject != null) {
-					holder.addCard(MAPILLARY_AMENITY, new MapillaryImageCard(mapActivity, imageObject));
-				}
-				additionalParams.remove(Amenity.MAPILLARY);
-			}
-			params.putAll(additionalParams);
-		}
-	}
-
 	@Override
 	protected boolean createContextMenuImageCard(@NonNull ImageCardsHolder holder,
 	                                             @NonNull JSONObject imageObject) {
diff --git a/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
index 21356d58a3f..8c2bf244f10 100644
--- a/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
+++ b/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
@@ -103,7 +103,7 @@ private void calculateDeltaSubcategories(BinaryMapPoiReaderAdapter.PoiRegion reg
 	}
 
 	@Nullable
-	private BinaryMapIndexReader getOpenFile() {
+	public BinaryMapIndexReader getOpenFile() {
 		return resource.getReader(BinaryMapReaderResourceType.POI);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
index 3030737acb0..e9c9e2802ab 100644
--- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
@@ -799,6 +799,16 @@ public List<AmenityIndexRepository> getAmenityRepositories(boolean includeTravel
 		return res;
 	}
 
+	@NonNull
+	public List<BinaryMapIndexReader> getAmenityReaders(boolean includeTravel) {
+		List<BinaryMapIndexReader> readers = new ArrayList<>();
+		List<AmenityIndexRepository> repos = app.getResourceManager().getAmenityRepositories(includeTravel);
+		for (AmenityIndexRepository repo : repos) {
+			readers.add(((AmenityIndexRepositoryBinary) repo).getOpenFile());
+		}
+		return readers;
+	}
+
 	@NonNull
 	public List<Amenity> searchAmenities(SearchPoiTypeFilter filter, QuadRect rect,
 			boolean includeTravel) {
diff --git a/OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java b/OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
index feb1f6271c5..8ae9d023af3 100644
--- a/OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
@@ -259,8 +259,9 @@ public void initItems(@Nullable GpxTrackAnalysis initAnalysis) {
 	}
 
 	public void prepareDataDistance(float totalDistance) {
+		GPXDataSetType secondType = analysis.hasSpeedData() ? GPXDataSetType.SPEED : null;
 		prepareData(app.getString(R.string.distance), OsmAndFormatter.getFormattedDistance(totalDistance, app),
-				R.drawable.ic_action_track_16, GPXDataSetType.ALTITUDE, GPXDataSetType.SPEED, ItemType.ITEM_DISTANCE);
+				R.drawable.ic_action_track_16, GPXDataSetType.ALTITUDE, secondType, ItemType.ITEM_DISTANCE);
 	}
 
 	public void prepareDataAverageAltitude() {
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/DownloadedRegionsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/DownloadedRegionsLayer.java
index 0eecf278089..3d754c03f38 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/DownloadedRegionsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/DownloadedRegionsLayer.java
@@ -23,6 +23,7 @@
 import net.osmand.core.jni.PolygonBuilder;
 import net.osmand.core.jni.PolygonsCollection;
 import net.osmand.core.jni.QVectorPointI;
+import net.osmand.core.jni.ZoomLevel;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
@@ -777,7 +778,7 @@ private int addToPolygonsCollection(List<WorldRegion> regionList, Paint paint, i
 			return baseOrder;
 		}
 		if (polygonsCollection == null) {
-			polygonsCollection = new PolygonsCollection();
+			polygonsCollection = new PolygonsCollection(ZoomLevel.ZoomLevel3, ZoomLevel.ZoomLevel7);
 		}
 		for (WorldRegion region : regionList) {
 			for (List<LatLon> polygon : region.getPolygons()) {
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
index 806b4aad373..ae7f025b23b 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
@@ -1210,10 +1210,11 @@ private void drawSelectedFileSegments(SelectedGpxFile selectedGpxFile, boolean c
 			renderedSegments = new HashSet<>();
 			renderedSegmentsCache.put(gpxFilePath, renderedSegments);
 		}
-		String gpxWidth = gpxAppearanceHelper.getTrackWidth(gpxFile, defaultWidthPref.get());
+		String actualGpxWidth = gpxAppearanceHelper.getTrackWidth(gpxFile, null);
+		String defaultGpxWidth = gpxAppearanceHelper.getTrackWidth(gpxFile, defaultWidthPref.get());
 		for (int segmentIdx = 0; segmentIdx < segments.size(); segmentIdx++) {
 			TrkSegment ts = segments.get(segmentIdx);
-			String width = ts.getWidth(gpxWidth);
+			String width = actualGpxWidth != null ? actualGpxWidth : ts.getWidth(defaultGpxWidth);
 			cachedTrackWidth.putIfAbsent(width, null);
 			int color = getTrackColor(gpxFile, ts.getColor(cachedColor));
 			boolean newTsRenderer = false;
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
index cfe0ad15384..356939fcb51 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
@@ -50,6 +50,8 @@
 import net.osmand.PlatformUtil;
 import net.osmand.ResultMatcher;
 import net.osmand.plus.Version;
+import net.osmand.plus.resources.AmenityIndexRepository;
+import net.osmand.plus.resources.AmenityIndexRepositoryBinary;
 import net.osmand.plus.shared.SharedUtil;
 import net.osmand.binary.BinaryMapDataObject;
 import net.osmand.binary.BinaryMapIndexReader;
@@ -183,7 +185,7 @@ private synchronized PopularArticles loadPopularArticlesForLang(String lang) {
 			do {
 				if (foundAmenities.size() - foundAmenitiesIndex < ARTICLES_PER_PAGE) {
 					LatLon location = app.getMapViewTrackingUtilities().getMapLocation();
-					for (BinaryMapIndexReader reader : getReaders()) {
+					for (BinaryMapIndexReader reader : getTravelReaders()) {
 						try {
 							searchAmenity(foundAmenities, location, reader, searchRadius, -1, ROUTE_ARTICLE, lang);
 							searchAmenity(foundAmenities, location, reader, searchRadius / 5, 15, ROUTE_TRACK, null);
@@ -243,7 +245,7 @@ public synchronized TravelGpx searchGpx(@NonNull LatLon location, @Nullable Stri
 		int searchRadius = ARTICLE_SEARCH_RADIUS;
 		TravelGpx travelGpx = null;
 		do {
-			for (BinaryMapIndexReader reader : getReaders()) {
+			for (BinaryMapIndexReader reader : getAmenityReaders()) {
 				try {
 					searchAmenity(foundAmenities, location, reader, searchRadius, 15, ROUTE_TRACK, null);
 				} catch (Exception e) {
@@ -399,7 +401,7 @@ private TravelArticle readArticle(@NonNull File file, @NonNull Amenity amenity,
 
 	@Override
 	public boolean isAnyTravelBookPresent() {
-		return !Algorithms.isEmpty(getReaders());
+		return !Algorithms.isEmpty(getTravelReaders());
 	}
 
 	@NonNull
@@ -423,7 +425,7 @@ private synchronized List<WikivoyageSearchResult> searchWithLang(@NonNull String
 		NameStringMatcher matcher = phrase.getFirstUnknownNameStringMatcher();
 		List<WikivoyageSearchResult> empty = new ArrayList<>();
 
-		for (BinaryMapIndexReader reader : getReaders()) {
+		for (BinaryMapIndexReader reader : getTravelReaders()) {
 			if (requestNumber != reqNumber) {
 				return empty;
 			}
@@ -657,7 +659,7 @@ public synchronized Map<WikivoyageSearchResult, List<WikivoyageSearchResult>> ge
 	private TravelArticle getParentArticleByTitle(String title, String lang) {
 		TravelArticle article = null;
 		List<Amenity> amenities = new ArrayList<>();
-		for (BinaryMapIndexReader reader : getReaders()) {
+		for (BinaryMapIndexReader reader : getTravelReaders()) {
 			try {
 				SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest(
 						0, 0, title, 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE, getSearchFilter(ROUTE_ARTICLE),
@@ -756,7 +758,7 @@ public void onGpxFileRead(@Nullable GpxFile gpxFile) {
 
 	private void readGpxFile(@NonNull TravelArticle article, @Nullable GpxReadCallback callback) {
 		if (!article.gpxFileRead) {
-			new GpxFileReader(article, callback, getReaders()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+			new GpxFileReader(article, callback, getAmenityReaders()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 		} else if (callback != null) {
 			callback.onGpxFileRead(article.gpxFile);
 		}
@@ -767,7 +769,7 @@ private synchronized TravelArticle findArticleById(@NonNull TravelArticleIdentif
 		TravelArticle article = null;
 		boolean isDbArticle = articleId.file != null && articleId.file.getName().endsWith(IndexConstants.BINARY_WIKIVOYAGE_MAP_INDEX_EXT);
 		List<Amenity> amenities = new ArrayList<>();
-		for (BinaryMapIndexReader reader : getReaders()) {
+		for (BinaryMapIndexReader reader : getTravelReaders()) {
 			try {
 				if (articleId.file != null && !articleId.file.equals(reader.getFile()) && !isDbArticle) {
 					continue;
@@ -822,7 +824,7 @@ public synchronized TravelArticle findSavedArticle(@NonNull TravelArticle savedA
 		long lastModified = savedArticle.getLastModified();
 		TravelArticleIdentifier finalArticleId = articleId;
 		SearchRequest<Amenity> req = null;
-		for (BinaryMapIndexReader reader : getReaders()) {
+		for (BinaryMapIndexReader reader : getTravelReaders()) {
 			try {
 				if (articleId.file != null && articleId.file.equals(reader.getFile())) {
 					if (lastModified == reader.getFile().lastModified()) {
@@ -871,7 +873,7 @@ public boolean isCancelled() {
 			}
 		}
 		if (amenities.isEmpty() && !Algorithms.isEmpty(articleId.title)) {
-			for (BinaryMapIndexReader reader : getReaders()) {
+			for (BinaryMapIndexReader reader : getTravelReaders()) {
 				try {
 					req = getEqualsTitleRequest(articleId, lang, amenities, reader);
 					req.setBBoxRadius(articleId.lat, articleId.lon, SAVED_ARTICLE_SEARCH_RADIUS);
@@ -886,7 +888,7 @@ public boolean isCancelled() {
 			}
 		}
 		if (amenities.isEmpty()) {
-			for (BinaryMapIndexReader reader : getReaders()) {
+			for (BinaryMapIndexReader reader : getTravelReaders()) {
 				try {
 					req = BinaryMapIndexReader.buildSearchPoiRequest(0, 0,
 							Algorithms.emptyIfNull(articleId.title), 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE,
@@ -991,7 +993,7 @@ public synchronized TravelArticle getArticleByTitle(@NonNull String title, @NonN
 			top = (int) rect.top;
 			bottom = (int) rect.bottom;
 		}
-		for (BinaryMapIndexReader reader : getReaders()) {
+		for (BinaryMapIndexReader reader : getTravelReaders()) {
 			try {
 				SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest(
 						x, y, title, left, right, top, bottom, getSearchFilter(ROUTE_ARTICLE),
@@ -1024,7 +1026,7 @@ public boolean isCancelled() {
 		return article;
 	}
 
-	private List<BinaryMapIndexReader> getReaders() {
+	private List<BinaryMapIndexReader> getTravelReaders() {
 		if (!app.isApplicationInitializing()) {
 			return app.getResourceManager().getTravelRepositories();
 		} else {
@@ -1032,6 +1034,14 @@ private List<BinaryMapIndexReader> getReaders() {
 		}
 	}
 
+	private List<BinaryMapIndexReader> getAmenityReaders() {
+		if (!app.isApplicationInitializing()) {
+			return app.getResourceManager().getAmenityReaders(true);
+		} else {
+			return new ArrayList<>();
+		}
+	}
+
 	@Nullable
 	@Override
 	public TravelArticleIdentifier getArticleId(@NonNull String title, @NonNull String lang) {