diff --git a/LICENSE b/LICENSE
index 2f27406444..69307e38c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -43,6 +43,7 @@
 
     * Map icons are taken from sjjb and some are drawn and distributed under Public Domain (except icons8)
         - https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg
+	- some icons are from http://osm-icons.org/wiki/Icons (CC-0 by Markus59, CC BY-SA 2.0)
 
     * 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/res/drawable-hdpi/ic_action_circle.png b/OsmAnd/res/drawable-hdpi/ic_action_circle.png
new file mode 100755
index 0000000000..249dc9aa71
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_circle.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_circle.png b/OsmAnd/res/drawable-mdpi/ic_action_circle.png
new file mode 100755
index 0000000000..1f06a09173
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_circle.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_circle.png b/OsmAnd/res/drawable-xhdpi/ic_action_circle.png
new file mode 100755
index 0000000000..c893f182c9
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_circle.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png b/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png
new file mode 100755
index 0000000000..d735c89563
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png differ
diff --git a/OsmAnd/res/layout/color_spinner_dropdown_item.xml b/OsmAnd/res/layout/color_spinner_dropdown_item.xml
new file mode 100644
index 0000000000..4db04cd433
--- /dev/null
+++ b/OsmAnd/res/layout/color_spinner_dropdown_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          style="?android:attr/spinnerDropDownItemStyle"
+          android:layout_width="match_parent"
+          android:layout_height="?attr/dropdownListPreferredItemHeight"
+          android:textSize="@dimen/default_list_text_size_large"
+          android:ellipsize="marquee"
+          android:singleLine="true"/>
diff --git a/OsmAnd/res/layout/color_spinner_item.xml b/OsmAnd/res/layout/color_spinner_item.xml
new file mode 100644
index 0000000000..209132683f
--- /dev/null
+++ b/OsmAnd/res/layout/color_spinner_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@android:id/text1"
+          style="?android:attr/spinnerItemStyle"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          android:layout_height="42dp"
+          android:ellipsize="marquee"
+          android:singleLine="true"
+          android:gravity="center_vertical"
+          android:textAlignment="inherit"
+          android:textSize="@dimen/default_list_text_size_large"/>
diff --git a/OsmAnd/res/layout/favorite_category_dialog_item.xml b/OsmAnd/res/layout/favorite_category_dialog_item.xml
index f8fdc8fd67..ce37f421f6 100644
--- a/OsmAnd/res/layout/favorite_category_dialog_item.xml
+++ b/OsmAnd/res/layout/favorite_category_dialog_item.xml
@@ -4,24 +4,14 @@
               android:layout_height="wrap_content"
               android:orientation="horizontal">
 
-    <LinearLayout
-        android:layout_width="44dp"
-        android:layout_height="50dp">
-
-        <ImageView
-            android:id="@+id/image_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:scaleType="center"
-            android:src="@drawable/ic_action_folder"/>
-    </LinearLayout>
-
     <Button
         android:id="@+id/button"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_transparent"
+        android:drawableLeft="@drawable/ic_action_folder"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:background="?android:selectableItemBackground"
         android:text="Restaurant"
         android:gravity="left|center_vertical"
         android:textSize="@dimen/default_list_text_size"
diff --git a/OsmAnd/res/layout/favorite_category_edit_dialog.xml b/OsmAnd/res/layout/favorite_category_edit_dialog.xml
new file mode 100644
index 0000000000..66d52a6864
--- /dev/null
+++ b/OsmAnd/res/layout/favorite_category_edit_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:paddingBottom="@dimen/dialog_content_bottom_margin"
+              android:paddingLeft="@dimen/dialog_content_margin"
+              android:paddingRight="@dimen/dialog_content_margin"
+              android:paddingTop="@dimen/dialog_content_bottom_margin">
+
+
+    <EditText
+        android:id="@+id/edit_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:hint="@string/favorite_category_name"/>
+
+    <Spinner
+        android:id="@+id/edit_color"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </Spinner>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 2534ea8777..3e057a57bf 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2138,4 +2138,8 @@
     <string name="region_maps">Рэгіянальныя мапы</string>
     <string name="world_maps">Сусьветныя мапы</string>
     <string name="world_regions">Рэгіёны сьвету</string>
+    <string name="downloads">Сьцягваньні</string>
+<string name="favorite_category_name">Назва катэгорыі</string>
+    <string name="favorite_category_add_new_title">Дадаць новую катэгорыю</string>
+    <string name="favorite_category_dublicate_message">Катэгорыя з пазначанай назвай ужо існуе. Калі ласка, падайце іншую назву.</string>
     </resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index bb2b5322c4..9b1bf33d26 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -1321,7 +1321,7 @@
 	<string name="poi_bridge_movable_drawbridge">Tipus de pont mòbil: llevadís</string>
 	<string name="poi_bridge_movable_submersible">Tipus de pont mòbil: sumergible</string>
 	<string name="poi_bridge_movable_transporter">Tipus de pont mòbil: transbordador</string>
-	<string name="poi_bridge_pedestrian">Passarel·la de vianants</string>
+	<string name="poi_bridge_pedestrian">Pont de vianants</string>
 	<string name="poi_bridge_bicycle">Pont per bicicletes</string>
 	<string name="poi_bridge_railway">Pont ferroviari</string>
 	<string name="poi_surface_ice">Superfície: gel</string>
@@ -1346,4 +1346,17 @@
 	<string name="poi_surface_grass">Superfície: gespa</string>
 	<string name="poi_surface_grass_paver">Superfície: pavimentació permeable</string>
 	<string name="poi_surface_ground">Superfície: terra</string>
+	<string name="poi_surface_dirt">Superfície: terra batuda</string>
+	<string name="poi_surface_mud">Superfície: fang</string>
+	<string name="poi_lit_yes">Il·luminat: Sí</string>
+	<string name="poi_lit_no">Il·luminat: no</string>
+
+	<string name="poi_architecture_renaissance">Arquitectura: renaixement</string>
+	<string name="poi_architecture_romanesque">Arquitectura: romànic</string>
+
+	<string name="poi_tunnel_waterway">Tunel d\'aqüeducte</string>
+	<string name="poi_tunnel_car">Túnel de carretera</string>
+	<string name="poi_tunnel_pedestrian">Túnel per vianants</string>
+	<string name="poi_bridge_car">Pont de carretera</string>
+	<string name="poi_bridge_waterway">Pont fluvial</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index bc803064e9..ca20574a05 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2168,4 +2168,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="downloads">Baixades</string>
 <string name="activate_seamarks_plugin">Activeu el connector de cartes marines</string>
     <string name="activate_srtm_plugin">Activeu el connector de corbes de nivell</string>
+    <string name="favorite_category_dublicate_message">El nom de categoria especificat ja existeix. Definiu un altre nom.</string>
+    <string name="favorite_category_name">Nom de categoria</string>
+    <string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
     </resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 9cfd99c0ef..6ef3452edb 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -968,10 +968,10 @@
 	<string name="poi_fax">Fax</string>
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_mobile">Mobiltelefon</string>
-	<string name="poi_animal_shelter_dog">Hundenternat</string>
-	<string name="poi_animal_shelter_cat">Katteinternat</string>
-	<string name="poi_animal_shelter_dog_cat">Hunde- og katteinternat</string>
-	<string name="poi_animal_shelter_bird">Fugleinternat</string>
+	<string name="poi_animal_shelter_dog">Internat: hund</string>
+	<string name="poi_animal_shelter_cat">Internat: kat</string>
+	<string name="poi_animal_shelter_dog_cat">"Internat: hund,  kat"</string>
+	<string name="poi_animal_shelter_bird">Internat: fugl</string>
 
 <string name="poi_shower">Bruser</string>
 	<string name="poi_recycling_centre">Type: genbrugsplads</string>
@@ -1903,7 +1903,7 @@
 	<string name="poi_bridge_structure_floating">Brokonstruktion: pontonbro</string>
 	<string name="poi_bridge_structure_humpback">Brokonstruktion: humpback</string>
 	<string name="poi_bridge_structure_cable_stayed">Brokonstruktion: skråstagsbro</string>
-	<string name="poi_bridge_structure_boardwalk">Brokonstruktion: mole</string>
+	<string name="poi_bridge_structure_boardwalk">Brokonstruktion: havnepromenade</string>
 	<string name="poi_bridge_structure_simple_wooden">Brokonstruktion: simpel træbro</string>
 	<string name="poi_bridge_structure_viaduct">Brokonstruktion: viadukt</string>
 	<string name="poi_bridge_structure_aqueduct">Brokonstruktion: akvædukt</string>
@@ -1944,4 +1944,104 @@
 	<string name="poi_surface_salt">Overflade: salt</string>
 	<string name="poi_surface_snow">Overflade: sne</string>
 
+<string name="poi_route_bus_ref">Bus</string>
+	<string name="poi_route_share_taxi_ref">Deletaxi</string>
+	<string name="poi_route_trolleybus_ref">Trolleybus</string>
+	<string name="poi_route_tram_ref">Sporvogn</string>
+	<string name="poi_route_train_ref">Tog</string>
+	<string name="poi_route_light_rail_ref">Letbane</string>
+	<string name="poi_route_monorail_ref">Monorail</string>
+	<string name="poi_route_funicular_ref">Kabelbane</string>
+	<string name="poi_route_ferry_ref">Færge</string>
+
+	<string name="poi_route_railway_ref">Jernbanerute</string>
+
+<string name="poi_historic_yes">Historisk objekt</string>
+	<string name="poi_surveillance_yes">Overvågning: ja</string>
+	<string name="poi_shop_yes">Med butik</string>
+
+	<string name="poi_service_bicycle_retail_yes">Cykelsalg: ja</string>
+	<string name="poi_service_bicycle_retail_no">Cykelsalg: nej</string>
+	<string name="poi_service_bicycle_repair_yes">Cykelreparation: ja</string>
+	<string name="poi_service_bicycle_repair_no">Cykelreparation: nej</string>
+	<string name="poi_service_bicycle_rental_yes">Cykeludlejning: ja</string>
+	<string name="poi_service_bicycle_rental_no">Cykeludlejning: nej</string>
+	<string name="poi_service_bicycle_pump_yes">Cykelpumpe: ja</string>
+	<string name="poi_service_bicycle_pump_no">Cykelpumpe: nej</string>
+	<string name="poi_service_bicycle_diy_yes">Cykelværktøj til gør det selv reparation: ja</string>
+	<string name="poi_service_bicycle_diy_no">Cykelværktøj til gør det selv reparation: nej</string>
+	<string name="poi_service_bicycle_cleaning_yes">Cykelrengøring: ja</string>
+	<string name="poi_service_bicycle_cleaning_no">Cykelrengøring: nej</string>
+	<string name="poi_service_bicycle_chaintool_yes">Cykel kædeværktøj: ja</string>
+	<string name="poi_service_bicycle_chaintool_no">Cykel kædeværktøj: nej</string>
+	<string name="poi_service_bicycle_second_hand_yes">Salg af brugte cykler: ja</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>
+	<string name="poi_training_music">Uddannelse: musik</string>
+	<string name="poi_training_dance">Uddannelse: dans</string>
+	<string name="poi_training_sport">Uddannelse: sport</string>
+	<string name="poi_training_art">Uddannelse: kunst</string>
+	<string name="poi_training_cooking">Uddannelse: madlavning</string>
+	<string name="poi_training_computer">Uddannelse: computer</string>
+	<string name="poi_training_yoga">Uddannelse: yoga</string>
+	<string name="poi_training_martial_art">Uddannelse: kampsport</string>
+	<string name="poi_training_aviation">Uddannelse: luftfart</string>
+	<string name="poi_training_hairdressing">Uddannelse: frisør</string>
+
+<string name="poi_memorial_stolperstein">Snublesten</string>
+	<string name="poi_memorial_column">Søjle</string>
+	<string name="poi_memorial_stupa">Stupa</string>
+	<string name="poi_memorial_prasat">Prasat</string>
+
+	<string name="poi_monument_yes">Monumental objekt</string>
+
+<string name="poi_animal_shelter">Dyreinternat</string>
+	<string name="poi_industrial_factory">Type: fabrik</string>
+	<string name="poi_industrial_gas">Type: gasindustrien</string>
+	<string name="poi_industrial_timber">Type: tømmer</string>
+	<string name="poi_industrial_refinery">Type: raffinaderi</string>
+	<string name="poi_industrial_warehouse">Type: lager</string>
+	<string name="poi_industrial_auto_wrecker">Type: autoophug</string>
+	<string name="poi_industrial_agriculture">Type: landbrug</string>
+	<string name="poi_industrial_brewery">Type: bryggeri</string>
+	<string name="poi_industrial_brickyard">Type: teglværk</string>
+	<string name="poi_industrial_intermodal_freight_terminal">Type: intermodal godstransport</string>
+	<string name="poi_industrial_sawmill">Type: savværk</string>
+	<string name="poi_industrial_water_purification">Type: vandrensning</string>
+	<string name="poi_industrial_port">Type: havn</string>
+	<string name="poi_industrial_depot">Type: depot</string>
+
+	<string name="poi_note">Bemærk</string>
+	<string name="poi_watering_place">Vandingssted</string>
+	<string name="poi_animal_boarding">opstaldning</string>
+	<string name="poi_animal_boarding_dog">Opstaldning: hund</string>
+	<string name="poi_animal_boarding_cat">Opstaldning: kat</string>
+	<string name="poi_animal_boarding_dog_cat">Opstaldning: hund, kat</string>
+	<string name="poi_animal_boarding_horse">Opstaldning: hest</string>
+
+	<string name="poi_historic_aircraft">Historisk fly</string>
+
+	<string name="poi_honey">Honningbutik</string>
+
+	<string name="poi_elevator_yes">Med elevator</string>
+	<string name="poi_elevator_no">Uden elevator</string>
+
+	<string name="poi_technical_monument">Teknisk monument</string>
+
+<string name="poi_industrial_oil">Type: olieindustri</string>
+	<string name="poi_industrial_wellsite">Type: borested</string>
+	<string name="poi_office_camping">campingpladskontor</string>
+	<string name="poi_model_aerodrome">Model flyveplads</string>
+	<string name="poi_guide">Guide kontor</string>
+	<string name="poi_quango">Quango</string>
+	<string name="poi_consulting">Rådgivning kontor</string>
+	<string name="poi_cooperative">Kooperativ kontor</string>
+	<string name="poi_office_forestry">Skovbrug kontor</string>
+	<string name="poi_logistics">Logistik kontor</string>
+	<string name="poi_parish">Sognekontor</string>
+	<string name="poi_publisher">forlag kontor</string>
+
 </resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index c697297e3a..d616ec827f 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2177,4 +2177,7 @@
     <string name="world_maps">Verdenskort</string>
     <string name="world_regions">Regioner i verden</string>
     <string name="downloads">Filhentninger</string>
-</resources>
+<string name="favorite_category_dublicate_message">Kategorinavnet findes allerede. Angiv et andet navn.</string>
+    <string name="favorite_category_name">Kategorinavn</string>
+    <string name="favorite_category_add_new_title">Tilføj ny kategori</string>
+    </resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index df78957506..f27819410f 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -952,8 +952,8 @@
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_mobile">Celular</string>
 	<string name="poi_animal_shelter_dog">Refugio canino</string>
-	<string name="poi_animal_shelter_cat">Refugio para gatos</string>
-	<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
+	<string name="poi_animal_shelter_cat">Refugio gatuno</string>
+	<string name="poi_animal_shelter_dog_cat">Refugio canino y gatuno</string>
 	<string name="poi_animal_shelter_bird">Refugio para aves</string>
 
 <string name="poi_recycling_centre">Tipo: Centro de reciclaje</string>
@@ -1572,7 +1572,7 @@
 	<string name="poi_payment_golden_crown_no">No acepta tarjetas Golden Crown</string>
 	<string name="poi_payment_mtsmoney_yes">Acepta MTS-Money</string>
 	<string name="poi_payment_mtsmoney_no">No acepta MTS-Money</string>
-	<string name="poi_events_venue">Lugar de eventos</string>
+	<string name="poi_events_venue">Salón de eventos</string>
 
 	<string name="poi_diet_vegetarian_only">Sólo dieta vegetariana</string>
 	<string name="poi_diet_vegetarian_yes">Dieta vegetariana</string>
@@ -1608,9 +1608,9 @@
 	<string name="poi_takeaway_no">Sin servicio de comida para llevar</string>
 	<string name="poi_takeaway_only">Sólo servicio de comida para llevar</string>
 
-	<string name="poi_delivery_no">Sin delivery</string>
-	<string name="poi_delivery_yes">Con delivery</string>
-	<string name="poi_delivery_only">Sólo delivery</string>
+	<string name="poi_delivery_no">Sin servicio a domicilio</string>
+	<string name="poi_delivery_yes">Con servicio a domicilio</string>
+	<string name="poi_delivery_only">Sólo servicio a domicilio</string>
 
 	<string name="poi_outdoor_seating_yes">Con asientos exteriores</string>
 	<string name="poi_outdoor_seating_no">Sin asientos exteriores</string>
@@ -1732,7 +1732,7 @@
 	<string name="poi_resource_coal">Carbón</string>
 	<string name="poi_resource_copper">Cobre</string>
 	<string name="poi_resource_diamond">Diamante</string>
-	<string name="poi_resource_dimension_stone">Piedra de dimensión</string>
+	<string name="poi_resource_dimension_stone">Piedras grandes</string>
 	<string name="poi_resource_dolomite">Dolomita</string>
 	<string name="poi_resource_gas">Gas</string>
 	<string name="poi_resource_gold">Oro</string>
@@ -1783,7 +1783,7 @@
 	<string name="poi_wetland_mud">Lodazal</string>
 
 	<string name="poi_beach_sand">Playa arenosa</string>
-	<string name="poi_beach_shingle">Playa con guijarro</string>
+	<string name="poi_beach_shingle">Playa rocosa</string>
 	<string name="poi_beach_rocky">Playa rocosa</string>
 
 	<string name="poi_chimney">Chimenea</string>
@@ -1846,7 +1846,7 @@
 	<string name="poi_architecture_new_objectivity">Arquitectura: nueva objetividad</string>
 	<string name="poi_architecture_contemporary">Arquitectura contemporánea</string>
 	<string name="poi_architecture_constructivism">Arquitectura constructivista</string>
-	<string name="poi_architecture_umgebinde">Arquitectura: umgebinde</string>
+	<string name="poi_architecture_umgebinde">Arquitectura alemana</string>
 	<string name="poi_architecture_timber_frame">Arquitectura de madera</string>
 	<string name="poi_architecture_art_nouveau">Arquitectura: arte nuevo</string>
 	<string name="poi_architecture_neoclassicism">Arquitectura neoclasista</string>
@@ -1892,4 +1892,121 @@
 	<string name="poi_bridge_movable_transporter">Tipo de puente móvil: transportador</string>
 	<string name="poi_bridge_movable_retractable">Tipo de puente móvil: retráctil</string>
 
-</resources>
+<string name="poi_lit_yes">Iluminado</string>
+	<string name="poi_lit_no">No iluminado</string>
+
+	<string name="poi_surface_unpaved">Superficie: sin pavimento</string>
+	<string name="poi_surface_paved">Superficie: pavimentado</string>
+	<string name="poi_surface_asphalt">Superficie: asfaltado</string>
+	<string name="poi_surface_concrete">Superficie: hormigón</string>
+	<string name="poi_surface_sett">Superficie: intertrabado</string>
+	<string name="poi_surface_cobblestone">Superficie: empedrado</string>
+	<string name="poi_surface_paving_stones">Superficie: adoquín prefabricado</string>
+	<string name="poi_surface_pebblestone">Superficie: empedrado</string>
+	<string name="poi_surface_stone">Superficie: piedras</string>
+	<string name="poi_surface_metal">Superficie: metalizado</string>
+	<string name="poi_surface_wood">Superficie: madera</string>
+	<string name="poi_surface_gravel">Superficie: ripio</string>
+	<string name="poi_surface_fine_gravel">Superficie: ripio fino</string>
+	<string name="poi_surface_compacted">Superficie: compactado</string>
+	<string name="poi_surface_sand">Superficie: arenoso</string>
+	<string name="poi_surface_grass">Superficie: césped</string>
+	<string name="poi_surface_grass_paver">Superficie: césped pavimentado</string>
+	<string name="poi_surface_ground">Superficie: tierra</string>
+	<string name="poi_surface_dirt">Superficie: lodoso</string>
+	<string name="poi_surface_mud">Superficie: sobre hojas</string>
+	<string name="poi_surface_ice">Superficie: hielo</string>
+	<string name="poi_surface_salt">Superficie: sal</string>
+	<string name="poi_surface_snow">Superficie: nieve</string>
+
+	<string name="poi_route_bus_ref">Colectivo</string>
+	<string name="poi_route_share_taxi_ref">Taxi compartido</string>
+	<string name="poi_route_trolleybus_ref">Trolebús</string>
+	<string name="poi_route_tram_ref">Tranvía</string>
+	<string name="poi_route_train_ref">Tren</string>
+	<string name="poi_route_light_rail_ref">Tren ligero</string>
+	<string name="poi_route_monorail_ref">Monorriel</string>
+	<string name="poi_route_funicular_ref">Funicular</string>
+	<string name="poi_route_ferry_ref">Transbordador</string>
+
+	<string name="poi_route_railway_ref">Ruta ferroviaria</string>
+
+<string name="poi_bridge_structure_simple_wooden">Estructura del puente: de madera simple</string>
+	<string name="poi_historic_yes">Objeto histórico</string>
+	<string name="poi_surveillance_yes">Vigilado</string>
+	<string name="poi_shop_yes">Con negocio</string>
+
+	<string name="poi_service_bicycle_retail_yes">Vende bicicletas</string>
+	<string name="poi_service_bicycle_retail_no">No vende bicicletas</string>
+	<string name="poi_service_bicycle_repair_yes">Repara bicicletas</string>
+	<string name="poi_service_bicycle_repair_no">No repara bicicletas</string>
+	<string name="poi_service_bicycle_rental_yes">Alquila bicicletas</string>
+	<string name="poi_service_bicycle_rental_no">No alquila bicicletas</string>
+	<string name="poi_service_bicycle_pump_yes">Infla de bicicletas</string>
+	<string name="poi_service_bicycle_pump_no">No infla bicicletas</string>
+	<string name="poi_service_bicycle_diy_yes">Autoservicio de herramientas para bicicletas</string>
+	<string name="poi_service_bicycle_diy_no">Sin autoservicio de herramientas para bicicletas</string>
+	<string name="poi_service_bicycle_cleaning_yes">Limpia bicicletas</string>
+	<string name="poi_service_bicycle_cleaning_no">No limpia bicicletas</string>
+	<string name="poi_service_bicycle_chaintool_yes">Con herramientas para cadenas de bicicletas</string>
+	<string name="poi_service_bicycle_chaintool_no">Sin herramientas para cadenas de bicicletas</string>
+	<string name="poi_service_bicycle_second_hand_yes">Vende bicicletas de segunda mano</string>
+	<string name="poi_service_bicycle_second_hand_no">No vende bicicletas de segunda mano</string>
+
+	<string name="poi_wildlife_hide">Observatorio de vida salvaje</string>
+
+	<string name="poi_training_language">Capacitación: idioma</string>
+	<string name="poi_training_music">Capacitación: música</string>
+	<string name="poi_training_dance">Capacitación: danza</string>
+	<string name="poi_training_sport">Capacitación: deportes</string>
+	<string name="poi_training_art">Capacitación: arte</string>
+	<string name="poi_training_cooking">Capacitación: cocina</string>
+	<string name="poi_training_computer">Capacitación: computación</string>
+	<string name="poi_training_yoga">Capacitación: yoga</string>
+	<string name="poi_training_martial_art">Capacitación: artes marciales</string>
+	<string name="poi_training_aviation">Capacitación: aviación</string>
+	<string name="poi_training_hairdressing">Capacitación: peluquería</string>
+
+<string name="poi_animal_shelter">Refugio para animales</string>
+	<string name="poi_memorial_stolperstein">Stolperstein</string>
+	<string name="poi_memorial_column">Columna</string>
+	<string name="poi_memorial_stupa">Estupa</string>
+	<string name="poi_monument_yes">Monumento</string>
+
+	<string name="poi_industrial_oil">Tipo: industria petrolera</string>
+	<string name="poi_industrial_factory">Tipo: fábrica</string>
+	<string name="poi_industrial_wellsite">Tipo: wellsite</string>
+	<string name="poi_industrial_gas">Tipo: industria gasífera</string>
+	<string name="poi_industrial_timber">Tipo: maderera</string>
+	<string name="poi_industrial_refinery">Tipo: refinería</string>
+	<string name="poi_industrial_warehouse">Tipo: almacén</string>
+	<string name="poi_industrial_auto_wrecker">Tipo: vehículo de auxilio</string>
+	<string name="poi_industrial_agriculture">Tipo: agrícola</string>
+	<string name="poi_industrial_brewery">Tipo: cervecería</string>
+	<string name="poi_industrial_brickyard">Tipo: fábrica de ladrillos</string>
+	<string name="poi_industrial_intermodal_freight_terminal">Tipo: terminal intermodal de mercancías</string>
+	<string name="poi_industrial_sawmill">Tipo: aserradero</string>
+	<string name="poi_industrial_water_purification">Tipo: purificación del agua</string>
+	<string name="poi_industrial_port">Tipo: puerto</string>
+	<string name="poi_industrial_depot">Tipo: depósito</string>
+
+	<string name="poi_note">Nota</string>
+	<string name="poi_watering_place">Lugar de riego</string>
+	<string name="poi_animal_boarding">Alojamiento de animales</string>
+	<string name="poi_animal_boarding_dog">Alojamiento canino</string>
+	<string name="poi_animal_boarding_cat">Alojamiento gatuno</string>
+	<string name="poi_animal_boarding_dog_cat">Alojamiento canino y gatuno</string>
+	<string name="poi_animal_boarding_horse">Alojamiento ecuestre</string>
+
+	<string name="poi_historic_aircraft">Avión histórico</string>
+
+	<string name="poi_honey">Miel</string>
+
+	<string name="poi_elevator_yes">Con ascensor</string>
+	<string name="poi_elevator_no">Sin ascensor</string>
+
+	<string name="poi_technical_monument">Monumento técnico</string>
+
+<string name="poi_memorial_prasat">Templo piramidal</string>
+
+	</resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 36db628d37..5260054dc9 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -553,7 +553,7 @@
 	<string name="map_preferred_locale_descr">Idioma preferido para las etiquetas en el mapa (si no está disponible, se cambiará a inglés o a nombres locales)</string>
     <string name="map_preferred_locale">Idioma preferido del mapa</string>
     <string name="forward">Siguiente</string>
-    <string name="home">Panel</string>
+    <string name="home">Panel de control</string>
     <string name="live_monitoring_m_descr">Envíe los datos de rastreo a un servicio web específico, si la grabación GPX está activada.</string>
 	<string name="live_monitoring_m">Rastreo en línea (requiere GPX)</string>
     <string name="live_monitoring_start">Iniciar rastreo en línea</string>
@@ -2100,4 +2100,7 @@
     <string name="world_maps">Mapas mundiales</string>
     <string name="world_regions">Regiones del mundo</string>
     <string name="downloads">Descargas</string>
-</resources>
+<string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string>
+    <string name="favorite_category_name">Nombre de categoría</string>
+    <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
+    </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 2c45034a71..c9e4041c76 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2200,4 +2200,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="world_maps">Cartes mondiales</string>
     <string name="world_regions">Régions dans le monde</string>
     <string name="downloads">Téléchargements</string>
-</resources>
+<string name="favorite_category_name">Nom de la catégorie</string>
+    <string name="favorite_category_add_new_title">Ajouter une catégorie</string>
+    </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index d02cff6f69..8a800906ac 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2221,4 +2221,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="world_maps">Mappe mondiali</string>
     <string name="world_regions">Regioni mondiali</string>
     <string name="downloads">Download</string>
-</resources>
+<string name="favorite_category_dublicate_message">Il nome della categoria specificata esiste già. Specificane uno diverso.</string>
+    <string name="favorite_category_name">Nome della categoria</string>
+    <string name="favorite_category_add_new_title">Aggiungi una nuova categoria</string>
+    </resources>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index ac81612133..931c52eff9 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -470,7 +470,7 @@ POIの更新は利用できません</string>
  <string name="auto_zoom_map">マップを自動ズーム</string>
  <string name="additional_settings">追加設定</string>
  <string name="settings_preset_descr">マップの表示とナビゲーション設定はプロファイルごとに記憶されます。標準で使用するプロファイルを指定してください</string>
- <string name="settings_preset">デフォルトプロファイル</string>
+ <string name="settings_preset">標準プロファイル</string>
  <string name="shared_string_settings">設定</string>
  <string name="save_current_track_descr">現在の経路を今すぐSDに保存します</string>
  <string name="save_current_track">現在の経路を保存</string>
@@ -681,13 +681,13 @@ POIの更新は利用できません</string>
 	<string name="driving_region_uk">イギリス, インド, オーストラリア &amp; その他</string>
 	    
     
-    <string name="announce_gpx_waypoints">GPX経由地点をアナウンス</string>
+    <string name="announce_gpx_waypoints">GPX経由地点</string>
     <string name="speak_title">音声アナウンス設定…</string>
 	<string name="speak_descr">通りの名称、トラフィック警告(通行に関する一般的な指示、強制停止、スピードバンプ等)、スピードカメラ(オービス)、法定速度の音声アナウンスの設定をします</string>
-	<string name="speak_street_names">通りの名前をアナウンス(TTS形式音声のみ)</string>
-    <string name="speak_speed_limit">法定速度をアナウンス</string>
-    <string name="speak_cameras">スピードカメラ(オービス)をアナウンス</string>
-	<string name="speak_traffic_warnings">トラフィック警告(通行に関する指示)をアナウンス</string>
+	<string name="speak_street_names">通りの名前 (TTS形式音声のみ)</string>
+    <string name="speak_speed_limit">制限速度</string>
+    <string name="speak_cameras">スピードカメラ(オービス)</string>
+	<string name="speak_traffic_warnings">通行に関する警告</string>
     <string name="osb_author_or_password_not_specified">OSMのユーザー名とパスワードを設定して下さい</string>
     <string name="clear_intermediate_points">中間点をクリア</string>
     <string name="keep_intermediate_points">中間点を保持</string>
@@ -1239,7 +1239,7 @@ POIの更新は利用できません</string>
 	<string name="shared_string_others">その他</string>
 	<string name="favourites_edit_dialog_name">名前</string>
 	<string name="favourites_edit_dialog_category">カテゴリー</string>
-	<string name="shared_string_no_thanks">必要ありません</string>
+	<string name="shared_string_no_thanks">遠慮します</string>
 	<string name="basemap_missing">ベースワールドマップ(小さなズームでのみ全世界をカバーします)が欠落しています。World_basemap_x.obfをダウンロードしてみてください。</string>
 	<string name="vector_data_missing">オンボード(オフライン)データがSDカード上に見つかりません。オフラインマップを使用するにはそれらをダウンロードしてください。</string>
 	<string name="local_index_gpx_info_show">\n\nオプションを表示するには長押しして下さい</string>
@@ -1789,9 +1789,9 @@ POIの更新は利用できません</string>
     <string name="shared_string_all">全て</string>
     <string name="waypoints">経由地点</string>
     <string name="targets">目的地</string>
-    <string name="way_alarms">交通警告</string>
-    <string name="speak_favorites">周辺のお気に入りをアナウンスする</string>
-    <string name="speak_poi">周辺のPOIをアナウンスする</string>
+    <string name="way_alarms">通行に関する警告</string>
+    <string name="speak_favorites">周辺のお気に入り</string>
+    <string name="speak_poi">周辺のPOI</string>
     <string name="download_additional_maps">不足分のマップ %1$s (%2$d MB)をダウンロードしますか?</string>
     <string name="shared_string_more">追加…</string>
     <string name="rendering_value_browse_map_name">マップの閲覧</string>  
@@ -1884,7 +1884,7 @@ POIの更新は利用できません</string>
 	<string name="navigation_over_track">経路に沿って居ナビゲーションを開始しますか？</string>
 	<string name="avoid_roads_msg">使用しない道路を選択することで、別の経路を検索することができます</string>
     
-	<string name="speak_pedestrian">横断歩道をアナウンス</string>
+	<string name="speak_pedestrian">横断歩道</string>
     <string name="rendering_attr_roadStyle_name">道路の表示形式</string>
     <string name="rendering_value_default_name">標準</string>
     <string name="rendering_value_orange_name">オレンジ</string>
@@ -2154,4 +2154,51 @@ POIの更新は利用できません</string>
 	<string name="show_on_start">起動時に表示</string>
 	<string name="count_of_lines">表示する数の指定</string>
 <string name="address_unknown">住所はまだ登録されていません</string>
-    </resources>
+    <string name="favorite_category_dublicate_message">指定したカテゴリ名は既に使用されています。別の名前を付けてください。</string>
+    <string name="favorite_category_name">カテゴリ名</string>
+    <string name="favorite_category_add_new_title">新しいカテゴリを追加</string>
+    <string name="regions">地域</string>
+    <string name="additional_maps">追加設定</string>
+    <string name="region_maps">地域マップ</string>
+    <string name="world_maps">世界地図</string>
+    <string name="world_regions">世界の地域</string>
+    <string name="hillshade_layer_disabled">陰影起伏層無効</string>
+    <string name="srtm_plugin_disabled">等高線無効</string>
+    <string name="favorite_category_add_new">新規追加</string>
+    <string name="favorite_category_select">カテゴリを選択</string>
+    <string name="default_speed_system_descr">移動速度の表示形式を設定します</string>
+    <string name="default_speed_system">速度表示形式</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">海里</string>
+    <string name="si_kmh">キロメートル毎時(km/h)</string>
+    <string name="si_mph">マイル毎時(mph・mi/h)</string>
+    <string name="si_m_s">メートル毎秒(m/s)</string>
+    <string name="si_min_km">キロメートル毎分(km/min)</string>
+    <string name="si_min_m">マイル毎分(mi/min)</string>
+    <string name="si_nm_h">海里毎時(ノット)</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="shared_string_trip_recording">旅程記録</string>
+    <string name="shared_string_navigation">ナビゲーション</string>
+    <string name="osmand_running_in_background">バックグラウンドで実行</string>
+    <string name="favourites_edit_dialog_title">お気に入りの情報</string>
+    <string name="simulate_your_location_stop_descr">位置シミュレーションの停止</string>
+    <string name="simulate_your_location_descr">GPXに記録されたルート、または計算されたルートを使用してシミュレートします</string>
+    <string name="favourites_context_menu_add">お気に入りに追加</string>
+	<string name="are_you_sure">よろしいですか？</string>
+	<string name="unsaved_changes_will_be_lost">未保存の変更は失われます。続行しますか？</string>
+	<string name="downloads_left_template">残りダウンロード %1$s</string>
+	<string name="roads">道路</string>
+    <string name="downloading_number_of_files">%1$d のファイルをダウンロード中</string>
+    <string name="show_free_version_banner">無料版のバナーを表示</string>
+    <string name="show_free_version_banner_description">有料版を所持している場合でも無料版バナーを見ることが出来ます</string>
+    <string name="buy">購入</string>
+    <string name="activate_seamarks_plugin">水位線プラグインを有効にしてください</string>
+    <string name="activate_srtm_plugin">SRTMプラグインを有効にしてください</string>
+    <string name="later">後で</string>
+    <string name="get_full_version">フルバージョンの入手</string>
+    <string name="downloads">ダウンロード</string>
+</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 0dbcc6c5fd..f3b462641f 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1136,10 +1136,12 @@
 	<string name="poi_breakwater">Волнорез</string>
 	<string name="poi_groyne">Мол</string>
 
-	<string name="poi_animal_shelter_dog">Приют для собак</string>
-	<string name="poi_animal_shelter_cat">Приют для кошек</string>
-	<string name="poi_animal_shelter_dog_cat">Приют для кошек и собак</string>
-	<string name="poi_animal_shelter_bird">Приют для птиц</string>
+	<string name="poi_animal_shelter">Приют для животных</string>
+
+	<string name="poi_animal_shelter_dog">Тип приюта: для собак</string>
+	<string name="poi_animal_shelter_cat">Тип приюта: для кошек</string>
+	<string name="poi_animal_shelter_dog_cat">Тип приюта: для собак и кошек</string>
+	<string name="poi_animal_shelter_bird">Тип приюта: для птиц</string>
 
 	<string name="poi_shower">Душ</string>
 
@@ -1541,7 +1543,11 @@
 	<string name="poi_memorial_jizo">Дзидзо</string>
 	<string name="poi_memorial_cross">Крест</string>
 	<string name="poi_memorial_vehicle">Средство передвижения</string>
+	<string name="poi_memorial_stolperstein">Камень преткновения</string>
 	<string name="poi_memorial_obelisk">Обелиск</string>
+	<string name="poi_memorial_column">Колонна</string>
+	<string name="poi_memorial_stupa">Ступа</string>
+	<string name="poi_memorial_prasat">Прасат</string>
 
 	<string name="poi_inscription">Надпись</string>
 
@@ -1635,7 +1641,7 @@
 	<string name="poi_shelter_type_lean_to">Тип укрытия: навес</string>
 	<string name="poi_shelter_type_basic_hut">Тип укрытия: хижина</string>
 	<string name="poi_shelter_type_building">Тип укрытия: здание</string>
-	<string name="poi_shelter_type_wildlife_hide">Тип укрытия: в дикой природе</string>
+	<string name="poi_shelter_type_wildlife_hide">Тип укрытия: для наблюдения за дикой природой</string>
 	<string name="poi_shelter_type_rock_shelter">Тип укрытия: в камнях</string>
 	<string name="poi_shelter_type_sun_shelter">Тип укрытия: от солнца</string>
 	<string name="poi_shelter_type_field_shelter">Тип укрытия: в поле</string>
@@ -1695,7 +1701,7 @@
 	<string name="poi_tunnel_car">Туннель для автомобилей</string>
 	<string name="poi_tunnel_pedestrian">Туннель для пешеходов</string>
 	<string name="poi_tunnel_railway">Железнодорожный тоннель</string>
-	<string name="poi_bridge_car">Автомобильный туннель</string>
+	<string name="poi_bridge_car">Автомобильный мост</string>
 	<string name="poi_bridge_pedestrian">Пешеходный мост</string>
 	<string name="poi_bridge_bicycle">Велосипедный мост</string>
 	<string name="poi_bridge_railway">Железнодорожный мост</string>
@@ -1749,4 +1755,98 @@
 	<string name="poi_surface_salt">Поверхность: соль (соляные озёра)</string>
 	<string name="poi_surface_snow">Поверхность: снег (зимник)</string>
 
+	<string name="poi_route_bus_ref">Автобус</string>
+	<string name="poi_route_share_taxi_ref">Маршрутное такси</string>
+	<string name="poi_route_trolleybus_ref">Троллейбус</string>
+	<string name="poi_route_tram_ref">Трамвай</string>
+	<string name="poi_route_train_ref">Поезд</string>
+	<string name="poi_route_light_rail_ref">Легкорельсовый транспорт</string>
+	<string name="poi_route_monorail_ref">Монорельс</string>
+	<string name="poi_route_funicular_ref">Фуникулёр</string>
+	<string name="poi_route_ferry_ref">Паром</string>
+
+	<string name="poi_route_railway_ref">Железнодорожный путь</string>
+
+	<string name="poi_historic_yes">Исторический объект</string>
+	<string name="poi_surveillance_yes">С видеонаблюдением</string>
+	<string name="poi_shop_yes">С магазином</string>
+
+	<string name="poi_service_bicycle_retail_yes">Продажа велосипедов: да</string>
+	<string name="poi_service_bicycle_retail_no">Продажа велосипедов: нет</string>
+	<string name="poi_service_bicycle_repair_yes">Ремонт велосипедов: да</string>
+	<string name="poi_service_bicycle_repair_no">Ремонт велосипедов: нет</string>
+	<string name="poi_service_bicycle_rental_yes">Прокат велосипедов: да</string>
+	<string name="poi_service_bicycle_rental_no">Прокат велосипедов: нет</string>
+	<string name="poi_service_bicycle_pump_yes">Подкачка велосипедных шин: да</string>
+	<string name="poi_service_bicycle_pump_no">Подкачка велосипедных шин: нет</string>
+	<string name="poi_service_bicycle_diy_yes">Инструменты для самостоятельного ремонта велосипеда: да</string>
+	<string name="poi_service_bicycle_diy_no">Инструменты для самостоятельного ремонта велосипеда: нет</string>
+	<string name="poi_service_bicycle_cleaning_yes">Мойка велосипедов: да</string>
+	<string name="poi_service_bicycle_cleaning_no">Мойка велосипедов: нет</string>
+	<string name="poi_service_bicycle_chaintool_yes">Выжимка цепи для велосипедов: да</string>
+	<string name="poi_service_bicycle_chaintool_no">Выжимка цепи для велосипедов: нет</string>
+	<string name="poi_service_bicycle_second_hand_yes">Продажа подержанных велосипедов: да</string>
+	<string name="poi_service_bicycle_second_hand_no">Продажа подержанных велосипедов: нет</string>
+
+	<string name="poi_wildlife_hide">Укрытие для наблюдения за дикой природой</string>
+
+	<string name="poi_training_language">Обучение: иностранный язык</string>
+	<string name="poi_training_music">Обучение: музыка</string>
+	<string name="poi_training_dance">Обучение: танцы</string>
+	<string name="poi_training_sport">Обучение: спорт</string>
+	<string name="poi_training_art">Обучение: искусство</string>
+	<string name="poi_training_cooking">Обучение: приготовление пищи</string>
+	<string name="poi_training_computer">Обучение: работа на компьютере</string>
+	<string name="poi_training_yoga">Обучение: йога</string>
+	<string name="poi_training_martial_art">Обучение: боевые искусства</string>
+	<string name="poi_training_aviation">Обучение: авиация</string>
+	<string name="poi_training_hairdressing">Обучение: парикмахер</string>
+
+	<string name="poi_monument_yes">Монументальный объект</string>
+
+	<string name="poi_industrial_oil">Тип: нефтяная промышленность</string>
+	<string name="poi_industrial_wellsite">Тип: буровая площадка</string>
+	<string name="poi_industrial_factory">Тип: фабрика</string>
+	<string name="poi_industrial_gas">Тип: газовая промышленность</string>
+	<string name="poi_industrial_timber">Тип: лесоматериалы</string>
+	<string name="poi_industrial_refinery">Тип: очистительный завод</string>
+	<string name="poi_industrial_warehouse">Тип: склад</string>
+	<string name="poi_industrial_auto_wrecker">Тип: утилизация машин</string>
+	<string name="poi_industrial_agriculture">Тип: сельскохозяйственная промышленность</string>
+	<string name="poi_industrial_brewery">Тип: пивоварня</string>
+	<string name="poi_industrial_brickyard">Тип: кирпичный завод</string>
+	<string name="poi_industrial_intermodal_freight_terminal">Тип: интермодальный грузовой терминал</string>
+	<string name="poi_industrial_sawmill">Тип: лесопилка</string>
+	<string name="poi_industrial_water_purification">Тип: очистка воды</string>
+	<string name="poi_industrial_port">Тип: порт</string>
+	<string name="poi_industrial_depot">Тип: депо</string>
+
+	<string name="poi_note">Заметка</string>
+	<string name="poi_watering_place">Водопой</string>
+	<string name="poi_animal_boarding">Временное содержание животных</string>
+	<string name="poi_animal_boarding_dog">Тип приюта: для собак</string>
+	<string name="poi_animal_boarding_cat">Тип приюта: для кошек</string>
+	<string name="poi_animal_boarding_dog_cat">Тип приюта: для собак и кошек</string>
+	<string name="poi_animal_boarding_horse">Тип приюта: для лошадей</string>
+
+	<string name="poi_historic_aircraft">Исторический самолёт</string>
+
+	<string name="poi_honey">Мёд</string>
+
+	<string name="poi_elevator_yes">С лифтом</string>
+	<string name="poi_elevator_no">Без лифта</string>
+
+	<string name="poi_technical_monument">Технический памятник</string>
+
+	<string name="poi_office_camping">Приёмная лагеря</string>
+	<string name="poi_model_aerodrome">Авиамодельный спорт</string>
+	<string name="poi_guide">Офис гида</string>
+	<string name="poi_quango">Квазиавтономная неправительственная организация</string>
+	<string name="poi_consulting">Консультации</string>
+	<string name="poi_cooperative">Офис кооператива</string>
+	<string name="poi_office_forestry">Офис лесничества</string>
+	<string name="poi_logistics">Офис транспортно-логистической компании</string>
+	<string name="poi_parish">Приход</string>
+	<string name="poi_publisher">Издательство</string>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 29e0a252e7..91f01b1874 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1357,16 +1357,16 @@
 	<string name="auto_zoom_far">К среднему плану</string>
 	<string name="auto_zoom_farthest">К дальнему плану</string>
 	<string name="routing_attr_avoid_motorway_description">Избегать автомагистралей</string>
-	<string name="routing_attr_avoid_motorway_name">Автомагистрали</string>
+	<string name="routing_attr_avoid_motorway_name">Избегать автомагистралей</string>
 	<string name="routing_attr_prefer_motorway_name">Предпочитать автомагистрали</string>
 	<string name="routing_attr_prefer_motorway_description">Предпочитать автомагистрали</string>
 	<string name="routing_attr_short_way_name">Кратчайший путь</string>
 	<string name="routing_attr_short_way_description">Использовать кратчайший путь</string>
-	<string name="routing_attr_avoid_toll_name">Платные дороги</string>
+	<string name="routing_attr_avoid_toll_name">Избегать платных дорог</string>
 	<string name="routing_attr_avoid_toll_description">Избегать платных дорог</string>
-	<string name="routing_attr_avoid_unpaved_name">Грунтовые дороги</string>
+	<string name="routing_attr_avoid_unpaved_name">Избегать грунтовые дороги</string>
 	<string name="routing_attr_avoid_unpaved_description">Избегать грунтовые дороги</string>
-	<string name="routing_attr_avoid_ferries_name">Паромы</string>
+	<string name="routing_attr_avoid_ferries_name">Избегать паромов</string>
 	<string name="routing_attr_avoid_ferries_description">Избегать паромов</string>
 	<string name="routing_attr_weight_name">Максимальная масса</string>
 	<string name="routing_attr_weight_description">Укажите массу автомобиля для учёта при построении маршрута</string>
@@ -1973,7 +1973,7 @@
     <string name="application_dir_change_warning3">Переместить также файлы данных OsmAnd в новое место назначения?</string>
     <string name="search_poi_category_hint">Напечатайте для поиска</string>
     <string name="rendering_attr_hideHouseNumbers_name">Скрыть номера домов</string>
-    <string name="routing_attr_avoid_borders_name">Пересечения границы</string>
+    <string name="routing_attr_avoid_borders_name">Избегать пересечение границы</string>
 	<string name="routing_attr_avoid_borders_description">Избегать пересечение границы с другой страной</string>
 	<string name="routing_attr_height_name">Ограничение высоты</string>
 	<string name="routing_attr_height_description">Укажите высоту автомобиля для учёта при построении маршрута</string>
@@ -2128,4 +2128,18 @@
     <string name="world_regions">Регионы мира</string>
     <string name="favourites_context_menu_add">Добавить избранное</string>
 	<string name="region_maps">Карты региона</string>
+    <string name="favorite_category_dublicate_message">Категория с таким названием уже существует. Введите другое название.</string>
+    <string name="favorite_category_name">Название категории</string>
+    <string name="favorite_category_add_new_title">Добавить новую категорию</string>
+    <string name="hillshade_layer_disabled">Слой рельефа местности отключен</string>
+    <string name="srtm_plugin_disabled">Контурные линии отключены</string>
+    <string name="roads">Дороги</string>
+    <string name="buy">Купить</string>
+    <string name="activate_seamarks_plugin">Пожалуйста, активируйте плагин морские карты</string>
+    <string name="activate_srtm_plugin">Пожалуйста, активируйте плагин SRTM</string>
+    <string name="later">Позже</string>
+    <string name="get_full_version">Получить полную версию</string>
+    <string name="downloads">Загрузки</string>
+<string name="show_free_version_banner">Показать баннер бесплатная версия</string>
+    <string name="show_free_version_banner_description">Даже если у вас купленная версия вы еще можете увидеть баннер для бесплатной версии</string>
     </resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 21b1bf4dc9..190dd5d542 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2132,4 +2132,7 @@
     <string name="world_maps">Mapas mundiales</string>
     <string name="world_regions">Regiones de su mundu</string>
     <string name="downloads">Iscarrigamentos</string>
-</resources>
+<string name="favorite_category_dublicate_message">Su nùmene dislindadu pro sa categoria esistit giai. Pro praghere dislinda-ne unu diferente.</string>
+    <string name="favorite_category_name">Nùmene de sa categoria</string>
+    <string name="favorite_category_add_new_title">Annanghe una categoria noa</string>
+    </resources>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index fbf73325e3..263f61f8fc 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -881,15 +881,15 @@
 	<string name="poi_tree">Strom</string>
 	<string name="poi_conservation">Chránené územie</string>
 
-	<string name="poi_icn_ref">Medzinárodná cyklistická sieť</string>
-	<string name="poi_ncn_ref">Národná cyklistická sieť</string>
-	<string name="poi_rcn_ref">Regionálna cyklistická sieť</string>
-	<string name="poi_lcn_ref">Lokálna cyklistická sieť</string>
+	<string name="poi_icn_ref">Bod medzinárodnej cyklistickej siete</string>
+	<string name="poi_ncn_ref">Bod národnej cyklistickej siete</string>
+	<string name="poi_rcn_ref">Bod regionálnej cyklistickej siete</string>
+	<string name="poi_lcn_ref">Bod lokálnej cyklistickej siete</string>
 
-	<string name="poi_iwn_ref">Medzinárodná pešia sieť</string>
-	<string name="poi_nwn_ref">Národná pešia sieť</string>
-	<string name="poi_rwn_ref">Regionálna pešia sieť</string>
-	<string name="poi_lwn_ref">Lokálna pešia sieť</string>
+	<string name="poi_iwn_ref">Bod medzinárodnej pešej siete</string>
+	<string name="poi_nwn_ref">Bod národnej pešej siete</string>
+	<string name="poi_rwn_ref">Bod regionálnej pešej siete</string>
+	<string name="poi_lwn_ref">Bod lokálnej pešej siete</string>
 
 	<string name="poi_collection_times">Čas výberu pošty</string>
 	<string name="poi_description">Popis</string>
@@ -904,15 +904,15 @@
 	<string name="poi_operator">Prevádzkovateľ</string>
 	<string name="poi_brand">Značka</string>
 
-	<string name="poi_enforcement_traffic_signals">Vynútenie:semafory</string>
-	<string name="poi_enforcement_maxheight">Vynútenie:maximálna výška</string>
-	<string name="poi_enforcement_check">Vynútenie:kontrola</string>
-	<string name="poi_enforcement_access">Vynútenie:prístup</string>
-	<string name="poi_enforcement_toll">Vynútenie:mýto</string>
+	<string name="poi_enforcement_traffic_signals">Vynútenie: svetelná signalizácia</string>
+	<string name="poi_enforcement_maxheight">Vynútenie: maximálna výška</string>
+	<string name="poi_enforcement_check">Vynútenie: kontrola</string>
+	<string name="poi_enforcement_access">Vynútenie: prístup</string>
+	<string name="poi_enforcement_toll">Vynútenie: mýto</string>
 
 <string name="poi_country">Krajina</string>
-	<string name="poi_enforcement_mindistance">Vynútenie:minimálna vzdialenosť</string>
-	<string name="poi_enforcement_maxspeed">Vynútenie:maximálna rýchlosť</string>
+	<string name="poi_enforcement_mindistance">Vynútenie: minimálna vzdialenosť</string>
+	<string name="poi_enforcement_maxspeed">Vynútenie: maximálna rýchlosť</string>
 	<string name="poi_fee_yes">Poplatok</string>
 
 	<string name="poi_opening_hours">Otváracie hodiny</string>
@@ -996,8 +996,8 @@
 	<string name="poi_animal_shelter_cat">Prístrešok pre mačky</string>
 	<string name="poi_animal_shelter_dog_cat">Prístrešok pre psy a mačky</string>
 	<string name="poi_fee_no">Bez poplatku</string>
-	<string name="poi_drinking_water_yes">Pitná voda</string>
-	<string name="poi_drinking_water_no">Nepitná voda</string>
+	<string name="poi_drinking_water_yes">Pitná voda: áno</string>
+	<string name="poi_drinking_water_no">Pitná voda: nie</string>
 	<string name="poi_supervised_yes">Strážené</string>
 	<string name="poi_supervised_no">Nestrážené</string>
 	<string name="poi_seasonal_yes">Sezónne</string>
@@ -1008,7 +1008,7 @@
 	<string name="poi_seasonal_summer">Leto</string>
 	<string name="poi_seasonal_autumn">Jeseň</string>
 	<string name="poi_seasonal_winter">Zima</string>
-	<string name="poi_crossing_traffic_signals">So semaforom</string>
+	<string name="poi_crossing_traffic_signals">So svetelnou signalizáciou</string>
 	<string name="poi_crossing_uncontrolled">Neriadený</string>
 	<string name="poi_crossing_unmarked">Nevyznačený</string>
 
@@ -1077,7 +1077,7 @@
 
 <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>
@@ -1099,22 +1099,22 @@
 	<string name="poi_wheelchair">Invalidný vozík</string>
 	<string name="poi_wholesale">Veľkoobchod</string>
 
-	<string name="poi_content_silage">Siláž (obsah)</string>
-	<string name="poi_content_water">Voda (obsah)</string>
-	<string name="poi_content_slurry">Minerálny olej (obsah)</string>
-	<string name="poi_content_oil">Ropa (obsah)</string>
-	<string name="poi_content_fuel">Palivo (obsah)</string>
-	<string name="poi_content_manure">Hnoj (obsah)</string>
-	<string name="poi_content_wine">Víno (obsah)</string>
-	<string name="poi_content_sewage">Kanalizácia (obsah)</string>
-	<string name="poi_content_gas">Plyn (obsah)</string>
-	<string name="poi_content_biomass">Biomasa (obsah)</string>
-	<string name="poi_content_wastewater">Odpadová voda (obsah)</string>
-	<string name="poi_content_crop">Plodiny (obsah)</string>
-	<string name="poi_content_fodder">Krmivo (obsah)</string>
-	<string name="poi_content_beer">Pivo (obsah)</string>
-	<string name="poi_content_salt">Soľ (obsah)</string>
-	<string name="poi_content_grain">Zrno (obsah)</string>
+	<string name="poi_content_silage">Obsah: Siláž</string>
+	<string name="poi_content_water">Obsah: Voda</string>
+	<string name="poi_content_slurry">Obsah: Minerálny olej</string>
+	<string name="poi_content_oil">Obsah: Ropa</string>
+	<string name="poi_content_fuel">Obsah: Palivo</string>
+	<string name="poi_content_manure">Obsah: Hnoj</string>
+	<string name="poi_content_wine">Obsah: Víno</string>
+	<string name="poi_content_sewage">Obsah: Splašky</string>
+	<string name="poi_content_gas">Obsah: Plyn</string>
+	<string name="poi_content_biomass">Obsah: Biomasa</string>
+	<string name="poi_content_wastewater">Obsah: Odpadová voda</string>
+	<string name="poi_content_crop">Obsah: Plodiny</string>
+	<string name="poi_content_fodder">Obsah: Krmivo</string>
+	<string name="poi_content_beer">Obsah: Pivo</string>
+	<string name="poi_content_salt">Obsah: Soľ</string>
+	<string name="poi_content_grain">Obsah: Zrno</string>
 
 	<string name="poi_nudism_yes">Nudizmus: povolený</string>
 	<string name="poi_nudism_no">Nudizmus: zakázaný</string>
@@ -1227,19 +1227,19 @@
 	<string name="poi_information_office">Informačná kancelária</string>
 	<string name="poi_information_terminal">Informačný terminál</string>
 	<string name="poi_information_hikingmap">Turistická mapa</string>
-	<string name="poi_information_nature">Informácie o prírode</string>
-	<string name="poi_information_wildlife">Informácie o živočíchoch</string>
-	<string name="poi_information_history">Informácie o histórii</string>
+	<string name="poi_information_nature">Informačné značenie: príroda</string>
+	<string name="poi_information_wildlife">Informačné značenie: živočíchy</string>
+	<string name="poi_information_history">Informačné značenie: história</string>
 	<string name="poi_information_sign">Značka</string>
 	<string name="poi_information_bicyclemap">Cyklomapa</string>
 	<string name="poi_information_tactile_model">Dotykový model</string>
 	<string name="poi_information_tactile_map">Dotyková mapa</string>
-	<string name="poi_board_type_notice">Tabuľa s oznamom</string>
-	<string name="poi_board_type_plants">Informácie o rastlinách</string>
-	<string name="poi_board_type_geology">Informácie o geológii</string>
-	<string name="poi_board_type_public_transport">Informácie o hromadnej doprave</string>
-	<string name="poi_board_type_technology">Informácie o technológii</string>
-	<string name="poi_board_type_astronomy">Informácie o astronómii</string>
+	<string name="poi_board_type_notice">Výveska</string>
+	<string name="poi_board_type_plants">Informačné značenie: rastliny</string>
+	<string name="poi_board_type_geology">Informačné značenie: geológia</string>
+	<string name="poi_board_type_public_transport">Informačné značenie: hromadná doprava</string>
+	<string name="poi_board_type_technology">Informačné značenie: technológia</string>
+	<string name="poi_board_type_astronomy">Informačné značenie: astronómia</string>
 
 <string name="poi_information_audioguide">Audiosprievodca</string>
 	<string name="poi_commercial">Komerčný pozemok</string>
@@ -1248,24 +1248,24 @@
 	<string name="poi_fireplace_yes">Ohnisko</string>
 	<string name="poi_fireplace_no">Bez ohniska</string>
 
-	<string name="poi_covered_yes">S prístreškom</string>
+	<string name="poi_covered_yes">Pod prístreškom</string>
 	<string name="poi_covered_no">Bez prístrešku</string>
 
 	<string name="poi_smoking_no">Zákaz fajčenia</string>
 	<string name="poi_smoking_outside">Fajčenie povolené len vonku</string>
 	<string name="poi_smoking_yes">Fajčenie povolené</string>
-	<string name="poi_smoking_separated">Fajčenie povolené v samostatnej neoddelenej miestnosti</string>
-	<string name="poi_smoking_isolated">Fajčenie povolené v samostatnej oddelenej miestnosti</string>
+	<string name="poi_smoking_separated">Fajčenie povolené v samostatnej miestnosti</string>
+	<string name="poi_smoking_isolated">Fajčenie povolené v izolovanej miestnosti</string>
 	<string name="poi_smoking_dedicated">Vyhradené pre fajčiarov</string>
 
 	<string name="poi_toll_yes">Mýtny poplatok</string>
-	<string name="poi_toll_no">Mýtny poplatok sa nevyberá</string>
-	<string name="poi_toll_hgv_yes">Mýtny poplatok sa vyberá len pre nákladné vozidlá</string>
+	<string name="poi_toll_no">Žiadny mýtny poplatok</string>
+	<string name="poi_toll_hgv_yes">Mýtny poplatok za nákladné vozidlá</string>
 	<string name="poi_tactile_paving_yes">Značenie pre slepých</string>
 	<string name="poi_tactile_paving_no">Bez značenia pre slepých</string>
 	<string name="poi_traffic_signals_sound_yes">Zvuková signalizácia</string>
 	<string name="poi_traffic_signals_sound_no">Bez zvukovej signalizácie</string>
-	<string name="poi_traffic_signals_sound_walk">Zvuková signalizácia len keď je prechod povolený</string>
+	<string name="poi_traffic_signals_sound_walk">Zvuková signalizácia keď je prechod povolený</string>
 
 <string name="poi_rescue_station">Záchranná stanica</string>
 
@@ -1298,7 +1298,7 @@
 	<string name="poi_religion_zoroastrian">Zoroastrizmus</string>
 
 	<string name="poi_bicycle_parking_anchors">Držiaky</string>
-	<string name="poi_rtsa_scale">Náročnosť horského priesmyku</string>
+	<string name="poi_rtsa_scale">Stupnica RTSA</string>
 
 <string name="poi_piste_difficulty_easy">Obtiažnosť zjazdovky: ľahká</string>
 	<string name="poi_piste_difficulty_intermediate">Obtiažnosť zjazdovky: stredná</string>
@@ -1314,4 +1314,76 @@
 	<string name="poi_piste_grooming_no">Úprava trate: žiadna</string>
 	<string name="poi_piste_grooming_mogul">Úprava trate: bubny</string>
 
-</resources>
+<string name="poi_internet_access_yes">Internetové pripojenie: áno</string>
+	<string name="poi_internet_access_no">Internetové pripojenie: nie</string>
+
+	<string name="poi_wheelchair_no">Invalidný vozík: nepovolený</string>
+	<string name="poi_wheelchair_limited">Invalidný vozík: obmedzene</string>
+	<string name="poi_pump">Čerpadlo</string>
+
+	<string name="poi_garden_type_residential">Typ záhrady: v obytnej oblasti</string>
+	<string name="poi_garden_type_community">Typ záhrady: spoločenstvo</string>
+	<string name="poi_garden_type_private">Typ záhrady: súkromná</string>
+	<string name="poi_garden_type_botanical">Typ záhrady: botanická</string>
+
+	<string name="poi_garden_style_kitchen">Typ záhrady: kuchyňa</string>
+	<string name="poi_garden_style_rosarium">Typ záhrady: rozárium</string>
+	<string name="poi_garden_style_french">Typ záhrady: francúzska</string>
+	<string name="poi_garden_style_english">Typ záhrady: anglická</string>
+	<string name="poi_garden_style_japanese">Typ záhrady: Japonská</string>
+
+	<string name="poi_capacity">Kapacita</string>
+	<string name="poi_capacity_disabled_yes">Vyhradené miesta pre invalidov</string>
+	<string name="poi_capacity_disabled_no">Žiadne vyhradené miesta pre invalidov</string>
+	<string name="poi_capacity_disabled">Vyhradené miesta pre invalidov</string>
+	<string name="poi_capacity_women_yes">Vyhradené miesta pre ženy</string>
+	<string name="poi_capacity_women_no">Žiadne vyhradené miesta pre ženy</string>
+	<string name="poi_capacity_women">Vyhradené miesta pre ženy</string>
+	<string name="poi_capacity_pupils">Vyhradené miesta pre študentov</string>
+	<string name="poi_capacity_teachers">Vyhradené miesta pre učiteľov</string>
+	<string name="poi_capacity_parent_yes">Vyhradené miesta pre rodičov</string>
+	<string name="poi_capacity_parent_no">Žiadne vyhradené miesta pre rodičov</string>
+	<string name="poi_capacity_parent">Vyhradené miesta pre rodičov</string>
+
+	<string name="poi_aerialway_occupancy">Kapacita kabínky</string>
+	<string name="poi_aerialway_capacity">Hodinová kapacita</string>
+	<string name="poi_aerialway_duration">Priemerný čas cesty v minútach</string>
+	<string name="poi_aerialway_bubble_yes">Kryt</string>
+	<string name="poi_aerialway_bubble_no">Bez krytu</string>
+	<string name="poi_aerialway_heating_yes">Vykurovanie</string>
+	<string name="poi_aerialway_heating_no">Žiadne vykurovanie</string>
+	<string name="poi_aerialway_bicycle_yes">Bicykle: povolené</string>
+	<string name="poi_aerialway_bicycle_no">Bicykle: nepovolené</string>
+	<string name="poi_aerialway_bicycle_summer">Bicykle: povolené len v lete</string>
+	<string name="poi_aerialway_access_entry">Iba vstup</string>
+	<string name="poi_aerialway_access_exit">Iba výstup</string>
+	<string name="poi_aerialway_access_both">Vstup aj výstup</string>
+	<string name="poi_aerialway_summer_access_entry">Letný prístup: len vstup</string>
+	<string name="poi_aerialway_summer_access_exit">Letný prístup: len výstup</string>
+	<string name="poi_aerialway_summer_access_both">Letný prístup: vstup aj výstup</string>
+
+	<string name="poi_stars_1">Počet hviezd: 1 (Turistický)</string>
+	<string name="poi_stars_1s">Počet hviezd: 1S (Vyšší turistický)</string>
+	<string name="poi_stars_2">Počet hviezd: 2 (Štandard)</string>
+	<string name="poi_stars_2s">Počet hviezd: 2S (Vyšší štandard)</string>
+	<string name="poi_stars_3">Počet hviezd: 3 (Komfort)</string>
+	<string name="poi_stars_3s">Počet hviezd: 3 (Vyšší komfort)</string>
+	<string name="poi_stars_4">Počet hviezd: 4 (Prvá trieda)</string>
+	<string name="poi_stars_4s">Počet hviezd: 4S (Vyššia prvá trieda)</string>
+	<string name="poi_stars_5">Počet hviezd: 5 (Luxusný)</string>
+	<string name="poi_stars_5s">Počet hviezd: 5S (Vyšší luxus)</string>
+	<string name="poi_stars_6">Počet hviezd: 6</string>
+	<string name="poi_stars_7">Počet hviezd: 7</string>
+	<string name="poi_rooms">Počet izieb</string>
+
+	<string name="poi_love_hotel">Hodinový hotel</string>
+
+	<string name="poi_payment_coins_yes">Prijíma mince</string>
+	<string name="poi_payment_coins_no">Neprijíma mince</string>
+	<string name="poi_payment_coins_0.5">Prijíma mince 1/2USD</string>
+	<string name="poi_payment_coins_50c12">Prijíma mince 50c, 1€, a 2€</string>
+	<string name="poi_payment_telephone_cards_yes">Prijíma telefónne karty</string>
+	<string name="poi_payment_telephone_cards_no">Neprijíma telefónne karty</string>
+	<string name="poi_payment_credit_cards_yes">Prijíma kreditné karty</string>
+	<string name="poi_payment_credit_cards_no">Neprijíma kreditné karty</string>
+	</resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index b1b77282ff..79346ccb40 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2332,4 +2332,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="later">Neskôr</string>
     <string name="get_full_version">Získať plnú verziu</string>
     <string name="downloads">Sťahovania</string>
-</resources>
+<string name="favorite_category_dublicate_message">Zadaný názov kategórie už existuje. Prosím zadajte iný názov.</string>
+    <string name="favorite_category_name">Názov kategórie</string>
+    <string name="favorite_category_add_new_title">Pridať novú kategóriu</string>
+    </resources>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 35bdcfef8d..ca25c11c5a 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -950,10 +950,10 @@
 	<string name="poi_fax">傳真</string>
 	<string name="poi_facebook">臉書</string>
 	<string name="poi_mobile">行動電話</string>
-	<string name="poi_animal_shelter_dog">流浪狗收容所</string>
-	<string name="poi_animal_shelter_cat">流浪貓收容所</string>
-	<string name="poi_animal_shelter_dog_cat">流浪狗和貓收容所</string>
-	<string name="poi_animal_shelter_bird">傷鳥收容所</string>
+	<string name="poi_animal_shelter_dog">收容所類型：狗</string>
+	<string name="poi_animal_shelter_cat">收容所：貓</string>
+	<string name="poi_animal_shelter_dog_cat">收容所：狗、貓</string>
+	<string name="poi_animal_shelter_bird">收容所：鳥</string>
 
 <string name="poi_shower">淋浴</string>
 	<string name="poi_recycling_centre">類型：資源回收中心</string>
@@ -1326,7 +1326,7 @@
 	<string name="poi_mini_roundabout">迷你圓環</string>
 	<string name="poi_railway_crossing">鐵路平交道</string>
 	<string name="poi_railway_level_crossing">平交道</string>
-	<string name="poi_bird_hide">賞鳥屋</string>
+	<string name="poi_bird_hide">觀賞鳥的地方</string>
 	<string name="poi_horse_riding">騎馬運動</string>
 	<string name="poi_leisure_common">公共休閒區</string>
 	<string name="poi_garden">花園</string>
@@ -1741,4 +1741,62 @@
 	<string name="poi_resource_gravel">礫石</string>
 	<string name="poi_resource_gypsum">石膏</string>
 	<string name="poi_resource_iron_ore">鐵礦砂</string>
+	<string name="poi_resource_lead">鉛</string>
+	<string name="poi_resource_lignite">褐煤</string>
+	<string name="poi_resource_limestone">石灰石</string>
+	<string name="poi_resource_marble">大理石</string>
+	<string name="poi_resource_mercury">水星</string>
+	<string name="poi_resource_mica">雲母</string>
+	<string name="poi_resource_mineral_oil">礦油</string>
+	<string name="poi_resource_nickel">鎳</string>
+	<string name="poi_resource_oil">石油</string>
+	<string name="poi_resource_opal">蛋白石</string>
+	<string name="poi_resource_peat">泥煤</string>
+	<string name="poi_resource_platinum">白金</string>
+	<string name="poi_resource_radium">鐳</string>
+	<string name="poi_resource_ruby">紅寶石</string>
+	<string name="poi_resource_rutile">金紅石</string>
+	<string name="poi_resource_salt">鹽</string>
+	<string name="poi_resource_sand">沙子</string>
+	<string name="poi_resource_sandstone">砂岩</string>
+	<string name="poi_resource_silica">矽土</string>
+	<string name="poi_resource_silver">銀</string>
+	<string name="poi_resource_slate_iron_ore_copper">板岩; 鐵礦; 銅</string>
+	<string name="poi_resource_slate">板岩</string>
+	<string name="poi_resource_stone">石頭</string>
+	<string name="poi_resource_tin">錫</string>
+	<string name="poi_resource_tuff">凝灰岩</string>
+	<string name="poi_resource_uranium">鈾</string>
+	<string name="poi_resource_vanadium">釩</string>
+	<string name="poi_resource_water">水</string>
+	<string name="poi_resource_zinc">鋅</string>
+	<string name="poi_resource_zircon">鋯石</string>
+
+	<string name="poi_wetland_wet_meadow">濕草地</string>
+	<string name="poi_wetland_bog">泥沼</string>
+	<string name="poi_wetland_marsh">濕地</string>
+	<string name="poi_wetland_reedbed">蘆葦叢</string>
+	<string name="poi_wetland_swamp">沼澤</string>
+	<string name="poi_wetland_saltern">鹽田</string>
+	<string name="poi_animal_shelter">動物收容所</string>
+	<string name="poi_memorial_stolperstein">絆腳石</string>
+	<string name="poi_memorial_column">欄位</string>
+	<string name="poi_memorial_stupa">舍利塔</string>
+	<string name="poi_memorial_prasat">綠石英</string>
+
+	<string name="poi_wetland_tidalflat">泥潮灘</string>
+	<string name="poi_wetland_saltmarsh">鹽沼地</string>
+	<string name="poi_wetland_mangrove">紅樹林</string>
+	<string name="poi_wetland_string_bog">帶狀泥沼</string>
+	<string name="poi_wetland_fen">沼澤</string>
+	<string name="poi_wetland_palsa_bog">泥炭堆沼澤</string>
+	<string name="poi_wetland_mud">泥漿</string>
+
+	<string name="poi_beach_sand">海灘類型：沙子</string>
+	<string name="poi_beach_shingle">海灘類型：扁礫石</string>
+	<string name="poi_beach_rocky">海灘類型：多岩的</string>
+
+	<string name="poi_chimney">煙囪</string>
+	<string name="poi_palm">棕櫚</string>
+	<string name="poi_cypress">柏樹</string>
 	</resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index dd1b8c7b63..dff0d5a8bc 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2156,4 +2156,7 @@
     <string name="world_maps">世界地圖</string>
     <string name="world_regions">全球地區</string>
     <string name="downloads">下載</string>
-</resources>
+<string name="favorite_category_dublicate_message">已有指定的類別名稱。請定義其它名稱。</string>
+    <string name="favorite_category_name">類別名稱</string>
+    <string name="favorite_category_add_new_title">增加新的類別</string>
+    </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 3e595888b2..b69c0f92c5 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1215,10 +1215,11 @@
 	<string name="poi_enforcement_access">Enforcement: access</string>
 	<string name="poi_enforcement_toll">Enforcement: toll</string>
 
-	<string name="poi_animal_shelter_dog">Dog shelter</string>
-	<string name="poi_animal_shelter_cat">Cat shelter</string>
-	<string name="poi_animal_shelter_dog_cat">Dog and cat shelter</string>
-	<string name="poi_animal_shelter_bird">Bird shelter</string>
+	<string name="poi_animal_shelter">Animal shelter</string>
+	<string name="poi_animal_shelter_dog">Shelter type: dog</string>
+	<string name="poi_animal_shelter_cat">Shelter type: cat</string>
+	<string name="poi_animal_shelter_dog_cat">Shelter type: dog, cat</string>
+	<string name="poi_animal_shelter_bird">Shelter type: bird</string>
 
 	<string name="poi_seats">Seats</string>
 	<string name="poi_backrest_yes">Backrest: yes</string>
@@ -1313,7 +1314,7 @@
 	<string name="poi_mini_roundabout">Mini roundabout</string>
 	<string name="poi_railway_crossing">Railroad crossing</string>
 	<string name="poi_railway_level_crossing">Level crossing</string>
-	<string name="poi_bird_hide">Bird hide</string>
+	<string name="poi_bird_hide">Place to observe birds</string>
 	<string name="poi_horse_riding">Horse riding</string>
 	<string name="poi_leisure_common">Common leisure area</string>
 	<string name="poi_garden">Garden</string>
@@ -1692,7 +1693,11 @@
 	<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_stolperstein">Stolperstein</string>
 	<string name="poi_memorial_obelisk">Obelisk</string>
+	<string name="poi_memorial_column">Column</string>
+	<string name="poi_memorial_stupa">Stupa</string>
+	<string name="poi_memorial_prasat">Prasat</string>
 
 	<string name="poi_inscription">Inscription</string>
 	<string name="poi_historic_quarry">Historic quarry</string>
@@ -1900,4 +1905,98 @@
 	<string name="poi_surface_salt">Surface: salt</string>
 	<string name="poi_surface_snow">Surface: snow</string>
 
+	<string name="poi_route_bus_ref">Bus</string>
+	<string name="poi_route_share_taxi_ref">Share taxi</string>
+	<string name="poi_route_trolleybus_ref">Trolleybus</string>
+	<string name="poi_route_tram_ref">Tram</string>
+	<string name="poi_route_train_ref">Train</string>
+	<string name="poi_route_light_rail_ref">Light rail</string>
+	<string name="poi_route_monorail_ref">Monorail</string>
+	<string name="poi_route_funicular_ref">Funicular</string>
+	<string name="poi_route_ferry_ref">Ferry</string>
+
+	<string name="poi_route_railway_ref">Route of a railway</string>
+
+	<string name="poi_historic_yes">Historical object</string>
+	<string name="poi_surveillance_yes">Surveillance: yes</string>
+	<string name="poi_shop_yes">With shop</string>
+
+	<string name="poi_service_bicycle_retail_yes">Bicycle retail: yes</string>
+	<string name="poi_service_bicycle_retail_no">Bicycle retail: no</string>
+	<string name="poi_service_bicycle_repair_yes">Bicycle repair: yes</string>
+	<string name="poi_service_bicycle_repair_no">Bicycle repair: no</string>
+	<string name="poi_service_bicycle_rental_yes">Bicycle rental: yes</string>
+	<string name="poi_service_bicycle_rental_no">Bicycle rental: no</string>
+	<string name="poi_service_bicycle_pump_yes">Bicycle pump: yes</string>
+	<string name="poi_service_bicycle_pump_no">Bicycle pump: no</string>
+	<string name="poi_service_bicycle_diy_yes">Bicycle tools for DIY repair: yes</string>
+	<string name="poi_service_bicycle_diy_no">Bicycle tools for DIY repair: no</string>
+	<string name="poi_service_bicycle_cleaning_yes">Bicycle cleaning: yes</string>
+	<string name="poi_service_bicycle_cleaning_no">Bicycle cleaning: no</string>
+	<string name="poi_service_bicycle_chaintool_yes">Bicycle chaintool: yes</string>
+	<string name="poi_service_bicycle_chaintool_no">Bicycle chaintool: no</string>
+	<string name="poi_service_bicycle_second_hand_yes">Retail sale of second-hand bicycles: yes</string>
+	<string name="poi_service_bicycle_second_hand_no">Retail sale of second-hand bicycles: no</string>
+
+	<string name="poi_wildlife_hide">Place to observe wildlife</string>
+
+	<string name="poi_training_language">Training: language</string>
+	<string name="poi_training_music">Training: music</string>
+	<string name="poi_training_dance">Training: dance</string>
+	<string name="poi_training_sport">Training: sport</string>
+	<string name="poi_training_art">Training: art</string>
+	<string name="poi_training_cooking">Training: cooking</string>
+	<string name="poi_training_computer">Training: computer</string>
+	<string name="poi_training_yoga">Training: yoga</string>
+	<string name="poi_training_martial_art">Training: martial art</string>
+	<string name="poi_training_aviation">Training: aviation</string>
+	<string name="poi_training_hairdressing">Training: hairdressing</string>
+
+	<string name="poi_monument_yes">Monumental object</string>
+
+	<string name="poi_industrial_oil">Type: oil industry</string>
+	<string name="poi_industrial_wellsite">Type: wellsite</string>
+	<string name="poi_industrial_factory">Type: factory</string>
+	<string name="poi_industrial_gas">Type: gas industry</string>
+	<string name="poi_industrial_timber">Type: timber</string>
+	<string name="poi_industrial_refinery">Type: refinery</string>
+	<string name="poi_industrial_warehouse">Type: warehouse</string>
+	<string name="poi_industrial_auto_wrecker">Type: auto wrecker</string>
+	<string name="poi_industrial_agriculture">Type: agriculture</string>
+	<string name="poi_industrial_brewery">Type: brewery</string>
+	<string name="poi_industrial_brickyard">Type: brickyard</string>
+	<string name="poi_industrial_intermodal_freight_terminal">Type: intermodal freight terminal</string>
+	<string name="poi_industrial_sawmill">Type: sawmill</string>
+	<string name="poi_industrial_water_purification">Type: water purification</string>
+	<string name="poi_industrial_port">Type: port</string>
+	<string name="poi_industrial_depot">Type: depot</string>
+
+	<string name="poi_note">Note</string>
+	<string name="poi_watering_place">Watering place</string>
+	<string name="poi_animal_boarding">Animal boarding</string>
+	<string name="poi_animal_boarding_dog">Boarding type: dog</string>
+	<string name="poi_animal_boarding_cat">Boarding type: cat</string>
+	<string name="poi_animal_boarding_dog_cat">Boarding type: dog, cat</string>
+	<string name="poi_animal_boarding_horse">Boarding type: horse</string>
+
+	<string name="poi_historic_aircraft">Historic aircraft</string>
+
+	<string name="poi_honey">Honey store</string>
+
+	<string name="poi_elevator_yes">With elevator</string>
+	<string name="poi_elevator_no">Without elevator</string>
+
+	<string name="poi_technical_monument">Technical monument</string>
+
+	<string name="poi_office_camping">Camping office</string>
+	<string name="poi_model_aerodrome">Model aerodrome</string>
+	<string name="poi_guide">Guide office</string>
+	<string name="poi_quango">Quango</string>
+	<string name="poi_consulting">Consulting office</string>
+	<string name="poi_cooperative">Cooperative office</string>
+	<string name="poi_office_forestry">Forestry office</string>
+	<string name="poi_logistics">Logistics office</string>
+	<string name="poi_parish">Parish office</string>
+	<string name="poi_publisher">Publishing office</string>
+
 </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9da6a4085a..aaf40ab7e6 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,9 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="favorite_category_dublicate_message">Specified category name already exists. Please define other name.</string>
+    <string name="favorite_category_name">Category name</string>
+    <string name="favorite_category_add_new_title">Add new category</string>
     <string name="regions">Regions</string>
     <string name="additional_maps">Additional maps</string>
     <string name="region_maps">Region maps</string>
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 01e2c35963..c3ddddf135 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -411,13 +411,21 @@ public class FavouritesDbHelper {
 	}
 
 	
-	private void addEmptyCategory(String name) {
+	public void addEmptyCategory(String name) {
 		FavoriteGroup group = new FavoriteGroup();
 		group.name = name;
 		favoriteGroups.add(group);
 		flatGroups.put(name, group);
 	}
 
+	public void addEmptyCategory(String name, int color) {
+		FavoriteGroup group = new FavoriteGroup();
+		group.name = name;
+		group.color = color;
+		favoriteGroups.add(group);
+		flatGroups.put(name, group);
+	}
+
 	public List<FavouritePoint> getFavouritePoints() {
 		return cachedFavoritePoints;
 	}
@@ -427,6 +435,16 @@ public class FavouritesDbHelper {
 		return favoriteGroups;
 	}
 
+	public boolean groupExists(String name) {
+		String nameLowercase = name.toLowerCase();
+		for (String groupName : flatGroups.keySet()) {
+			if (groupName.toLowerCase().equals(nameLowercase)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public FavoriteGroup getGroup(FavouritePoint p) {
 		if (flatGroups.containsKey(p.getCategory())) {
 			return flatGroups.get(p.getCategory());
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index f0a11418f2..a27308683c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -38,6 +38,7 @@ import net.osmand.access.AccessibleActivity;
 import net.osmand.access.AccessibleToast;
 import net.osmand.access.MapAccessibilityActions;
 import net.osmand.core.android.AtlasMapRendererView;
+import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
@@ -67,6 +68,7 @@ import net.osmand.plus.helpers.GpxImportHelper;
 import net.osmand.plus.helpers.WakeLockHelper;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
+import net.osmand.plus.mapcontextmenu.editors.PointEditor;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
 import net.osmand.plus.routing.RoutingHelper;
@@ -544,8 +546,12 @@ public class MapActivity extends AccessibleActivity {
 			}
 			if (mapLabelToShow != null) {
 				mapLayers.getContextMenuLayer().setSelectedObject(toShow);
-				mapLayers.getContextMenuLayer().setLocation(latLonToShow,
-						mapLabelToShow.getFullPlainName(this));
+				if (toShow instanceof FavouritePoint) {
+					mapLayers.getContextMenuLayer().showContextMenuForSelectedObjects(latLonToShow);
+				} else {
+					mapLayers.getContextMenuLayer().setLocation(latLonToShow,
+							mapLabelToShow.getFullPlainName(this));
+				}
 			}
 			if (!latLonToShow.equals(cur)) {
 				mapView.getAnimatedDraggingThread().startMoving(latLonToShow.getLatitude(),
@@ -992,6 +998,13 @@ public class MapActivity extends AccessibleActivity {
 		return favoritePointEditor;
 	}
 
+	public PointEditor getPointEditor(String tag) {
+		if (favoritePointEditor != null && favoritePointEditor.getFragmentTag().equals(tag)) {
+			return favoritePointEditor;
+		}
+		return null;
+	}
+
 	public void openDrawer() {
 		drawerLayout.openDrawer(Gravity.LEFT);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
index 74ac062f54..a7c9986887 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
@@ -6,17 +6,26 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import static android.util.TypedValue.COMPLEX_UNIT_DIP;
+
 public class ColorDialogs {
 	public static int[] paletteColors = new int[] {
 			R.string.color_red,
@@ -89,7 +98,53 @@ public class ColorDialogs {
 		colorSpinner.setOnItemSelectedListener(listener);
 		colorSpinner.setSelection(selection);
 	}
-	
+
+	public static void setupColorSpinnerEx(final Activity ctx, int selectedColor, final Spinner colorSpinner,
+										   final TIntArrayList colors, OnItemSelectedListener listener) {
+		colors.add(pallette);
+		List<String> colorNames = new ArrayList<String>();
+		int selection = -1;
+		for (int i = 0; i < pallette.length; i++) {
+			colorNames.add(ctx.getString(paletteColors[i]));
+			colors.add(pallette[i]);
+			if (selectedColor == pallette[i]) {
+				selection = i;
+			}
+		}
+		if (selection == -1) {
+			colors.insert(0, selectedColor);
+			colorNames.add(0, colorToString(selectedColor));
+			selection = 0;
+		}
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(ctx, R.layout.color_spinner_item, colorNames) {
+			@Override
+			public View getView(int position, View convertView, ViewGroup parent) {
+				View v = super.getView(position, convertView, parent);
+				if (v instanceof TextView) {
+					TextView textView = (TextView) v;
+					textView.setCompoundDrawablesWithIntrinsicBounds(getIcon(ctx, R.drawable.ic_action_folder, colors.get(position)), null, null, null);
+					textView.setCompoundDrawablePadding(dpToPx(ctx, 15f));
+				}
+				return v;
+			}
+
+			@Override
+			public View getDropDownView(int position, View convertView, ViewGroup parent) {
+				View v = super.getView(position, convertView, parent);
+				if (v instanceof TextView) {
+					TextView textView = (TextView) v;
+					textView.setCompoundDrawablesWithIntrinsicBounds(getIcon(ctx, R.drawable.ic_action_circle, colors.get(position)), null, null, null);
+					textView.setCompoundDrawablePadding(dpToPx(ctx, 15f));
+				}
+				return v;
+			}
+		};
+		adapter.setDropDownViewResource(R.layout.color_spinner_dropdown_item);
+		colorSpinner.setAdapter(adapter);
+		colorSpinner.setOnItemSelectedListener(listener);
+		colorSpinner.setSelection(selection);
+	}
+
 	public static int getRandomColor() {
 		return pallette[new Random().nextInt(pallette.length)];
 	}
@@ -109,4 +164,21 @@ public class ColorDialogs {
 		}
 		return "#" + c; //$NON-NLS-1$
 	}
+
+	private static Drawable getIcon(final Activity activity, int resId, int color) {
+		OsmandApplication app = (OsmandApplication)activity.getApplication();
+		Drawable d = app.getResources().getDrawable(resId).mutate();
+		d.clearColorFilter();
+		d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+		return d;
+	}
+
+	private static int dpToPx(final Activity activity, float dp) {
+		Resources r = activity.getResources();
+		return (int) TypedValue.applyDimension(
+				COMPLEX_UNIT_DIP,
+				dp,
+				r.getDisplayMetrics()
+		);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index fb44016240..9df81da3cd 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -16,6 +16,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
@@ -423,10 +424,15 @@ public class WaypointDialogHelper {
 			if(ctx.getDashboard().isVisible()) {
 				ctx.getDashboard().hideDashboard();
 				ctx.getMapLayers().getContextMenuLayer().setSelectedObject(locationPoint);
-				ctx.getMapLayers()
-						.getContextMenuLayer()
-						.setLocation(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()),
-								PointDescription.getSimpleName(locationPoint, ctx));
+				if (locationPoint instanceof FavouritePoint) {
+					ctx.getMapLayers().getContextMenuLayer()
+							.showContextMenuForSelectedObjects(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()));
+				} else {
+					ctx.getMapLayers()
+							.getContextMenuLayer()
+							.setLocation(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()),
+									PointDescription.getSimpleName(locationPoint, ctx));
+				}
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditor.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditor.java
index 73b6278456..cf373f4743 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditor.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditor.java
@@ -7,6 +7,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.widgets.AutoCompleteTextViewEx;
 
 public abstract class PointEditor {
 
@@ -59,4 +60,12 @@ public abstract class PointEditor {
 		if (fragment != null)
 			((PointEditorFragment)fragment).dismiss();
 	}
+
+	public void setCategory(String name) {
+		Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(getFragmentTag());
+		if (fragment != null) {
+			PointEditorFragment editorFragment = (PointEditorFragment) fragment;
+			editorFragment.setCategory(name);
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
index 5caa58f7d1..6f1c9edb3c 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@@ -108,8 +108,8 @@ public abstract class PointEditorFragment extends Fragment {
 			public boolean onTouch(final View v, MotionEvent event) {
 				if (event.getAction() == MotionEvent.ACTION_UP) {
 					DialogFragment dialogFragment =
-							SelectCategoryDialogFragment.createInstance();
-					dialogFragment.show(getChildFragmentManager(), "SelectCategoryDialogFragment");
+							SelectCategoryDialogFragment.createInstance(getEditor().getFragmentTag());
+					dialogFragment.show(getChildFragmentManager(), SelectCategoryDialogFragment.TAG);
 					return true;
 				}
 				return false;
@@ -231,7 +231,6 @@ public abstract class PointEditorFragment extends Fragment {
 		AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) getView().findViewById(R.id.category_edit);
 		String name = categoryEdit.getText().toString().trim();
 		return name.equals(getString(R.string.shared_string_favorites)) ? "" : name;
-
 	}
 
 	public String getDescriptionTextValue() {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/EditCategoryDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/EditCategoryDialogFragment.java
new file mode 100644
index 0000000000..204df79cb7
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/EditCategoryDialogFragment.java
@@ -0,0 +1,173 @@
+package net.osmand.plus.mapcontextmenu.editors.dialogs;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.ColorDialogs;
+import net.osmand.plus.mapcontextmenu.MapContextMenuFragment;
+import net.osmand.plus.mapcontextmenu.editors.PointEditor;
+import net.osmand.util.Algorithms;
+
+import gnu.trove.list.array.TIntArrayList;
+
+public class EditCategoryDialogFragment extends DialogFragment {
+
+	public static final String TAG = "EditCategoryDialogFragment";
+
+	private static final String KEY_CTX_EDIT_CAT_EDITOR_TAG = "key_ctx_edit_cat_editor_tag";
+	private static final String KEY_CTX_EDIT_CAT_NEW = "key_ctx_edit_cat_new";
+	private static final String KEY_CTX_EDIT_CAT_NAME = "key_ctx_edit_cat_name";
+	private static final String KEY_CTX_EDIT_CAT_COLOR = "key_ctx_edit_cat_color";
+
+	private String editorTag;
+	private boolean isNew = true;
+	private String name = "";
+	private int color;
+
+	private EditText nameEdit;
+	private Spinner colorSpinner;
+
+	FavouritesDbHelper helper;
+
+	@NonNull
+	@Override
+	public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+		helper = ((OsmandApplication) getActivity().getApplication()).getFavorites();
+
+		color = ColorDialogs.pallette[0];
+
+		if (savedInstanceState != null) {
+			restoreState(savedInstanceState);
+		} else if (getArguments() != null) {
+			restoreState(getArguments());
+		}
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		builder.setTitle(R.string.favorite_category_add_new_title);
+		final View v = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_edit_dialog, null, false);
+
+		nameEdit = (EditText)v.findViewById(R.id.edit_name);
+		nameEdit.setText(name);
+
+		colorSpinner = (Spinner)v.findViewById(R.id.edit_color);
+		final TIntArrayList colors = new TIntArrayList();
+		final int intColor = color;
+		ColorDialogs.setupColorSpinnerEx(getActivity(), intColor, colorSpinner, colors, new AdapterView.OnItemSelectedListener() {
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+				color = colors.get(position);
+				colorSpinner.invalidate();
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+			}
+		});
+
+		builder.setView(v);
+		builder.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) { }
+		});
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
+
+		return builder.create();
+	}
+
+	@Override
+	public void onStart()
+	{
+		super.onStart();
+		final AlertDialog d = (AlertDialog)getDialog();
+		if(d != null)
+		{
+			Button positiveButton = d.getButton(Dialog.BUTTON_POSITIVE);
+			positiveButton.setOnClickListener(new View.OnClickListener()
+			{
+				@Override
+				public void onClick(View v)
+				{
+					name = nameEdit.getText().toString().trim();
+					if (!helper.groupExists(name)) {
+						helper.addEmptyCategory(name, color);
+						PointEditor editor = ((MapActivity) getActivity()).getPointEditor(editorTag);
+						if (editor != null) {
+							editor.setCategory(name);
+						}
+						d.dismiss();
+					} else {
+						AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+						b.setMessage(getString(R.string.favorite_category_dublicate_message));
+						b.setNegativeButton(R.string.shared_string_ok, null);
+						b.show();
+					}
+				}
+			});
+		}
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState) {
+		saveState(outState);
+		super.onSaveInstanceState(outState);
+	}
+
+	public static EditCategoryDialogFragment createInstance(String editorTag) {
+		EditCategoryDialogFragment fragment = new EditCategoryDialogFragment();
+		Bundle bundle = new Bundle();
+		bundle.putString(KEY_CTX_EDIT_CAT_EDITOR_TAG, editorTag);
+		fragment.setArguments(bundle);
+		return fragment;
+	}
+
+	public static EditCategoryDialogFragment createInstance(String editorTag, FavoriteGroup group) {
+		EditCategoryDialogFragment fragment = new EditCategoryDialogFragment();
+		Bundle bundle = new Bundle();
+		bundle.putString(KEY_CTX_EDIT_CAT_EDITOR_TAG, editorTag);
+		bundle.putString(KEY_CTX_EDIT_CAT_NEW, Boolean.valueOf(false).toString());
+		bundle.putString(KEY_CTX_EDIT_CAT_NAME, group.name);
+		bundle.putString(KEY_CTX_EDIT_CAT_COLOR, "" + group.color);
+		fragment.setArguments(bundle);
+		return fragment;
+	}
+
+	public void saveState(Bundle bundle) {
+		bundle.putString(KEY_CTX_EDIT_CAT_EDITOR_TAG, editorTag);
+		bundle.putString(KEY_CTX_EDIT_CAT_NEW, Boolean.valueOf(isNew).toString());
+		bundle.putString(KEY_CTX_EDIT_CAT_NAME, nameEdit.getText().toString().trim());
+		bundle.putString(KEY_CTX_EDIT_CAT_COLOR, "" + color);
+	}
+
+	public void restoreState(Bundle bundle) {
+		editorTag = bundle.getString(KEY_CTX_EDIT_CAT_EDITOR_TAG);
+		String isNewStr = bundle.getString(KEY_CTX_EDIT_CAT_NEW);
+		if (isNewStr != null) {
+			isNew = Boolean.valueOf(isNewStr);
+		}
+		name = bundle.getString(KEY_CTX_EDIT_CAT_NAME);
+		if (name == null) {
+			name = "";
+		}
+
+		String colorStr = bundle.getString(KEY_CTX_EDIT_CAT_COLOR);
+		if (!Algorithms.isEmpty(colorStr)) {
+			color = Integer.parseInt(colorStr);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java
index ed1ad33a4c..87f4134ac0 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java
@@ -3,29 +3,47 @@ package net.osmand.plus.mapcontextmenu.editors.dialogs;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.mapcontextmenu.editors.PointEditor;
 import net.osmand.plus.mapcontextmenu.editors.PointEditorFragment;
 
 import java.util.List;
 
+import static android.util.TypedValue.COMPLEX_UNIT_DIP;
+
 public class SelectCategoryDialogFragment extends DialogFragment {
 
+	public static final String TAG = "SelectCategoryDialogFragment";
+
+	private static final String KEY_CTX_SEL_CAT_EDITOR_TAG = "key_ctx_sel_cat_editor_tag";
+
+	private String editorTag;
+
 	@NonNull
 	@Override
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+		if (savedInstanceState != null) {
+			restoreState(savedInstanceState);
+		} else if (getArguments() != null) {
+			restoreState(getArguments());
+		}
+
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setTitle(R.string.favorite_category_select);
 		final View v = getActivity().getLayoutInflater().inflate(R.layout.favorite_categories_dialog, null, false);
@@ -36,34 +54,38 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 		List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups();
 		for (final FavouritesDbHelper.FavoriteGroup category : gs) {
 			View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
-			ImageView icon = (ImageView)itemView.findViewById(R.id.image_view);
-			if (category.color != 0) {
-				icon.setImageDrawable(getIcon(getActivity(), R.drawable.ic_action_folder, category.color));
-			} else {
-				icon.setImageDrawable(getIcon(getActivity(), R.drawable.ic_action_folder));
-			}
 			Button button = (Button)itemView.findViewById(R.id.button);
+			if (category.color != 0) {
+				button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.ic_action_folder, category.color), null, null, null);
+			} else {
+				button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.ic_action_folder), null, null, null);
+			}
+			button.setCompoundDrawablePadding(dpToPx(15f));
 			String name = category.name.length() == 0 ? getString(R.string.shared_string_favorites) : category.name;
 			button.setText(name);
 			button.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					((PointEditorFragment) getParentFragment()).setCategory(category.name);
+					PointEditor editor = ((MapActivity) getActivity()).getPointEditor(editorTag);
+					if (editor != null) {
+						editor.setCategory(category.name);
+					}
 					dismiss();
 				}
 			});
 			ll.addView(itemView);
 		}
 		View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
-		ImageView icon = (ImageView)itemView.findViewById(R.id.image_view);
-		icon.setImageDrawable(getIcon(getActivity(), R.drawable.map_zoom_in));
 		Button button = (Button)itemView.findViewById(R.id.button);
+		button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.map_zoom_in), null, null, null);
+		button.setCompoundDrawablePadding(dpToPx(15f));
 		button.setText(getActivity().getResources().getText(R.string.favorite_category_add_new));
 		button.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				//((PointEditorFragment) getParentFragment()).setCategory(null);
-				//dismiss();
+				dismiss();
+				DialogFragment dialogFragment = EditCategoryDialogFragment.createInstance(editorTag);
+				dialogFragment.show(getActivity().getSupportFragmentManager(), EditCategoryDialogFragment.TAG);
 			}
 		});
 		ll.addView(itemView);
@@ -74,8 +96,20 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 		return builder.create();
 	}
 
-	public static SelectCategoryDialogFragment createInstance() {
-		return new SelectCategoryDialogFragment();
+	public static SelectCategoryDialogFragment createInstance(String editorTag) {
+		SelectCategoryDialogFragment fragment = new SelectCategoryDialogFragment();
+		Bundle bundle = new Bundle();
+		bundle.putString(KEY_CTX_SEL_CAT_EDITOR_TAG, editorTag);
+		fragment.setArguments(bundle);
+		return fragment;
+	}
+
+	public void saveState(Bundle bundle) {
+		bundle.putString(KEY_CTX_SEL_CAT_EDITOR_TAG, editorTag);
+	}
+
+	public void restoreState(Bundle bundle) {
+		editorTag = bundle.getString(KEY_CTX_SEL_CAT_EDITOR_TAG);
 	}
 
 	private static Drawable getIcon(final Activity activity, int iconId) {
@@ -93,4 +127,13 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 		d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
 		return d;
 	}
+
+	private int dpToPx(float dp) {
+		Resources r = getActivity().getResources();
+		return (int) TypedValue.applyDimension(
+				COMPLEX_UNIT_DIP,
+				dp,
+				r.getDisplayMetrics()
+		);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
index c337b1c1da..7bea6b9cc7 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
@@ -189,40 +189,6 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 		}
 		return null;
 	}
-	
-	@Override
-	public void populateObjectContextMenu(Object o, ContextMenuAdapter adapter) {
-		if(o instanceof FavouritePoint) {
-			final FavouritePoint a = (FavouritePoint) o;
-			OnContextMenuClick listener = new ContextMenuAdapter.OnContextMenuClick() {
-				@Override
-				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-					if (itemId == R.string.favourites_context_menu_edit) {
-						FavoritesTreeFragment.editPoint(view.getContext(), a, null);
-					} else if (itemId == R.string.favourites_context_menu_delete) {
-						final Resources resources = view.getContext().getResources();
-						Builder builder = new AlertDialog.Builder(view.getContext());
-						builder.setMessage(resources.getString(R.string.favourites_remove_dialog_msg, a.getName()));
-						builder.setNegativeButton(R.string.shared_string_no, null);
-						builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								favorites.deleteFavourite(a);
-								view.refreshMap();
-							}
-						});
-						builder.create().show();
-					}
-					return true;
-				}
-			};
-			adapter.item(R.string.favourites_context_menu_edit).iconColor(R.drawable.ic_action_edit_dark)
-					.listen(listener).reg();
-			adapter.item(R.string.favourites_context_menu_delete)
-						.iconColor(R.drawable.ic_action_delete_dark).listen(listener)
-						.reg();
-		}
-	}
 
 	@Override
 	public LatLon getTextLocation(LocationPoint o) {