diff --git a/LICENSE b/LICENSE
index a739fdd6b9..c26d37ee1c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -62,6 +62,10 @@
 	- Madrid: «MetroMadridLogo» (Przemysław Sakrajda) - own work based on (na podstawie) www.metromadrid.es. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:MetroMadridLogo.svg#/media/File:MetroMadridLogo.svg
 	- London: «Underground» (Dream out loud) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Underground.svg#/media/File:Underground.svg
 	- Barcelona: «Logometrobcn» (Javitomad) - own work. Under GFDL license - https://commons.wikimedia.org/wiki/File:Logometrobcn.svg#/media/File:Logometrobcn.svg
+	- Tokyo: "Tokyo Metro logo (full)" by Imagener - Tokyo Metro Company. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Tokyo_Metro_logo_(full).svg#/media/File:Tokyo_Metro_logo_(full).svg
+	- Chicago: «Логотип Chicago Transit Authority» - http://brandsoftheworld.com/, http://en.wikipedia.org/wiki/Image:Chicago_Transit_Authority_Logo.svg. Under Fair use license from site- https://ru.wikipedia.org/wiki/%D0%A4%D0%B0%D0%B9%D0%BB:%D0%9B%D0%BE%D0%B3%D0%BE%D1%82%D0%B8%D0%BF_Chicago_Transit_Authority.svg#/media/File:%D0%9B%D0%BE%D0%B3%D0%BE%D1%82%D0%B8%D0%BF_Chicago_Transit_Authority.svg
+	- Osaka:«Osaka Metro Logo» (Osaka_Municipal_Subway_logo_001.JPG: Tennen-Gasderivative work: () - Hand coded. Own work, based on Osaka_Municipal_Subway_logo_001.JPG. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Osaka_Metro_Logo.svg#/media/File:Osaka_Metro_Logo.svg
+	- Stockholm: «Stockholm metro symbol» svg graphics by (Kildor) - own work. Licensed under Public Domain via Commons from site - https://commons.wikimedia.org/wiki/File:Stockholm_metro_symbol.svg#/media/File:Stockholm_metro_symbol.svg
 
     * Integration with Qt library in (https://github.com/osmandapp/Osmand-core/) - dynamic linking
         - LGPL (http://www.qt.io/qt-licensing-terms/)
diff --git a/OsmAnd-java/src/net/osmand/util/Algorithms.java b/OsmAnd-java/src/net/osmand/util/Algorithms.java
index 7da3e44d21..e6fa8347bd 100644
--- a/OsmAnd-java/src/net/osmand/util/Algorithms.java
+++ b/OsmAnd-java/src/net/osmand/util/Algorithms.java
@@ -1,6 +1,10 @@
 package net.osmand.util;
 
 
+import net.osmand.PlatformUtil;
+
+import org.apache.commons.logging.Log;
+
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.EOFException;
@@ -11,7 +15,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -20,10 +23,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.osmand.PlatformUtil;
-
-import org.apache.commons.logging.Log;
-
 
 /**
  * Basic algorithms that are not in jdk 
@@ -504,6 +503,21 @@ public class Algorithms {
 			return hours + ":" + min + ":" + sec;
 		}
 	}
+
+	public static String formatMinutesDuration(int minutes) {
+		if (minutes < 60) {
+			return String.valueOf(minutes);
+		} else {
+			String min;
+			if (minutes % 60 < 10) {
+				min = "0" + (minutes % 60);
+			} else {
+				min = (minutes % 60) + "";
+			}
+			int hours = minutes / 60;
+			return hours + ":" + min;
+		}
+	}
 	
 	public static <T extends Enum<T> > T parseEnumValue(T[] cl, String val, T defaultValue){
 		for(int i = 0; i< cl.length; i++) {
diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
index 30d9f0cd87..f95a264282 100644
--- a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
+++ b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
@@ -743,7 +743,7 @@ public class OpeningHoursParser {
 	 * @param format the string to parse
 	 * @return the OpeningHours object
 	 */
-	private static OpeningHoursParser.OpeningHours parseOpenedHoursHandleErrors(String format){
+	public static OpeningHoursParser.OpeningHours parseOpenedHoursHandleErrors(String format){
 		if(format == null) {
 			return null;
 		}
diff --git a/OsmAnd/res/layout/download_index_fragment.xml b/OsmAnd/res/layout/download_index_fragment.xml
index 83fdecf566..4c11ce3e45 100644
--- a/OsmAnd/res/layout/download_index_fragment.xml
+++ b/OsmAnd/res/layout/download_index_fragment.xml
@@ -3,6 +3,7 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:orientation="vertical">
+    <include layout="@layout/free_version_banner"/>
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/local_index_fragment_header.xml b/OsmAnd/res/layout/local_index_fragment_header.xml
index 85a06e636b..26aeb4ea07 100644
--- a/OsmAnd/res/layout/local_index_fragment_header.xml
+++ b/OsmAnd/res/layout/local_index_fragment_header.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:background="@color/ctx_menu_info_view_bg_dark"
@@ -9,11 +8,13 @@
     <include layout="@layout/free_version_banner"/>
 
     <LinearLayout
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:layout_margin="4dp"
         android:background="?attr/bg_card"
-        android:orientation="vertical"
         android:padding="10dp">
 
         <LinearLayout
@@ -23,14 +24,15 @@
             android:orientation="horizontal">
 
             <TextView
+                android:id="@+id/leftTextView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
-                android:text="@string/device_memory"/>
+                tools:text="@string/device_memory"/>
 
             <TextView
-                android:id="@+id/memory_size"
+                android:id="@+id/rightTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -38,7 +40,7 @@
         </LinearLayout>
 
         <ProgressBar
-            android:id="@+id/memory_progress"
+            android:id="@+id/progressBar"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="fill_parent"
             android:layout_height="20dp"
diff --git a/OsmAnd/res/layout/maps_in_category_fragment.xml b/OsmAnd/res/layout/maps_in_category_fragment.xml
index 5a59e33ed4..d3a17ccac7 100644
--- a/OsmAnd/res/layout/maps_in_category_fragment.xml
+++ b/OsmAnd/res/layout/maps_in_category_fragment.xml
@@ -15,6 +15,53 @@
         app:contentInsetLeft="72dp"
         app:contentInsetStart="72dp"/>
 
+    <include layout="@layout/free_version_banner"/>
+    <LinearLayout
+        android:id="@+id/downloadProgressLayout"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_margin="4dp"
+        android:padding="10dp"
+        tools:visibility="visible"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/leftTextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                tools:text="@string/device_memory"/>
+
+            <TextView
+                android:id="@+id/rightTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                tools:text="@string/free"/>
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="20dp"
+            android:progressDrawable="?attr/size_progress_bar"/>
+
+
+    </LinearLayout>
+
+
+
     <FrameLayout
         android:id="@+id/fragmentContainer"
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index dc95e96534..e3e1bdea47 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -955,7 +955,7 @@
 	<string name="poi_access_private">Adgang privat</string>
 	<string name="poi_access_no">Ingen adgang</string>
 	<string name="poi_access_destination">Adgang destination</string>
-	<string name="poi_access_permissive">Adgang tolerant</string>
+	<string name="poi_access_permissive">Adgang med tilladelse</string>
 	<string name="poi_access_customers">Kundenadgang</string>
 	<string name="poi_access_delivery">Adgang for levering</string>
 	<string name="poi_access_agricultural">Adgang for landbrug</string>
@@ -1042,8 +1042,8 @@
 	<string name="poi_recycling_cars">Biler</string>
 	<string name="poi_recycling_bicycles">Cykler</string>
 
-	<string name="poi_drinking_water_yes">Drikkevand</string>
-	<string name="poi_drinking_water_no">Ikke drikkevand</string>
+	<string name="poi_drinking_water_yes">Drikkevand: ja</string>
+	<string name="poi_drinking_water_no">Drikkevand: nej</string>
 	<string name="poi_supervised_yes">Overvåget</string>
 	<string name="poi_supervised_no">Ikke overvåget</string>
 	<string name="poi_seasonal_yes">Sæsonbestemt</string>
@@ -1229,7 +1229,7 @@
 	<string name="poi_nudism_no">Naturisme: forbudt</string>
 	<string name="poi_nudism_obligatory">Naturisme: obligatorisk</string>
 	<string name="poi_nudism_customary">Naturisme: sædvane</string>
-	<string name="poi_nudism_permissive">Naturisme: liberalt</string>
+	<string name="poi_nudism_permissive">Naturisme: med tilladelse</string>
 
 	<string name="poi_height">Højde</string>
 	<string name="poi_ele">Højde over havoverfladen</string>
@@ -1381,7 +1381,7 @@
 	<string name="poi_piste_grooming_backcountry">Pistepreparering: offpiste</string>
 	<string name="poi_piste_grooming_scooter">Pistepreparering: snescooter</string>
 	<string name="poi_piste_grooming_skating">Pistepreparering: skating</string>
-	<string name="poi_piste_grooming_no">Pistepreparering: ingen</string>
+	<string name="poi_piste_grooming_no">Pistepreparering: nej</string>
 	<string name="poi_piste_grooming_mogul">Pistepreparering: pukkelpist</string>
 
 <string name="poi_garden_type_residential">Havetype: beboelse</string>
@@ -1593,71 +1593,71 @@
 	<string name="poi_internet_access_fee_yes">Internetadgang - gebyr</string>
 	<string name="poi_internet_access_fee_no">Internetadgang - inget gebyr</string>
 
-<string name="poi_diet_vegetarian_only">Kun vegetarisk kost</string>
-	<string name="poi_diet_vegetarian_yes">Vegetarisk kost</string>
-	<string name="poi_diet_vegetarian_no">Vegetarisk kost: ingen</string>
-	<string name="poi_diet_vegetarian_few">Vegetarisk kost: få</string>
+<string name="poi_diet_vegetarian_only">Kun vegetarkost</string>
+	<string name="poi_diet_vegetarian_yes">Vegetarkost</string>
+	<string name="poi_diet_vegetarian_no">Vegetarkost: nej</string>
+	<string name="poi_diet_vegetarian_few">Vegetarkost: kun få</string>
 	<string name="poi_diet_vegan_only">Kun veganerkost</string>
 	<string name="poi_diet_vegan_yes">Veganerkost</string>
-	<string name="poi_diet_vegan_no">Veganerkost: ingen</string>
+	<string name="poi_diet_vegan_no">Veganerkost: nej</string>
 	<string name="poi_diet_gluten_free_only">Kun glutenfri kost</string>
 	<string name="poi_diet_gluten_free_yes">Glutenfri kost</string>
-	<string name="poi_diet_gluten_free_no">Glutenfri kost: ingen</string>
+	<string name="poi_diet_gluten_free_no">Glutenfri kost: nej</string>
 	<string name="poi_diet_kosher_only">Kun kosher kost</string>
 	<string name="poi_diet_kosher_yes">Kosher kost</string>
-	<string name="poi_diet_kosher_no">Kosher kost: ingen</string>
+	<string name="poi_diet_kosher_no">Kosher kost: nej</string>
 	<string name="poi_diet_halal_only">Kun halal kost</string>
 	<string name="poi_diet_halal_yes">Halal kost</string>
-	<string name="poi_diet_halal_no">Halal kost: ingen</string>
+	<string name="poi_diet_halal_no">Halal kost: nej</string>
 	<string name="poi_diet_lactose_free_only">Kun laktosefri kost</string>
 	<string name="poi_diet_lactose_free_yes">Laktosefri kost</string>
-	<string name="poi_diet_lactose_free_no">Laktosefri kost: ingen</string>
-	<string name="poi_diet_pescetarian_yes">Pescetarian kost</string>
+	<string name="poi_diet_lactose_free_no">Laktosefri kost: nej</string>
+	<string name="poi_diet_pescetarian_yes">pesco-vegetarkost</string>
 
-	<string name="poi_drive_in_yes">Drive-in: Ja</string>
-	<string name="poi_drive_in_no">Drive-in: ingen</string>
-	<string name="poi_drive_through_yes">Drive-through: Ja</string>
-	<string name="poi_drive_through_no">Drive-through: Ja</string>
+	<string name="poi_drive_in_yes">Drive-in: ja</string>
+	<string name="poi_drive_in_no">Drive-in: nej</string>
+	<string name="poi_drive_through_yes">Drive-through: ja</string>
+	<string name="poi_drive_through_no">Drive-through: nej</string>
 
-	<string name="poi_brewery_additional">Bryggeriet navn</string>
+	<string name="poi_brewery_additional">Bryggerinavn</string>
 	<string name="poi_microbrewery_yes">Mikrobryggeri</string>
 	<string name="poi_microbrewery_no">Ingen mikrobryggeri</string>
 
 	<string name="poi_takeaway_yes">Takeway</string>
-	<string name="poi_takeaway_no">Ingen takeway</string>
-	<string name="poi_takeaway_only">Takeway kun</string>
+	<string name="poi_takeaway_no">Ingen takeaway</string>
+	<string name="poi_takeaway_only">Kun takeaway</string>
 
 	<string name="poi_delivery_yes">Levering</string>
 	<string name="poi_delivery_no">Ingen levering</string>
-	<string name="poi_delivery_only">Levering kun</string>
+	<string name="poi_delivery_only">Kun levering</string>
 
-	<string name="poi_outdoor_seating_yes">Udendørs siddepladser</string>
-	<string name="poi_outdoor_seating_no">Ingen udendørs siddepladser</string>
-	<string name="poi_outdoor_seating_terrace">Udendørs siddepladser: terrasse</string>
-	<string name="poi_outdoor_seating_sidewalk">Udendørs siddepladser: fortovet</string>
-	<string name="poi_outdoor_seating_pedestrian_zone">Udendørs siddepladser: gågaden</string>
-	<string name="poi_outdoor_seating_garden">Udendørs siddepladser: haven</string>
-	<string name="poi_outdoor_seating_patio">Udendørs siddepladser: gårdhave</string>
+	<string name="poi_outdoor_seating_yes">Udendørsservering</string>
+	<string name="poi_outdoor_seating_no">Ingen udendørsservering</string>
+	<string name="poi_outdoor_seating_terrace">Udendørsservering: terrasse</string>
+	<string name="poi_outdoor_seating_sidewalk">Udendørsservering: fortov</string>
+	<string name="poi_outdoor_seating_pedestrian_zone">Udendørsservering: gågade</string>
+	<string name="poi_outdoor_seating_garden">Udendørsservering: have</string>
+	<string name="poi_outdoor_seating_patio">Udendørsservering: gårdhave</string>
 
 	<string name="poi_cocktails_yes">Cocktails</string>
 
 	<string name="poi_second_hand_yes">Brugte varer</string>
 	<string name="poi_second_hand_no">Ingen brugte varer</string>
-	<string name="poi_second_hand_only">Brugte varer kun</string>
+	<string name="poi_second_hand_only">Kun brugte varer</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 El-køretøjer</string>
-	<string name="poi_motorcycle_repair">Motorcykel 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">Selvbetjening</string>
 	<string name="poi_self_service_no">Ingen selvbetjening</string>
 	<string name="poi_automated_yes">Automatiseret</string>
 	<string name="poi_automated_no">Ikke automatiseret</string>
 	<string name="poi_full_service_yes">Fuld service</string>
 	<string name="poi_brushless_yes">Børsteløs</string>
-	<string name="poi_brushless_no">Børsteløs: ingen</string>
+	<string name="poi_brushless_no">Børsteløs: nej</string>
 
 	<string name="poi_aeroway_fuel">Fly tankstation</string>
 	<string name="poi_public_bath">Offentligt bad</string>
@@ -1665,22 +1665,78 @@
 	<string name="poi_male_yes">Mand</string>
 	<string name="poi_male_no">Forbudt for mænd</string>
 	<string name="poi_female_yes">Kvinde</string>
-	<string name="poi_female_no">Forbudt for kvindelige</string>
+	<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">Med 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: ingen</string>
-	<string name="poi_toilets_access_customers">Toiletter adgang: kunder</string>
-	<string name="poi_toilets_access_permissive">Toiletter adgang: eftergivende</string>
-	<string name="poi_toilets_access_community">Toiletter adgang: Fællesskabet</string>
-	<string name="poi_toilets_access_public">Toiletter adgang: offentlig</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>
+	<string name="poi_toilets_access_customers">Toiletadgang: kunder</string>
+	<string name="poi_toilets_access_permissive">Toiletadgang: med tilladelse</string>
+	<string name="poi_toilets_access_community">Toiletadgang: fællesskab</string>
+	<string name="poi_toilets_access_public">Toiletadgang: offentlig</string>
 
-	<string name="poi_diaper_yes">Ble puslebord</string>
-	<string name="poi_diaper_no">Ingen ble puslebord</string>
-	<string name="poi_diaper_room">Ble skiftende rum</string>
+	<string name="poi_diaper_yes">Puslebord</string>
+	<string name="poi_diaper_no">Ingen puslebord</string>
+	<string name="poi_diaper_room">Puslerum</string>
 
-<string name="poi_events_venue">begivenheder mødested</string>
+<string name="poi_events_venue">Kulturhus</string>
 
-	</resources>
+	<string name="poi_car_wash_no">Bilvask: nej</string>
+
+	<string name="poi_maxstay">Parkering tidsfrist</string>
+
+	<string name="poi_vending_parking_tickets">Parkeringsbilletter</string>
+	<string name="poi_vending_cigarettes">Cigaretter</string>
+	<string name="poi_vending_public_transport_tickets">Billetter til offentlig transport</string>
+	<string name="poi_vending_drinks">Drikkevarer</string>
+	<string name="poi_vending_sweets">Slik</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Pakke afhentning og post Indsendelsesservice</string>
+	<string name="poi_vending_condoms">Kondomer</string>
+	<string name="poi_vending_stamps">Frimærker</string>
+	<string name="poi_vending_bicycle_tube">Cykelslanger</string>
+	<string name="poi_vending_food">Mad</string>
+	<string name="poi_vending_drinks_food">Drikkevarer og mad</string>
+	<string name="poi_vending_fuel">Benzinautomat</string>
+	<string name="poi_vending_parcel_pickup">Pakke afhentning</string>
+	<string name="poi_vending_parcel_mail_in">Pakke Indsendelsesservice</string>
+	<string name="poi_vending_milk">Mælk</string>
+	<string name="poi_vending_elongated_coin">Souvenirmønt</string>
+	<string name="poi_vending_bread">Brød</string>
+	<string name="poi_vending_chewing_gums">Tyggegummi</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Parkeringsbilletter; billetter til offentlig transport</string>
+	<string name="poi_vending_coffee">Kaffe</string>
+	<string name="poi_vending_toll">Vejafgiftautomat</string>
+	<string name="poi_vending_tickets">Billetautomat</string>
+	<string name="poi_vending_water">Vandautomat</string>
+	<string name="poi_vending_telephone_vouchers">Telefon værdikuponer</string>
+	<string name="poi_vending_animal_food">Dyrefoder</string>
+	<string name="poi_vending_public_transport_plans">Køreplaner</string>
+	<string name="poi_vending_drinks_sweets">Drikkevarer og slik</string>
+	<string name="poi_vending_vouchers">Gavekort</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Stearinlys</string>
+	<string name="poi_vending_toys">Legetøj</string>
+	<string name="poi_vending_ice_cream">Is</string>
+	<string name="poi_vending_sim_cards">SIM-kort</string>
+
+	<string name="poi_branch">Branche</string>
+
+	<string name="poi_memorial_war">Krigsmindesmærke</string>
+	<string name="poi_memorial_plaque">Plakette</string>
+	<string name="poi_memorial_statue">Statue</string>
+	<string name="poi_memorial_stone">Sten</string>
+	<string name="poi_memorial_stele">Stele</string>
+	<string name="poi_memorial_bust">Buste</string>
+	<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">Kors</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>
+	<string name="poi_inscription">Inskription</string>
+
+</resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 63c33ac89a..c9ee9967b4 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2160,4 +2160,5 @@
     <string name="default_speed_system_descr">Vælg enhed for hastighed</string>
     <string name="favorite_category_add_new">Tilføj ny</string>
     <string name="favorite_category_select">Vælg kategori</string>
-    </resources>
+    <string name="downloading_number_of_fiels">Henter - %1$d fil</string>
+</resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index b5c6666aac..33a7f95cd1 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -1022,8 +1022,8 @@
 	<string name="poi_recycling_bicycles">Bicicletas</string>
 
 	<string name="poi_shower">Duchas</string>
-	<string name="poi_drinking_water_yes">Agua potable</string>
-	<string name="poi_drinking_water_no">Agua no potable</string>
+	<string name="poi_drinking_water_yes">Con agua potable</string>
+	<string name="poi_drinking_water_no">Sin agua potable</string>
 	<string name="poi_supervised_yes">Supervisado</string>
 	<string name="poi_supervised_no">Sin supervisión</string>
 	<string name="poi_seasonal_yes">Estacional</string>
@@ -1659,4 +1659,54 @@
 	<string name="poi_diaper_no">Sin cambiador de pañales</string>
 	<string name="poi_diaper_room">Habitación para cambio de pañales</string>
 
+<string name="poi_car_wash_no">Lavado de autos: no</string>
+
+	<string name="poi_maxstay">Estadía máxima</string>
+
+	<string name="poi_vending_parking_tickets">Tickets de estacionamiento</string>
+	<string name="poi_vending_cigarettes">Cigarrillos</string>
+	<string name="poi_vending_excrement_bags">Bolsas para excremento</string>
+	<string name="poi_vending_public_transport_tickets">Tickets de transporte público</string>
+	<string name="poi_vending_drinks">Bebidas</string>
+	<string name="poi_vending_sweets">Dulces</string>
+	<string name="poi_vending_condoms">Condones</string>
+	<string name="poi_vending_stamps">Sellos</string>
+	<string name="poi_vending_bicycle_tube">Tubos de bicicleta</string>
+	<string name="poi_vending_food">Comida</string>
+	<string name="poi_vending_drinks_food">Bebidas y comidas</string>
+	<string name="poi_vending_fuel">Surtidor de combustible</string>
+	<string name="poi_vending_milk">Leche</string>
+	<string name="poi_vending_bread">Pan</string>
+	<string name="poi_vending_chewing_gums">Chicles</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Tickets de estacionamiento y transporte público</string>
+	<string name="poi_vending_coffee">Café</string>
+	<string name="poi_vending_toll">Tickets de peaje</string>
+	<string name="poi_vending_tickets">Surtidor de tickets</string>
+	<string name="poi_vending_water">Surtidor de agua</string>
+	<string name="poi_vending_telephone_vouchers">Vales de teléfono</string>
+	<string name="poi_vending_animal_food">Comida animal</string>
+	<string name="poi_vending_public_transport_plans">Planes de transporte público</string>
+	<string name="poi_vending_drinks_sweets">Bebidas y dulces</string>
+	<string name="poi_vending_vouchers">Vales</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Velas</string>
+	<string name="poi_vending_toys">Juguetes</string>
+	<string name="poi_vending_ice_cream">Helados</string>
+	<string name="poi_vending_sim_cards">Tarjetas SIM</string>
+
+	<string name="poi_branch">Rama</string>
+
+	<string name="poi_memorial_war">Memorial de guerra</string>
+	<string name="poi_memorial_plaque">Placa</string>
+	<string name="poi_memorial_statue">Estatua</string>
+	<string name="poi_memorial_stone">Piedra</string>
+	<string name="poi_memorial_stele">Estrella</string>
+	<string name="poi_memorial_bust">Busto</string>
+	<string name="poi_memorial_blue_plaque">Placa azul</string>
+	<string name="poi_memorial_cross">Cruz</string>
+	<string name="poi_memorial_vehicle">Vehículo</string>
+	<string name="poi_memorial_obelisk">Obelisco</string>
+
+	<string name="poi_inscription">Inscripción</string>
+
 </resources>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 63b5771726..de247e7341 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -1026,8 +1026,8 @@
 	<string name="poi_recycling_bicycles">Bicicletas</string>
 
 	<string name="poi_shower">Duchas</string>
-	<string name="poi_drinking_water_yes">Agua potable</string>
-	<string name="poi_drinking_water_no">Agua no potable</string>
+	<string name="poi_drinking_water_yes">Agua potable: sí</string>
+	<string name="poi_drinking_water_no">Agua potable: no</string>
 	<string name="poi_supervised_yes">Supervisado</string>
 	<string name="poi_supervised_no">Sin supervisión</string>
 	<string name="poi_seasonal_yes">Estacional</string>
@@ -1663,4 +1663,28 @@
 	<string name="poi_diaper_no">Sin cambiador de pañales</string>
 	<string name="poi_diaper_room">Habitación para cambio de pañales</string>
 
+<string name="poi_vending_cigarettes">Cigarrillos</string>
+	<string name="poi_vending_drinks">Bebidas</string>
+	<string name="poi_vending_condoms">Preservativos</string>
+	<string name="poi_vending_stamps">Sellos</string>
+	<string name="poi_vending_food">Comida</string>
+	<string name="poi_vending_drinks_food">Bebidas y comida</string>
+	<string name="poi_vending_milk">Leche</string>
+	<string name="poi_vending_bread">Pan</string>
+	<string name="poi_vending_chewing_gums">Chicles</string>
+	<string name="poi_vending_coffee">Café</string>
+	<string name="poi_vending_animal_food">Comida para animales</string>
+	<string name="poi_vending_drinks_sweets">Bebidas y dulces</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Velas</string>
+	<string name="poi_vending_toys">Juguetes</string>
+	<string name="poi_vending_ice_cream">Helado</string>
+	<string name="poi_vending_sim_cards">Tarjetas SIM</string>
+
+	<string name="poi_memorial_statue">Estatua</string>
+	<string name="poi_memorial_vehicle">Vehículo</string>
+	<string name="poi_memorial_obelisk">Obelisco</string>
+
+	<string name="poi_inscription">Inscripción</string>
+
 </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index dc972c8307..0dedda6007 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2033,7 +2033,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="shared_string_manage">Gestisci</string>
 	<string name="shared_string_edit">Modifica</string>
 	<string name="filter_poi_hint">Filtra per nome</string>
-    <string name="search_poi_category_hint">Digita per cercare fra tutti i PDI</string>
+    <string name="search_poi_category_hint">Scrivi per cercare fra tutti i PDI</string>
     <string name="index_name_netherlands">Europa - Paesi Bassi</string>
 	<string name="copying_osmand_file_failed">Copia dei file fallita</string>    
     <string name="storage_directory_external">Memoria esterna</string>
@@ -2127,7 +2127,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="we_really_care">Ci teniamo molto</string>
 	<string name="rate_this_app">Valuta questa app</string>
 	<string name="user_hates_app_get_feedback">Dicci perché.</string>
-	<string name="rate_this_app_long">Per favore dai a OsmAnd la tua valutazione su Google Play</string>
+	<string name="rate_this_app_long">Dai a OsmAnd un punteggio su Google Play</string>
 	<string name="user_hates_app_get_feedback_long">Dicci cosa cambieresti in questa app.</string>
 <string name="download_live_updates">Aggiornamenti automatici</string>
 	<string name="failed_to_upload">Caricamento fallito</string>
diff --git a/OsmAnd/res/values-ku/strings.xml b/OsmAnd/res/values-ku/strings.xml
index af4295a6f8..32fe8db690 100644
--- a/OsmAnd/res/values-ku/strings.xml
+++ b/OsmAnd/res/values-ku/strings.xml
@@ -12,4 +12,6 @@
     <string name="application_dir_change_warning3">Vai vēlaties, lai OsmAnd kopē uz jauno vietu arī savus datu failus?</string>
     <string name="specified_directiory_not_writeable">Norādītajā direktorijā nevar veidot Kartes</string>
 	<string name="favorite_category_add_new">Nu Texe</string>
+    <string name="si_nm">Milla Bahra</string>
+    <string name="shared_string_trip_recording">Tomara Ger</string>
     </resources>
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 32ade2a7b4..a776e2dc20 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -910,17 +910,17 @@
 	<string name="poi_operator">Operador</string>
 	<string name="poi_brand">Bandeira</string>
 
-	<string name="poi_enforcement_traffic_signals">Fiscalização:semáforo</string>
-	<string name="poi_enforcement_maxspeed">Fiscalização:velocidade máxima</string>
-	<string name="poi_enforcement_maxheight">Fiscalização:peso máximo</string>
-	<string name="poi_enforcement_mindistance">Fiscalização:distância mínima</string>
-	<string name="poi_enforcement_access">Fiscalização:acesso</string>
-	<string name="poi_enforcement_toll">Fiscalização:pedágio</string>
+	<string name="poi_enforcement_traffic_signals">Fiscalização: semáforo</string>
+	<string name="poi_enforcement_maxspeed">Fiscalização: velocidade máxima</string>
+	<string name="poi_enforcement_maxheight">Fiscalização: peso máximo</string>
+	<string name="poi_enforcement_mindistance">Fiscalização: distância mínima</string>
+	<string name="poi_enforcement_access">Fiscalização: acesso</string>
+	<string name="poi_enforcement_toll">Fiscalização: pedágio</string>
 
 <string name="poi_conservation">Área de conservação</string>
 
 	<string name="poi_collection_times">Horário de coleta</string>
-	<string name="poi_enforcement_check">Fiscalização:verificação</string>
+	<string name="poi_enforcement_check">Fiscalização: verificação</string>
 	<string name="poi_cutline">Linha de corte</string>
 	<string name="poi_country">País</string>
 	<string name="poi_fee_yes">Taxa</string>
@@ -1023,8 +1023,8 @@
 	<string name="poi_recycling_bicycles">Bicicletas</string>
 
 	<string name="poi_shower">Chuveiro</string>
-	<string name="poi_drinking_water_yes">Água potável</string>
-	<string name="poi_drinking_water_no">Água impotável</string>
+	<string name="poi_drinking_water_yes">Com água potável</string>
+	<string name="poi_drinking_water_no">Sem água potável</string>
 	<string name="poi_supervised_yes">Supervisionado</string>
 	<string name="poi_supervised_no">Sem supervisão</string>
 	<string name="poi_seasonal_yes">Sazonal</string>
@@ -1277,9 +1277,9 @@
 	<string name="poi_information_terminal">Terminal de informação</string>
 	<string name="poi_information_route_marker">Marcador de rota</string>
 	<string name="poi_information_hikingmap">Mapa de caminhadas</string>
-	<string name="poi_information_nature">Informações sobre natureza</string>
-	<string name="poi_information_wildlife">Informações sobre vida selvagem</string>
-	<string name="poi_information_history">Informações sobre história</string>
+	<string name="poi_information_nature">Ponto de informação: natureza</string>
+	<string name="poi_information_wildlife">Ponto de informação: vida selvagem</string>
+	<string name="poi_information_history">Ponto de informação: história</string>
 	<string name="poi_information_sign">Placa</string>
 	<string name="poi_information_audioguide">Audioguia</string>
 	<string name="poi_information_bicyclemap">Mapa ciclístico</string>
@@ -1351,4 +1351,6 @@
 
 	<string name="poi_wheelchair_no">Cadeira de rodas: não permitido</string>
 	<string name="poi_wheelchair_limited">Cadeira de rodas: limitado</string>
+	<string name="poi_pump">Bomba</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 370b74c912..c281f99577 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1469,6 +1469,7 @@
 	<string name="poi_full_service_yes">Полный комплекс услуг</string>
 	<string name="poi_brushless_yes">Бесконтактная</string>
 	<string name="poi_brushless_no">Контактная</string>
+	<string name="poi_car_wash_no">Без автомойки</string>
 
 	<string name="poi_aeroway_fuel">Заправочная станция для воздушного транспорта</string>
 	<string name="poi_public_bath">Общественная баня</string>
@@ -1491,4 +1492,57 @@
 	<string name="poi_diaper_no">Пеленальный столик отсутствует</string>
 	<string name="poi_diaper_room">Пеленальная комната</string>
 
+	<string name="poi_maxstay">Максимальное время стоянки</string>
+
+	<string name="poi_vending_parking_tickets">Парковочные талоны</string>
+	<string name="poi_vending_cigarettes">Сигареты</string>
+	<string name="poi_vending_excrement_bags">Пакеты для экскрементов животных</string>
+	<string name="poi_vending_public_transport_tickets">Билеты на общественный транспорт</string>
+	<string name="poi_vending_drinks">Продажа напитков</string>
+	<string name="poi_vending_sweets">Сладости</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Получение и отправление посылок</string>
+	<string name="poi_vending_condoms">Презервативы</string>
+	<string name="poi_vending_stamps">Марки</string>
+	<string name="poi_vending_bicycle_tube">Велосипедные камеры</string>
+	<string name="poi_vending_food">Питание</string>
+	<string name="poi_vending_drinks_food">Напитки и закуски</string>
+	<string name="poi_vending_fuel">Топливо</string>
+	<string name="poi_vending_parcel_pickup">Получение посылок</string>
+	<string name="poi_vending_parcel_mail_in">Отправление посылок</string>
+	<string name="poi_vending_milk">Молоко</string>
+	<string name="poi_vending_elongated_coin">Удлинённые монеты (сувениры)</string>
+	<string name="poi_vending_bread">Хлеб</string>
+	<string name="poi_vending_chewing_gums">Жевательная резинка</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Парковочные талоны; билеты на общественный транспорт</string>
+	<string name="poi_vending_coffee">Кофе</string>
+	<string name="poi_vending_toll">Оплата за проезд</string>
+	<string name="poi_vending_tickets">Билеты</string>
+	<string name="poi_vending_water">Продажа воды</string>
+	<string name="poi_vending_telephone_vouchers">Телефонные карты</string>
+	<string name="poi_vending_animal_food">Еда для животных</string>
+	<string name="poi_vending_public_transport_plans">Карты общественного транспорта</string>
+	<string name="poi_vending_drinks_sweets">Напитки и сладости</string>
+	<string name="poi_vending_vouchers">Ваучеры</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Свечи</string>
+	<string name="poi_vending_toys">Продажа игрушек</string>
+	<string name="poi_vending_ice_cream">Продажа мороженого</string>
+	<string name="poi_vending_sim_cards">SIM-карты</string>
+
+	<string name="poi_branch">Филиал</string>
+
+	<string name="poi_memorial_war">Военный</string>
+	<string name="poi_memorial_plaque">Доска</string>
+	<string name="poi_memorial_statue">Статуя</string>
+	<string name="poi_memorial_stone">Камень</string>
+	<string name="poi_memorial_stele">Стелла</string>
+	<string name="poi_memorial_bust">Бюст</string>
+	<string name="poi_memorial_blue_plaque">Синяя табличка</string>
+	<string name="poi_memorial_jizo">Дзидзо</string>
+	<string name="poi_memorial_cross">Крест</string>
+	<string name="poi_memorial_vehicle">Средство передвижения</string>
+	<string name="poi_memorial_obelisk">Обелиск</string>
+
+	<string name="poi_inscription">Надпись</string>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 6fc7228205..4d49c4738d 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -1048,7 +1048,7 @@
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
-	<string name="poi_youtube">Youtube</string>
+	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
@@ -1087,4 +1087,104 @@
 	<string name="poi_information_history">Informatziones istòricas</string>
 	<string name="poi_information_sign">Sinnu</string>
 	<string name="poi_information_audioguide">Audioghia</string>
+	<string name="poi_internet_access_yes">Atzessu a ìnternet: eja</string>
+	<string name="poi_internet_access_no">Atzessu a ìnternet: nono</string>
+
+	<string name="poi_seamark_building">Edifìtziu nàutico</string>
+	<string name="poi_seamark_bridge">Ponte nàuticu</string>
+	<string name="poi_highway_crossing">Coladòrgiu pedonale</string>
+
+	<string name="poi_icn_ref">Àndala retza tziclàbile internatzionale</string>
+	<string name="poi_ncn_ref">Àndala retza tziclàbile natzionale</string>
+	<string name="poi_rcn_ref">Àndala retza tziclàbile regionale</string>
+	<string name="poi_lcn_ref">Àndala retza tziclàbile locale</string>
+	<string name="poi_iwn_ref">Àndala retza internatzionale pro s’escursionismu</string>
+	<string name="poi_nwn_ref">Àndala retza natzionale pro s’escursionismu</string>
+	<string name="poi_rwn_ref">Àndala retza regionale pro s’escursionismu</string>
+	<string name="poi_lwn_ref">Àndala retza locale pro s’escursionismu</string>
+
+	<string name="poi_route_hiking_iwn_poi">Àndala internatzionale pro s’escursionismu</string>
+	<string name="poi_route_hiking_nwn_poi">Àndala natzionale pro s’escursionismu</string>
+	<string name="poi_route_hiking_rwn_poi">Àndala regionale pro s’escursionismu</string>
+	<string name="poi_route_hiking_lwn_poi">Àndala locale pro s’escursionismu</string>
+	<string name="poi_route_hiking_ref_poi">Legenda pro sas àndalas pro s’escursionismu</string>
+
+	<string name="poi_fax">Fax</string>
+	<string name="poi_drinking_water_yes">Abba potàbile: eja</string>
+	<string name="poi_drinking_water_no">Abba potàbile:nono</string>
+	<string name="poi_supervised_yes">Tentadu</string>
+	<string name="poi_supervised_no">Non tentadu</string>
+	<string name="poi_seasonal_yes">Istajonale</string>
+	<string name="poi_seasonal_no">Non istajonale</string>
+	<string name="poi_seasonal_dry_season">Istajone sica</string>
+	<string name="poi_seasonal_wet_season">Istajone ùmida</string>
+	<string name="poi_crossing_traffic_signals">Cun semàforos</string>
+	<string name="poi_crossing_uncontrolled">Non controlladu</string>
+	<string name="poi_crossing_unmarked">Non sinnaladu</string>
+	<string name="poi_start_date">Data de cumintzu</string>
+	<string name="poi_wheelchair">Cadira a rodas</string>
+	<string name="poi_wheelchair_no">Cadira a rodas: non permitidas</string>
+	<string name="poi_wheelchair_limited">Cadira a rodas: limitadas</string>
+	<string name="poi_access_private">Atzessu privadu</string>
+	<string name="poi_access_no">Sena atzessu</string>
+	<string name="poi_access_customers">Atzessu pro clientes</string>
+	<string name="poi_access_delivery">Atzessu pro cunsinnas</string>
+	<string name="poi_access_agricultural">Atzessu agrìcolu</string>
+
+	<string name="poi_content_silage">Cuntenutu: insilatu</string>
+	<string name="poi_content_water">Cuntenutu: abba</string>
+	<string name="poi_content_slurry">Cuntenutu: licuames</string>
+	<string name="poi_content_oil">Cuntenutu: ògiu</string>
+	<string name="poi_content_fuel">Cuntenutu: combustìbile</string>
+	<string name="poi_content_manure">Cuntenutu: ledàmene</string>
+	<string name="poi_content_wine">Cuntenutu: binu</string>
+	<string name="poi_content_sewage">Cuntenutu: abbas nieddas</string>
+	<string name="poi_content_gas">Cuntenutu: gas</string>
+	<string name="poi_content_biomass">Cuntenutu: biomassa</string>
+	<string name="poi_content_wastewater">Cuntenutu: abbas de iscàrrigu</string>
+	<string name="poi_content_crop">Cuntenutu: regorta</string>
+	<string name="poi_content_fodder">Cuntenutu: proenda</string>
+	<string name="poi_content_beer">Cuntenutu: birra</string>
+	<string name="poi_content_salt">Cuntenutu: sale</string>
+	<string name="poi_content_grain">Cuntenutu: trigu</string>
+
+	<string name="poi_nudism_yes">Nudismu: permìtidu</string>
+	<string name="poi_nudism_no">Nudismu: proibidu</string>
+	<string name="poi_nudism_obligatory">Nudismu: obligatòriu</string>
+	<string name="poi_nudism_customary">Nudismu: abituale</string>
+	<string name="poi_nudism_permissive">Nudismu: permissivu</string>
+
+	<string name="poi_population">Populatzione</string>
+	<string name="poi_parking_underground">Suta-terra</string>
+	<string name="poi_parking_multi_storey">Medas pianos</string>
+
+	<string name="poi_bicycle_parking_building">Edifìtziu ispetziale</string>
+	<string name="poi_bicycle_parking_informal">Informale</string>
+
+	<string name="poi_leaf_type_broadleaved">Fògia larga (latifògia)</string>
+	<string name="poi_leaf_type_needleleaved">Fògia a agu (aghifògia)</string>
+	<string name="poi_leaf_type_mixed">Mistu</string>
+	<string name="poi_leaf_type_leafless">Sena fògias</string>
+	<string name="poi_species">Genia</string>
+	<string name="poi_genus">Gènere</string>
+	<string name="poi_taxon">Tàxon</string>
+
+	<string name="poi_trees_olive">Olia</string>
+	<string name="poi_trees_apple">Mela</string>
+	<string name="poi_trees_oil">Ògiu de palma</string>
+	<string name="poi_trees_orange">Arantzu</string>
+	<string name="poi_trees_almond">Mèndula</string>
+	<string name="poi_trees_banana">Bananu</string>
+	<string name="poi_trees_hazel">Nutzola</string>
+	<string name="poi_trees_coconut">Nughe de coco</string>
+	<string name="poi_trees_persimmon">Cachi</string>
+	<string name="poi_trees_cherry">Cariasa</string>
+	<string name="poi_trees_walnut">Nughe</string>
+	<string name="poi_trees_plum">Pruna</string>
+	<string name="poi_trees_peach">Pèssighe</string>
+	<string name="poi_trees_tea">Te</string>
+	<string name="poi_trees_coca">Coca</string>
+	<string name="poi_trees_kiwi">Kiwi</string>
+	<string name="poi_trees_meadow_orchard">Pradu cun fruttedu</string>
+	<string name="poi_trees_nectorine">Pèssighe-nughe</string>
 	</resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index fa26a46e7c..15727fdad4 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2098,4 +2098,22 @@
 <string name="shared_string_trip_recording">Registratzione biàgiu</string>
     <string name="shared_string_navigation">Nàvigu</string>
     <string name="osmand_running_in_background">Funtzionamentu in isfondu</string>
-    </resources>
+    <string name="favorite_category_add_new">Annanghe noa</string>
+    <string name="favorite_category_select">Ischerta sa categoria</string>
+    <string name="default_speed_system_descr">Issèbera s’unidade de medida de sa lestresa</string>
+    <string name="default_speed_system">Medida de sa lestresa</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Mìglios nàuticos</string>
+    <string name="si_kmh">Chilòmetros pro ora</string>
+    <string name="si_mph">Mìglios pro ora</string>
+    <string name="si_m_s">Metros pro segundu</string>
+    <string name="si_min_km">Minutos pro chilòmetru</string>
+    <string name="si_min_m">Minutos pro mìgliu</string>
+    <string name="si_nm_h">Mìglios nàuticos pro ora (knot)</string>
+    <string name="nm_h">nmh</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
+    <string name="downloading_number_of_fiels">Iscarrigande - %1$d documentu</string>
+</resources>
diff --git a/OsmAnd/res/values-tr/phrases.xml b/OsmAnd/res/values-tr/phrases.xml
index f6bfd9e2d1..3784ea4f83 100644
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@@ -1035,4 +1035,5 @@
 
 	<string name="poi_building">Bina</string>
 
-</resources>
+<string name="poi_doors">Kapılar</string>
+	</resources>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index db903fcbe0..733c08044a 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -1461,4 +1461,12 @@
 	<string name="osmo_plugin_description">"Bu eklenti OsMo adlı gelişmiş canlı izlemeyi etkinleştirir, bkz  http://osmo.mobi.\n\nBir grup içindeki bütün aygıtları gerçek zamanlı olarak izleyebilir ve birbiriyle iletişim kurabilir. Oturum izleme veya daimi izleme için çeşitli seçenekleri vardır.\n\nAnonim gruplar belirli günlerde, ve belirli özelliklerde kendiliğinden oluşturulabilir, örn. uzaktan herhangi kontrol ve yönetici olmadan. Diğer yandan, tam özellikli gruplar websitesinde oluşturulabilir ve sadece kayıtlı kullanıcılar erişebilir. "</string>
 	<string name="plugin_touringview_name">Harita gezinti görünümü</string>
 	<string name="lang_new">Newar / Nepal Bhasa</string>
+    <string name="favorite_category_add_new">Yeni Ekle</string>
+    <string name="favorite_category_select">Kategori Seç</string>
+    <string name="default_speed_system_descr">Hız ölçüm sistemini tanımlar</string>
+    <string name="default_speed_system">Hız Ölçümü</string>
+    <string name="si_nm">Deniz Mili</string>
+    <string name="si_m_s">Saniyede Metre</string>
+    <string name="si_min_km">Kilometre Başına Dakika</string>
+    <string name="si_mph">Saatte Mil</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index a39905458d..c6951082a8 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -1484,4 +1484,6 @@
 	<string name="poi_payment_routex_no">不接受 Routex 燃料卡</string>
 	<string name="poi_payment_bancomat_yes">接受 Bancomat</string>
 	<string name="poi_payment_bancomat_no">不接受 Bancomat</string>
+	<string name="poi_payment_icsf_yes">接受 IC 儲值卡</string>
+	<string name="poi_payment_icsf_no">不接受 IC 儲值卡</string>
 	</resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 420c0e0e66..c1b17dfad8 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1101,8 +1101,8 @@
 	<string name="poi_brand">Brand</string>
 	<string name="poi_fee_yes">Fee is charged</string>
 	<string name="poi_fee_no">No fee</string>
-	<string name="poi_drinking_water_yes">Drinking water</string>
-	<string name="poi_drinking_water_no">No drinking water</string>
+	<string name="poi_drinking_water_yes">Drinking water: yes</string>
+	<string name="poi_drinking_water_no">Drinking water: no</string>
 	<string name="poi_supervised_yes">Supervised</string>
 	<string name="poi_supervised_no">Without supervision</string>
 	<string name="poi_seasonal_yes">Seasonal</string>
@@ -1618,6 +1618,7 @@
 	<string name="poi_full_service_yes">Full service</string>
 	<string name="poi_brushless_yes">Brushless</string>
 	<string name="poi_brushless_no">Brushless: no</string>
+	<string name="poi_car_wash_no">Car wash: no</string>
 
 	<string name="poi_aeroway_fuel">Aircraft fuel station</string>
 	<string name="poi_public_bath">Public bath</string>
@@ -1641,4 +1642,58 @@
 	<string name="poi_diaper_no">No diaper changing table</string>
 	<string name="poi_diaper_room">Diaper changing room</string>
 
+	<string name="poi_maxstay">Parking time limit</string>
+
+	<string name="poi_vending_parking_tickets">Parking tickets</string>
+	<string name="poi_vending_cigarettes">Cigarettes</string>
+	<string name="poi_vending_excrement_bags">Excrement bags</string>
+	<string name="poi_vending_public_transport_tickets">Public transport tickets</string>
+	<string name="poi_vending_drinks">Drinks</string>
+	<string name="poi_vending_sweets">Sweets</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Parcel pickup and mail in</string>
+	<string name="poi_vending_condoms">Condoms</string>
+	<string name="poi_vending_stamps">Stamps</string>
+	<string name="poi_vending_bicycle_tube">Bicycle tubes</string>
+	<string name="poi_vending_food">Food</string>
+	<string name="poi_vending_drinks_food">Drinks and food</string>
+	<string name="poi_vending_fuel">Fuel vending</string>
+	<string name="poi_vending_parcel_pickup">Parcel pickup</string>
+	<string name="poi_vending_parcel_mail_in">Parcel mail-in</string>
+	<string name="poi_vending_milk">Milk</string>
+	<string name="poi_vending_elongated_coin">Elongated coin</string>
+	<string name="poi_vending_bread">Bread</string>
+	<string name="poi_vending_chewing_gums">Chewing gums</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Parking tickets; public transport tickets</string>
+	<string name="poi_vending_coffee">Coffee</string>
+	<string name="poi_vending_toll">Toll vending</string>
+	<string name="poi_vending_tickets">Tickets vending</string>
+	<string name="poi_vending_water">Water vending</string>
+	<string name="poi_vending_telephone_vouchers">Telephone vouchers</string>
+	<string name="poi_vending_animal_food">Animal food</string>
+	<string name="poi_vending_public_transport_plans">Public transport plans</string>
+	<string name="poi_vending_drinks_sweets">Drinks and sweets</string>
+	<string name="poi_vending_vouchers">Vouchers</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Candles</string>
+	<string name="poi_vending_toys">Toys</string>
+	<string name="poi_vending_ice_cream">Ice cream</string>
+	<string name="poi_vending_sim_cards">SIM-cards</string>
+
+	<string name="poi_branch">Branch</string>
+
+	<string name="poi_memorial_war">War memorial</string>
+	<string name="poi_memorial_plaque">Plaque</string>
+	<string name="poi_memorial_statue">Statue</string>
+	<string name="poi_memorial_stone">Stone</string>
+	<string name="poi_memorial_stele">Stele</string>
+	<string name="poi_memorial_bust">Bust</string>
+	<string name="poi_memorial_koshinto">Koshinto</string>
+	<string name="poi_memorial_blue_plaque">Blue plaque</string>
+	<string name="poi_memorial_jizo">Jizo</string>
+	<string name="poi_memorial_cross">Cross</string>
+	<string name="poi_memorial_vehicle">Vehicle</string>
+	<string name="poi_memorial_obelisk">Obelisk</string>
+
+	<string name="poi_inscription">Inscription</string>
+
 </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 295ad10e00..0aa23929ff 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1996,4 +1996,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="unsaved_changes_will_be_lost">Any unsaved changes will be lost. Continue?</string>
 	<string name="downloads_left_template">%1$s downloads left</string>
 	<string name="roads">Roads</string>
+    <string name="downloading_number_of_fiels">Downloding - %1$d file</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 8dd9aa20e8..887d721155 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -78,6 +78,8 @@ public class DownloadActivity extends BaseDownloadActivity {
 	private List<DownloadActivityType> downloadTypes = new ArrayList<DownloadActivityType>();
 	private List<IndexItemCategoryWithSubcat> cats;
 
+	private OnProgressUpdateListener onProgressUpdateListener;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -255,6 +257,17 @@ public class DownloadActivity extends BaseDownloadActivity {
 	@Override
 	public void updateProgress(boolean updateOnlyProgress) {
 		BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
+		final boolean isFinished = basicProgressAsyncTask == null
+				|| basicProgressAsyncTask.getStatus() == AsyncTask.Status.FINISHED;
+		if (onProgressUpdateListener != null) {
+			if (isFinished) {
+				onProgressUpdateListener.onFinished();
+			} else {
+				onProgressUpdateListener.onProgressUpdate(
+						basicProgressAsyncTask.getProgressPercentage(),
+						downloadListIndexThread.getDownloads());
+			}
+		}
 		//needed when rotation is performed and progress can be null
 		if (progressView == null) {
 			return;
@@ -265,9 +278,8 @@ public class DownloadActivity extends BaseDownloadActivity {
 				determinateProgressBar.setProgress(basicProgressAsyncTask.getProgressPercentage());
 			}
 		} else {
-			boolean visible = basicProgressAsyncTask != null && basicProgressAsyncTask.getStatus() != AsyncTask.Status.FINISHED;
-			progressView.setVisibility(visible ? View.VISIBLE : View.GONE);
-			if (visible) {
+			progressView.setVisibility(!isFinished ? View.VISIBLE : View.GONE);
+			if (!isFinished) {
 				boolean indeterminate = basicProgressAsyncTask.isIndeterminate();
 				indeterminateProgressBar.setVisibility(!indeterminate ? View.GONE : View.VISIBLE);
 				determinateProgressBar.setVisibility(indeterminate ? View.GONE : View.VISIBLE);
@@ -613,5 +625,18 @@ public class DownloadActivity extends BaseDownloadActivity {
 		}
 	}
 
+	public void setOnProgressUpdateListener(OnProgressUpdateListener onProgressUpdateListener) {
+		this.onProgressUpdateListener = onProgressUpdateListener;
+		BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
+		final boolean isFinished = basicProgressAsyncTask == null
+				|| basicProgressAsyncTask.getStatus() == AsyncTask.Status.FINISHED;
+		if (isFinished) {
+			this.onProgressUpdateListener.onFinished();
+		}
+	}
 
+	public interface OnProgressUpdateListener {
+		void onProgressUpdate(int progressPercentage, int activeTasks);
+		void onFinished();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
index 0802692936..dec73d6306 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
@@ -214,8 +214,6 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-
-
 	@Override
 	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
 		final IndexItem e = listAdapter.getChild(groupPosition, childPosition);
diff --git a/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java b/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java
index db6cc0d5f4..164365776a 100644
--- a/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java
@@ -23,7 +23,11 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.WorldRegion;
 import net.osmand.plus.download.DownloadActivity;
+<<<<<<< HEAD:OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java
 import net.osmand.plus.download.newimplementation.MapsInCategoryFragment;
+=======
+import net.osmand.plus.download.newimplementation.DownloadsUiInitHelper;
+>>>>>>> 380dcbe6d79e0f54421d0b67ce3688dfe910e78e:OsmAnd/src/net/osmand/plus/download/items/DownloadItemsFragment.java
 
 import org.apache.commons.logging.Log;
 
@@ -92,6 +96,9 @@ public class WorldItemsFragment extends Fragment {
 
 		onCategorizationFinished();
 
+		DownloadsUiInitHelper.initFreeVersionBanner(view,
+				getMyApplication().getSettings(), getResources());
+
 		return view;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java.orig b/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java.orig
new file mode 100644
index 0000000000..164365776a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java.orig
@@ -0,0 +1,284 @@
+package net.osmand.plus.download.items;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.MenuItemCompat;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import net.osmand.PlatformUtil;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.WorldRegion;
+import net.osmand.plus.download.DownloadActivity;
+<<<<<<< HEAD:OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java
+import net.osmand.plus.download.newimplementation.MapsInCategoryFragment;
+=======
+import net.osmand.plus.download.newimplementation.DownloadsUiInitHelper;
+>>>>>>> 380dcbe6d79e0f54421d0b67ce3688dfe910e78e:OsmAnd/src/net/osmand/plus/download/items/DownloadItemsFragment.java
+
+import org.apache.commons.logging.Log;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+
+public class WorldItemsFragment extends Fragment {
+	public static final String TAG = "WorldItemsFragment";
+	private static final Log LOG = PlatformUtil.getLog(WorldItemsFragment.class);
+	private static final MessageFormat formatGb = new MessageFormat("{0, number,<b>#.##</b>} GB", Locale.US);
+
+	public static final int RELOAD_ID = 0;
+
+	private ItemsListBuilder builder;
+	private WorldRegionsAdapter worldRegionsAdapter;
+	private WorldMapsAdapter worldMapsAdapter;
+	private VoicePromtsAdapter voicePromtsAdapter;
+
+	private TextView worldRegionsTextView;
+	private ListView worldRegionsListView;
+	private TextView worldMapsTextView;
+	private ListView worldMapsListView;
+	private TextView voicePromtsTextView;
+	private ListView voicePromtsListView;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setHasOptionsMenu(true);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.download_index_fragment, container, false);
+
+		builder = new ItemsListBuilder(getMyApplication(), getMyApplication().getWorldRegion());
+
+		worldRegionsTextView = (TextView) view.findViewById(R.id.list_world_regions_title);
+		worldRegionsTextView.setText("World regions".toUpperCase());
+		worldRegionsListView = (ListView) view.findViewById(R.id.list_world_regions);
+		worldRegionsAdapter = new WorldRegionsAdapter(getActivity(), getMyApplication());
+		worldRegionsListView.setAdapter(worldRegionsAdapter);
+		worldRegionsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				WorldRegion region = worldRegionsAdapter.getItem(position);
+
+				FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
+				fragmentTransaction.addToBackStack(null);
+				LocalDialogFragment.createInstance(region)
+						.show(fragmentTransaction, MapsInCategoryFragment.TAG);
+			}
+		});
+
+		worldMapsTextView = (TextView) view.findViewById(R.id.list_world_maps_title);
+		worldMapsTextView.setText("World maps".toUpperCase());
+		worldMapsListView = (ListView) view.findViewById(R.id.list_world_maps);
+		worldMapsAdapter = new WorldMapsAdapter(getActivity());
+		worldMapsListView.setAdapter(worldMapsAdapter);
+
+		voicePromtsTextView = (TextView) view.findViewById(R.id.list_voice_promts_title);
+		voicePromtsTextView.setText("Voice promts".toUpperCase());
+		voicePromtsListView = (ListView) view.findViewById(R.id.list_voice_promts);
+		voicePromtsAdapter = new VoicePromtsAdapter(getActivity(), getMyApplication());
+		voicePromtsListView.setAdapter(voicePromtsAdapter);
+
+		onCategorizationFinished();
+
+		DownloadsUiInitHelper.initFreeVersionBanner(view,
+				getMyApplication().getSettings(), getResources());
+
+		return view;
+	}
+
+	public static void setListViewHeightBasedOnChildren(ListView listView) {
+		ListAdapter listAdapter = listView.getAdapter();
+		if (listAdapter == null) {
+			// pre-condition
+			return;
+		}
+
+		int totalHeight = 0;
+		for (int i = 0; i < listAdapter.getCount(); i++) {
+			View listItem = listAdapter.getView(i, null, listView);
+			listItem.measure(0, 0);
+			totalHeight += listItem.getMeasuredHeight();
+		}
+
+		ViewGroup.LayoutParams params = listView.getLayoutParams();
+		params.height = totalHeight + (listView.getDividerHeight() * (listAdapter.getCount() - 1));
+		listView.setLayoutParams(params);
+		listView.requestLayout();
+	}
+
+	public OsmandApplication getMyApplication() {
+		return (OsmandApplication)getActivity().getApplication();
+	}
+
+	private void fillWorldRegionsAdapter() {
+		if (worldRegionsAdapter != null) {
+			worldRegionsAdapter.clear();
+			worldRegionsAdapter.addAll(builder.getRegionsFromAllItems());
+			updateVisibility(worldRegionsAdapter, worldRegionsTextView, worldRegionsListView);
+		}
+	}
+
+	private void fillWorldMapsAdapter() {
+		if (worldMapsAdapter != null) {
+			worldMapsAdapter.clear();
+			worldMapsAdapter.addAll(builder.getRegionMapItems());
+			updateVisibility(worldMapsAdapter, worldMapsTextView, worldMapsListView);
+		}
+	}
+
+	private void fillVoicePromtsAdapter() {
+		if (voicePromtsAdapter != null) {
+			voicePromtsAdapter.clear();
+			//voicePromtsAdapter.addAll(cats);
+			updateVisibility(voicePromtsAdapter, voicePromtsTextView, voicePromtsListView);
+		}
+	}
+
+	private void updateVisibility(ArrayAdapter adapter, TextView textView, ListView listView) {
+		if (adapter.isEmpty()) {
+			textView.setVisibility(View.GONE);
+			listView.setVisibility(View.GONE);
+		} else {
+			textView.setVisibility(View.VISIBLE);
+			listView.setVisibility(View.VISIBLE);
+			setListViewHeightBasedOnChildren(listView);
+		}
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		MenuItem item = menu.add(0, RELOAD_ID, 0, R.string.shared_string_refresh);
+		item.setIcon(R.drawable.ic_action_refresh_dark);
+		MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == RELOAD_ID) {
+			// re-create the thread
+			DownloadActivity.downloadListIndexThread.runReloadIndexFiles();
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	private DownloadActivity getDownloadActivity() {
+		return (DownloadActivity) getActivity();
+	}
+
+	public void onCategorizationFinished() {
+		if (builder.build()) {
+			fillWorldRegionsAdapter();
+			fillWorldMapsAdapter();
+			fillVoicePromtsAdapter();
+		}
+	}
+
+	private static class WorldRegionsAdapter extends ArrayAdapter<WorldRegion> {
+		private final OsmandApplication osmandApplication;
+
+		public WorldRegionsAdapter(Context context, OsmandApplication osmandApplication) {
+			super(context, R.layout.simple_list_menu_item);
+			this.osmandApplication = osmandApplication;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			ViewHolder viewHolder;
+			if (convertView == null) {
+				convertView = LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.simple_list_menu_item, parent, false);
+				viewHolder = new ViewHolder();
+				viewHolder.textView = (TextView) convertView.findViewById(R.id.title);
+				convertView.setTag(viewHolder);
+			} else {
+				viewHolder = (ViewHolder) convertView.getTag();
+			}
+			Drawable iconLeft = osmandApplication.getIconsCache()
+					.getContentIcon(R.drawable.ic_world_globe_dark);
+			viewHolder.textView.setCompoundDrawablesWithIntrinsicBounds(iconLeft, null, null, null);
+			viewHolder.textView.setText(getItem(position).getName());
+			return convertView;
+		}
+
+		private static class ViewHolder {
+			TextView textView;
+		}
+	}
+
+	private static class WorldMapsAdapter extends ArrayAdapter<ItemsListBuilder.ResourceItem> {
+
+		public WorldMapsAdapter(Context context) {
+			super(context, R.layout.simple_list_menu_item);
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			ItemViewHolder viewHolder;
+			if (convertView == null) {
+				convertView = LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.two_line_with_images_list_item, parent, false);
+				viewHolder = new ItemViewHolder(convertView);
+				convertView.setTag(viewHolder);
+			} else {
+				viewHolder = (ItemViewHolder) convertView.getTag();
+			}
+			ItemsListBuilder.ResourceItem item = getItem(position);
+			viewHolder.bindIndexItem(item.getIndexItem(), (DownloadActivity) getContext(), false, false);
+			return convertView;
+		}
+
+		private static class ViewHolder {
+			TextView textView;
+		}
+	}
+
+	private static class VoicePromtsAdapter extends ArrayAdapter {
+		private final OsmandApplication osmandApplication;
+
+		public VoicePromtsAdapter(Context context, OsmandApplication osmandApplication) {
+			super(context, R.layout.simple_list_menu_item);
+			this.osmandApplication = osmandApplication;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			ViewHolder viewHolder;
+			if (convertView == null) {
+				convertView = LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.simple_list_menu_item, parent, false);
+				viewHolder = new ViewHolder();
+				viewHolder.textView = (TextView) convertView.findViewById(R.id.title);
+				convertView.setTag(viewHolder);
+			} else {
+				viewHolder = (ViewHolder) convertView.getTag();
+			}
+			Drawable iconLeft = osmandApplication.getIconsCache()
+					.getContentIcon(R.drawable.ic_world_globe_dark);
+			viewHolder.textView.setCompoundDrawablesWithIntrinsicBounds(iconLeft, null, null, null);
+			viewHolder.textView.setText(getItem(position).toString());
+			return convertView;
+		}
+
+		private static class ViewHolder {
+			TextView textView;
+		}
+	}
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/MapsInCategoryFragment.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/MapsInCategoryFragment.java
index 4640b42505..2b193eaf2d 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/MapsInCategoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/MapsInCategoryFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.download.newimplementation;
 
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
@@ -7,12 +8,14 @@ import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.helpers.HasName;
+import net.osmand.plus.download.DownloadActivity;
 
 import org.apache.commons.logging.Log;
 
@@ -20,6 +23,7 @@ public class MapsInCategoryFragment extends DialogFragment {
 	private static final Log LOG = PlatformUtil.getLog(IndexItemCategoryWithSubcat.class);
 	public static final String TAG = "MapsInCategoryFragment";
 	private static final String CATEGORY = "category";
+	private MapDownloadListener mProgressListener;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -33,7 +37,7 @@ public class MapsInCategoryFragment extends DialogFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 							 Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.maps_in_category_fragment, container, false);
+		final View view = inflater.inflate(R.layout.maps_in_category_fragment, container, false);
 
 		IndexItemCategoryWithSubcat category = getArguments().getParcelable(CATEGORY);
 		assert category != null;
@@ -51,9 +55,41 @@ public class MapsInCategoryFragment extends DialogFragment {
 			}
 		});
 
+		DownloadsUiInitHelper.initFreeVersionBanner(view,
+				getMyActivity().getMyApplication().getSettings(), getResources());
+		mProgressListener = new MapDownloadListener(view, getResources()){
+			@Override
+			public void onFinished() {
+				super.onFinished();
+				DownloadsUiInitHelper.initFreeVersionBanner(view,
+						getMyActivity().getMyApplication().getSettings(), getResources());
+			}
+		};
+		view.findViewById(R.id.downloadProgressLayout).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+
+			}
+		});
 		return view;
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		getMyActivity().setOnProgressUpdateListener(mProgressListener);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		getMyActivity().setOnProgressUpdateListener(null);
+	}
+
+	private DownloadActivity getMyActivity() {
+		return (DownloadActivity) getActivity();
+	}
+
 	public void onCategorySelected(@NonNull IndexItemCategoryWithSubcat category) {
 		LOG.debug("onCategorySelected()");
 		createInstance(category).show(getChildFragmentManager(), TAG);
@@ -68,16 +104,39 @@ public class MapsInCategoryFragment extends DialogFragment {
 		return fragment;
 	}
 
-	public static class Divider implements HasName {
-		private final String text;
+	private static class MapDownloadListener implements DownloadActivity.OnProgressUpdateListener {
+		private final View freeVersionBanner;
+		private final View downloadProgressLayout;
+		private final ProgressBar progressBar;
+		private final TextView leftTextView;
+		private final TextView rightTextView;
+		private final Resources resources;
 
-		public Divider(String text) {
-			this.text = text;
+		MapDownloadListener(View view, Resources resources) {
+			this.resources = resources;
+			freeVersionBanner = view.findViewById(R.id.freeVersionBanner);
+			downloadProgressLayout = view.findViewById(R.id.downloadProgressLayout);
+			progressBar = (ProgressBar) view.findViewById(R.id.progressBar);
+			leftTextView = (TextView) view.findViewById(R.id.leftTextView);
+			rightTextView = (TextView) view.findViewById(R.id.rightTextView);
+		}
+		@Override
+		public void onProgressUpdate(int progressPercentage, int activeTasks) {
+			if (freeVersionBanner.getVisibility() == View.VISIBLE) {
+				freeVersionBanner.setVisibility(View.GONE);
+				downloadProgressLayout.setVisibility(View.VISIBLE);
+			}
+			progressBar.setProgress(progressPercentage);
+			final String format = resources.getString(R.string.downloading_number_of_fiels);
+			String numberOfTasks = String.format(format, activeTasks);
+			leftTextView.setText(numberOfTasks);
+			rightTextView.setText(progressPercentage + "%");
 		}
 
 		@Override
-		public String getName() {
-			return text;
+		public void onFinished() {
+			freeVersionBanner.setVisibility(View.VISIBLE);
+			downloadProgressLayout.setVisibility(View.GONE);
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
index 3ffdf5ae58..40f099481c 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
@@ -78,7 +78,7 @@ public class NewLocalIndexesFragment extends OsmAndListFragment {
 	}
 
 	private void initMemoryConsumedCard(View header) {
-		ProgressBar sizeProgress = (ProgressBar) header.findViewById(R.id.memory_progress);
+		ProgressBar sizeProgress = (ProgressBar) header.findViewById(R.id.progressBar);
 		File dir = getMyApplication().getAppPath("").getParentFile();
 		String size = formatGb.format(new Object[]{0});
 		int percent = 0;
@@ -92,9 +92,11 @@ public class NewLocalIndexesFragment extends OsmAndListFragment {
 		sizeProgress.setProgress(percent);
 		String text = getString(R.string.free, size);
 
-		TextView descriptionText = (TextView) header.findViewById(R.id.memory_size);
+		TextView descriptionText = (TextView) header.findViewById(R.id.rightTextView);
 		descriptionText.setText(Html.fromHtml(text));
 		descriptionText.setMovementMethod(LinkMovementMethod.getInstance());
+
+		((TextView) header.findViewById(R.id.leftTextView)).setText(R.string.device_memory);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
index cb36323689..fcdd1ca970 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
@@ -18,7 +18,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.download.BaseDownloadActivity;
 import net.osmand.plus.download.DownloadActivity;
@@ -43,14 +42,10 @@ public class SubcategoriesFragment extends Fragment {
 		mAdapter.addAll(category.items);
 		mAdapter.addAll(category.subcats);
 
-		View freeVersionBanner = inflater.inflate(R.layout.free_version_banner, listView, false);
-		final OsmandSettings settings = application.getSettings();
-		DownloadsUiInitHelper.initFreeVersionBanner(freeVersionBanner, settings, getResources());
-		listView.addHeaderView(freeVersionBanner);
 		listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				final HasName item = mAdapter.getItem(position - 1);
+				final HasName item = mAdapter.getItem(position);
 				if (item instanceof IndexItemCategoryWithSubcat) {
 					((MapsInCategoryFragment) getParentFragment())
 							.onCategorySelected((IndexItemCategoryWithSubcat) item);
@@ -139,9 +134,6 @@ public class SubcategoriesFragment extends Fragment {
 					public void onClick(View v) {
 						((BaseDownloadActivity) v.getContext())
 								.startDownload((IndexItem) v.getTag(R.id.index_item));
-						progressBar.setVisibility(View.VISIBLE);
-						rightImageButton.setImageDrawable(getContextIcon(context,
-								R.drawable.ic_action_remove_dark));
 					}
 				});
 				progressBar.setVisibility(View.GONE);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
index 14f33d89d6..a83f40831d 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
@@ -151,7 +151,6 @@ public class AdvancedDataFragment extends Fragment
 	public class TagAdapterLinearLayoutHack {
 		private final LinearLayout linearLayout;
 		private final EditPoiData editPoiData;
-		private final MapPoiTypes mapPoiTypes;
 		private final Map<String, AbstractPoiType> allTypes;
 		private final HashSet<String> tagKeys;
 		private final HashSet<String> valueKeys;
@@ -162,7 +161,6 @@ public class AdvancedDataFragment extends Fragment
 										  MapPoiTypes mapPoiTypes) {
 			this.linearLayout = linearLayout;
 			this.editPoiData = editPoiData;
-			this.mapPoiTypes = mapPoiTypes;
 			this.allTypes = mapPoiTypes.getAllTypesTranslatedNames(new StringMatcher() {
 				@Override
 				public boolean matches(String name) {
@@ -183,6 +181,9 @@ public class AdvancedDataFragment extends Fragment
 			linearLayout.removeAllViews();
 			editPoiData.setIsInEdit(true);
 			for (Entry<String, String> tag : editPoiData.getTagValues().entrySet()) {
+				if(tag.getKey().equals(EditPoiData.POI_TYPE_TAG)
+						|| tag.getKey().equals(OSMSettings.OSMTagKey.NAME.getValue()))
+					continue;
 				addTagView(tag.getKey(), tag.getValue());
 			}
 			editPoiData.setIsInEdit(false);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
index a14238a627..affa4f162c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
@@ -36,7 +36,7 @@ import net.osmand.util.OpeningHoursParser.BasicOpeningHourRule;
 import org.apache.commons.logging.Log;
 
 public class BasicDataFragment extends Fragment
-		implements EditPoiFragment.OnFragmentActivatedListener{
+		implements EditPoiFragment.OnFragmentActivatedListener {
 	private static final String TAG = "BasicDataFragment";
 	private static final Log LOG = PlatformUtil.getLog(BasicDataFragment.class);
 	private static final String OPENING_HOURS = "opening_hours";
@@ -126,29 +126,6 @@ public class BasicDataFragment extends Fragment
 		return (OsmandApplication) getActivity().getApplication();
 	}
 
-	@Override
-	public void onResume() {
-		super.onResume();
-		
-		// FIXME opening hours
-//		@Override
-//		public void process(			String openingHoursString ) {
-//					parseOpenedHoursHandleErrors(openingHoursString);
-//			if (openingHours == null) {
-//				openingHours = new OpeningHoursParser.OpeningHours();
-//			}
-//			LOG.debug("openingHours=" + openingHours);
-//			adapter.replaceOpeningHours(openingHours);
-//			adapter.updateViews();
-//		}
-//
-//		@Override
-//		public void onUntriggered() {
-//			adapter.replaceOpeningHours(new OpeningHoursParser.OpeningHours());
-//			adapter.updateViews();
-//		}
-	}
-
 	protected void addTextWatcher(final String tag, final EditText e) {
 		e.addTextChangedListener(new TextWatcher() {
 
@@ -186,7 +163,6 @@ public class BasicDataFragment extends Fragment
 	}
 
 
-
 	private EditPoiFragment getEditPoiFragment() {
 		return (EditPoiFragment) getParentFragment();
 	}
@@ -195,19 +171,6 @@ public class BasicDataFragment extends Fragment
 		return getEditPoiFragment().getEditPoiData();
 	}
 
-	private static String formatTime(int h, int t) {
-		StringBuilder b = new StringBuilder();
-		if (h < 10) {
-			b.append("0"); //$NON-NLS-1$
-		}
-		b.append(h).append(":"); //$NON-NLS-1$
-		if (t < 10) {
-			b.append("0"); //$NON-NLS-1$
-		}
-		b.append(t);
-		return b.toString();
-	}
-
 	@Override
 	public void onFragmentActivated() {
 		streetEditText.setText(getData().getTagValues()
@@ -220,6 +183,16 @@ public class BasicDataFragment extends Fragment
 				.get(OSMSettings.OSMTagKey.WEBSITE.getValue()));
 		descriptionEditText.setText(getData().getTagValues()
 				.get(OSMSettings.OSMTagKey.DESCRIPTION.getValue()));
+
+		OpeningHoursParser.OpeningHours openingHours =
+				OpeningHoursParser.parseOpenedHoursHandleErrors(getData().getTagValues()
+						.get(OSMSettings.OSMTagKey.OPENING_HOURS.getValue()));
+		if (openingHours == null) {
+			openingHours = new OpeningHoursParser.OpeningHours();
+		}
+		LOG.debug("openingHours=" + openingHours);
+		mOpeningHoursAdapter.replaceOpeningHours(openingHours);
+		mOpeningHoursAdapter.updateViews();
 	}
 
 	private class OpeningHoursAdapter {
@@ -282,10 +255,10 @@ public class BasicDataFragment extends Fragment
 				daysTextView.setText(stringBuilder.toString());
 
 				TextView openingTextView = (TextView) view.findViewById(R.id.openingTextView);
-				openingTextView.setText(Algorithms.formatDuration(rule.getStartTime() * 60));
+				openingTextView.setText(Algorithms.formatMinutesDuration(rule.getStartTime()));
 
 				TextView closingTextView = (TextView) view.findViewById(R.id.closingTextView);
-				closingTextView.setText(Algorithms.formatDuration(rule.getStartTime() * 60));
+				closingTextView.setText(Algorithms.formatMinutesDuration(rule.getEndTime()));
 				timeContainer.setVisibility(View.VISIBLE);
 
 				daysTextView.setOnClickListener(new View.OnClickListener() {