diff --git a/OsmAnd/res/layout-land/empty_state_favourites.xml b/OsmAnd/res/layout-land/empty_state_favourites.xml
index e3a77b04ab..4f28f53214 100644
--- a/OsmAnd/res/layout-land/empty_state_favourites.xml
+++ b/OsmAnd/res/layout-land/empty_state_favourites.xml
@@ -8,23 +8,23 @@
               android:orientation="horizontal">
 
     <ImageView
-        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
-        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
-        android:layout_marginLeft="@dimen/my_places_empty_state_image_margin_left"
-        android:layout_marginStart="@dimen/my_places_empty_state_image_margin_left"
+        android:layout_marginLeft="@dimen/empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/empty_state_image_margin_left"
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        tools:src="@drawable/ic_empty_state_favorites_night_result"/>
+        tools:src="@drawable/ic_empty_state_favorites_night"/>
 
     <LinearLayout
         android:clipToPadding="false"
-        android:paddingLeft="@dimen/my_places_empty_state_text_button_padding_left"
-        android:paddingStart="@dimen/my_places_empty_state_text_button_padding_left"
-        android:paddingRight="@dimen/my_places_empty_state_text_button_padding_right"
-        android:paddingEnd="@dimen/my_places_empty_state_text_button_padding_right"
-        android:paddingTop="@dimen/my_places_empty_state_text_button_padding_top"
+        android:paddingLeft="@dimen/empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/empty_state_text_button_padding_top"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -32,11 +32,11 @@
         <net.osmand.plus.widgets.TextViewEx
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+            android:layout_marginBottom="@dimen/empty_state_text_interval"
             android:background="@null"
             android:text="@string/empty_state_favourites"
             android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/my_places_empty_state_text_size"
+            android:textSize="@dimen/empty_state_text_size"
             osmand:typeface="@string/font_roboto_medium"/>
 
         <TextView
@@ -45,12 +45,12 @@
             android:background="@null"
             android:text="@string/empty_state_favourites_desc"
             android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+            android:textSize="@dimen/empty_state_text_desc_size"/>
 
         <Button
             android:id="@+id/import_button"
             style="@style/DialogActionButton"
-            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+            android:layout_marginTop="@dimen/empty_state_button_margin_top"
             android:text="@string/shared_string_import"/>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout-land/empty_state_markers_active.xml b/OsmAnd/res/layout-land/empty_state_markers_active.xml
new file mode 100644
index 0000000000..6bd6230e40
--- /dev/null
+++ b/OsmAnd/res/layout-land/empty_state_markers_active.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:adjustViewBounds="true"
+        android:layout_marginLeft="@dimen/empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/empty_state_image_margin_left"
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        tools:src="@drawable/ic_empty_state_marker_list_night"/>
+
+    <LinearLayout
+        android:clipToPadding="false"
+        android:paddingLeft="@dimen/empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/empty_state_text_button_padding_top"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/empty_state_text_interval"
+            android:background="@null"
+            android:text="@string/empty_state_markers_active"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/empty_state_text_size"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_markers_active_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/empty_state_text_desc_size"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/empty_state_markers_groups.xml b/OsmAnd/res/layout-land/empty_state_markers_groups.xml
new file mode 100644
index 0000000000..d7e773cc43
--- /dev/null
+++ b/OsmAnd/res/layout-land/empty_state_markers_groups.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:adjustViewBounds="true"
+        android:layout_marginLeft="@dimen/empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/empty_state_image_margin_left"
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        tools:src="@drawable/ic_empty_state_marker_group_night"/>
+
+    <LinearLayout
+        android:clipToPadding="false"
+        android:paddingLeft="@dimen/empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/empty_state_text_button_padding_top"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/empty_state_text_interval"
+            android:background="@null"
+            android:text="@string/empty_state_markers_groups"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/empty_state_text_size"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_markers_groups_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/empty_state_text_desc_size"/>
+
+        <Button
+            android:id="@+id/import_button"
+            style="@style/DialogActionButton"
+            android:layout_marginTop="@dimen/empty_state_button_margin_top"
+            android:text="@string/shared_string_import"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/empty_state_markers_history.xml b/OsmAnd/res/layout-land/empty_state_markers_history.xml
new file mode 100644
index 0000000000..c423a8ee80
--- /dev/null
+++ b/OsmAnd/res/layout-land/empty_state_markers_history.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:adjustViewBounds="true"
+        android:layout_marginLeft="@dimen/empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/empty_state_image_margin_left"
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        tools:src="@drawable/ic_empty_state_marker_history_night"/>
+
+    <LinearLayout
+        android:clipToPadding="false"
+        android:paddingLeft="@dimen/empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/empty_state_text_button_padding_top"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/empty_state_text_interval"
+            android:background="@null"
+            android:text="@string/empty_state_markers_history"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/empty_state_text_size"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_markers_history_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/empty_state_text_desc_size"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/empty_state_my_tracks.xml b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
index 80863986be..15068df0a6 100644
--- a/OsmAnd/res/layout-land/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
@@ -8,23 +8,23 @@
               android:orientation="horizontal">
 
     <ImageView
-        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
-        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
-        android:layout_marginLeft="@dimen/my_places_empty_state_image_margin_left"
-        android:layout_marginStart="@dimen/my_places_empty_state_image_margin_left"
+        android:layout_marginLeft="@dimen/empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/empty_state_image_margin_left"
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        tools:src="@drawable/ic_empty_state_trip_night_result"/>
+        tools:src="@drawable/ic_empty_state_trip_night"/>
 
     <LinearLayout
         android:clipToPadding="false"
-        android:paddingLeft="@dimen/my_places_empty_state_text_button_padding_left"
-        android:paddingStart="@dimen/my_places_empty_state_text_button_padding_left"
-        android:paddingRight="@dimen/my_places_empty_state_text_button_padding_right"
-        android:paddingEnd="@dimen/my_places_empty_state_text_button_padding_right"
-        android:paddingTop="@dimen/my_places_empty_state_text_button_padding_top"
+        android:paddingLeft="@dimen/empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/empty_state_text_button_padding_top"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -32,11 +32,11 @@
         <net.osmand.plus.widgets.TextViewEx
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+            android:layout_marginBottom="@dimen/empty_state_text_interval"
             android:background="@null"
             android:text="@string/empty_state_my_tracks"
             android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/my_places_empty_state_text_size"
+            android:textSize="@dimen/empty_state_text_size"
             osmand:typeface="@string/font_roboto_medium"/>
 
         <TextView
@@ -45,12 +45,12 @@
             android:background="@null"
             android:text="@string/empty_state_my_tracks_desc"
             android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+            android:textSize="@dimen/empty_state_text_desc_size"/>
 
         <Button
             android:id="@+id/import_button"
             style="@style/DialogActionButton"
-            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+            android:layout_marginTop="@dimen/empty_state_button_margin_top"
             android:text="@string/shared_string_import"/>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/add_favourites_group_header.xml b/OsmAnd/res/layout/add_favourites_group_header.xml
new file mode 100644
index 0000000000..b141dbf862
--- /dev/null
+++ b/OsmAnd/res/layout/add_favourites_group_header.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+    <net.osmand.plus.widgets.TextViewEx
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_title_height"
+        android:gravity="center_vertical"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingStart="@dimen/content_padding"
+        tools:text="@string/gpx_track"
+        android:textAppearance="@style/TextAppearance.ListItemTitle"
+        osmand:typeface="@string/font_roboto_medium"/>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_descr_height"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingStart="@dimen/content_padding"
+        tools:text="@string/add_track_to_markers_descr"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="@dimen/default_desc_text_size"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_favourites.xml b/OsmAnd/res/layout/empty_state_favourites.xml
index ca57095bbc..647f454d8e 100644
--- a/OsmAnd/res/layout/empty_state_favourites.xml
+++ b/OsmAnd/res/layout/empty_state_favourites.xml
@@ -12,35 +12,35 @@
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
-        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
-        tools:src="@drawable/ic_empty_state_favorites_night_result"/>
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_favorites_night"/>
 
     <net.osmand.plus.widgets.TextViewEx
         osmand:typeface="@string/font_roboto_medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+        android:layout_marginBottom="@dimen/empty_state_text_interval"
         android:background="@null"
         android:text="@string/empty_state_favourites"
         android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/my_places_empty_state_text_size"/>
+        android:textSize="@dimen/empty_state_text_size"/>
 
     <TextView
         android:gravity="center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@null"
-        android:layout_marginLeft="@dimen/my_places_empty_state_text_desc_margin"
-        android:layout_marginRight="@dimen/my_places_empty_state_text_desc_margin"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
         android:text="@string/empty_state_favourites_desc"
         android:textColor="?android:attr/textColorSecondary"
-        android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+        android:textSize="@dimen/empty_state_text_desc_size"/>
 
     <Button
         android:id="@+id/import_button"
         style="@style/DialogActionButton"
-        android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+        android:layout_marginTop="@dimen/empty_state_button_margin_top"
         android:text="@string/shared_string_import"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_markers_active.xml b/OsmAnd/res/layout/empty_state_markers_active.xml
new file mode 100644
index 0000000000..7797398219
--- /dev/null
+++ b/OsmAnd/res/layout/empty_state_markers_active.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_marker_list_night"/>
+
+    <net.osmand.plus.widgets.TextViewEx
+        osmand:typeface="@string/font_roboto_medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/empty_state_text_interval"
+        android:background="@null"
+        android:text="@string/empty_state_markers_active"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/empty_state_text_size"/>
+
+    <TextView
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:text="@string/empty_state_markers_active_desc"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/empty_state_text_desc_size"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_markers_groups.xml b/OsmAnd/res/layout/empty_state_markers_groups.xml
new file mode 100644
index 0000000000..6d5a817bf8
--- /dev/null
+++ b/OsmAnd/res/layout/empty_state_markers_groups.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_marker_group_night"/>
+
+    <net.osmand.plus.widgets.TextViewEx
+        osmand:typeface="@string/font_roboto_medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/empty_state_text_interval"
+        android:background="@null"
+        android:text="@string/empty_state_markers_groups"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/empty_state_text_size"/>
+
+    <TextView
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:text="@string/empty_state_markers_groups_desc"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/empty_state_text_desc_size"/>
+
+    <Button
+        android:id="@+id/import_button"
+        style="@style/DialogActionButton"
+        android:layout_marginTop="@dimen/empty_state_button_margin_top"
+        android:text="@string/shared_string_import"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_markers_history.xml b/OsmAnd/res/layout/empty_state_markers_history.xml
new file mode 100644
index 0000000000..94ab69e18b
--- /dev/null
+++ b/OsmAnd/res/layout/empty_state_markers_history.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_marker_history_night"/>
+
+    <net.osmand.plus.widgets.TextViewEx
+        osmand:typeface="@string/font_roboto_medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/empty_state_text_interval"
+        android:background="@null"
+        android:text="@string/empty_state_markers_history"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/empty_state_text_size"/>
+
+    <TextView
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:text="@string/empty_state_markers_history_desc"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/empty_state_text_desc_size"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_my_tracks.xml b/OsmAnd/res/layout/empty_state_my_tracks.xml
index 2e9a969609..c82a21be74 100644
--- a/OsmAnd/res/layout/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout/empty_state_my_tracks.xml
@@ -12,18 +12,18 @@
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
-        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
-        tools:src="@drawable/ic_empty_state_trip_night_result"/>
+        android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_trip_night"/>
 
     <net.osmand.plus.widgets.TextViewEx
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+        android:layout_marginBottom="@dimen/empty_state_text_interval"
         android:background="@null"
         android:text="@string/empty_state_my_tracks"
         android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/my_places_empty_state_text_size"
+        android:textSize="@dimen/empty_state_text_size"
         osmand:typeface="@string/font_roboto_medium"/>
 
     <TextView
@@ -31,16 +31,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@null"
-        android:layout_marginLeft="@dimen/my_places_empty_state_text_desc_margin"
-        android:layout_marginRight="@dimen/my_places_empty_state_text_desc_margin"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
         android:text="@string/empty_state_my_tracks_desc"
         android:textColor="?android:attr/textColorSecondary"
-        android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+        android:textSize="@dimen/empty_state_text_desc_size"/>
 
     <Button
         android:id="@+id/import_button"
         style="@style/DialogActionButton"
-        android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+        android:layout_marginTop="@dimen/empty_state_button_margin_top"
         android:text="@string/shared_string_import"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_map_markers_active.xml b/OsmAnd/res/layout/fragment_map_markers_active.xml
new file mode 100644
index 0000000000..8059263bec
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_map_markers_active.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <net.osmand.plus.widgets.EmptyStateRecyclerView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/map_markers_recycler_view_padding_bottom"
+        android:clipToPadding="false"/>
+
+    <include layout="@layout/empty_state_markers_active"
+        android:id="@+id/empty_view"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_map_markers_groups.xml b/OsmAnd/res/layout/fragment_map_markers_groups.xml
new file mode 100644
index 0000000000..74911b1118
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:orientation="vertical">
+
+    <net.osmand.plus.widgets.EmptyStateRecyclerView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/fab_recycler_view_padding_bottom"
+        android:clipToPadding="false"/>
+
+    <include layout="@layout/empty_state_markers_groups"
+             android:id="@+id/empty_view"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/add_group_fab"
+        android:layout_gravity="bottom|right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_action_plus"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="normal"
+        app:useCompatPadding="true"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_map_markers_history.xml b/OsmAnd/res/layout/fragment_map_markers_history.xml
new file mode 100644
index 0000000000..99438ccd3f
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_map_markers_history.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <net.osmand.plus.widgets.EmptyStateRecyclerView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/map_markers_recycler_view_padding_bottom"
+        android:clipToPadding="false"/>
+
+    <include layout="@layout/empty_state_markers_history"
+             android:id="@+id/empty_view"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_marker_add_favourites_group_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_add_favourites_group_bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..3dd4b75cb7
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_marker_add_favourites_group_bottom_sheet_dialog.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/bg_color"
+              android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/favourites_group_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/bottom_sheet_content_padding_small"
+        android:clipToPadding="false"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <FrameLayout
+        android:id="@+id/close_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+        android:background="?attr/selectableItemBackground">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/shared_string_cancel"
+            android:textAllCaps="true"
+            android:textColor="?attr/color_dialog_buttons"
+            android:textSize="@dimen/default_desc_text_size"
+            android:textStyle="bold"/>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_marker_add_markers_group_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_add_markers_group_bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..baacf61b55
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_marker_add_markers_group_bottom_sheet_dialog.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/bg_color"
+              android:orientation="vertical">
+
+    <ScrollView
+        android:id="@+id/add_markers_group_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/add_group_title"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_title_height"
+                android:gravity="center_vertical"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
+                android:text="@string/add_group"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                osmand:typeface="@string/font_roboto_medium"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_descr_height"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
+                android:text="@string/add_group_descr"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_desc_text_size"/>
+
+            <LinearLayout
+                android:id="@+id/favourites_row"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_list_item_height"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="@dimen/bottom_sheet_list_item_height"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/favourites_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+                    android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+                    tools:src="@drawable/ic_action_fav_dark"/>
+
+                <TextView
+                    android:id="@+id/favourites_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:text="@string/favourites_group"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/waypoints_row"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_list_item_height"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="@dimen/bottom_sheet_list_item_height"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/waypoints_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+                    android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+                    tools:src="@drawable/ic_action_polygom_dark"/>
+
+                <TextView
+                    android:id="@+id/waypoints_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:text="@string/track_waypoints"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <FrameLayout
+        android:id="@+id/close_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+        android:background="?attr/selectableItemBackground">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/shared_string_close"
+            android:textAllCaps="true"
+            android:textColor="?attr/color_dialog_buttons"
+            android:textSize="@dimen/default_desc_text_size"
+            android:textStyle="bold"/>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/markers_group_view_holder.xml b/OsmAnd/res/layout/markers_group_view_holder.xml
new file mode 100644
index 0000000000..41f28e4ab8
--- /dev/null
+++ b/OsmAnd/res/layout/markers_group_view_holder.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/bottom_sheet_list_item_height"
+              android:background="?attr/selectableItemBackground"
+              android:minHeight="@dimen/bottom_sheet_list_item_height"
+              android:paddingEnd="@dimen/content_padding"
+              android:paddingLeft="@dimen/content_padding"
+              android:paddingRight="@dimen/content_padding"
+              android:paddingStart="@dimen/content_padding"
+              android:gravity="center_vertical">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+        android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+        tools:src="@drawable/ic_action_polygom_dark"/>
+
+    <TextView
+        android:id="@+id/name_text"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:ellipsize="end"
+        tools:text="Berlin trip"
+        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+
+    <TextView
+        android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+        android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+        android:id="@+id/number_count_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        tools:text="25"
+        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 2e70a6f985..3204fb9e43 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2948,4 +2948,6 @@
     <string name="coordinate_input_accuracy">%1$d лічбаў</string>
     <string name="go_to_next_field">Парайсці ў наступнае поле</string>
     <string name="rename_marker">Перайменаваць маркер</string>
+    <string name="shared_string_two">Два</string>
+    <string name="shared_string_one">Адзін</string>
     </resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 97b24509f7..c2a9830c29 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -2289,8 +2289,8 @@
 
 	<string name="poi_hygrometer_yes">Higròmetre</string>
 	<string name="poi_hygrometer_no">Higròmetre: no</string>
-	<string name="poi_fuel_type">Tipus</string>
-	<string name="poi_fuel_avia_type">Tipus</string>
+	<string name="poi_fuel_type">Tipus de combustible</string>
+	<string name="poi_fuel_avia_type">Tipus de combustible (avia)</string>
 	<string name="poi_payment_type">Tipus de pagament</string>
 	<string name="poi_payment_fuel_type">Targetes per carburants</string>
 	<string name="poi_additional_type">Addicional</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 21e884e1e0..da35ec83dc 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2950,4 +2950,10 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="coordinate_input_accuracy_description">Skift automatisk til det næste felt efter indtastning af %1$d cifre efter decimaltegnet</string>
     <string name="coordinate_input_accuracy">%1$d cifre</string>
     <string name="go_to_next_field">Gå til næste felt</string>
+    <string name="shared_string_two">To</string>
+    <string name="shared_string_one">En</string>
+    <string name="show_guide_line_descr">En linje, der forbinder din placering til placeringen af de aktive markører bliver vist på kortet.</string>
+    <string name="show_arrows_descr">En eller to pile, der angiver retningen til de aktive markører bliver vist på kortet.</string>
+    <string name="distance_indication_descr">Vælg hvordan afstanden til de aktive markører skal vises.</string>
+    <string name="active_markers_descr">Vælg hvor mange retningsindikatorer der vises.</string>
     </resources>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index b72d55784b..d713066ea9 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -845,7 +845,9 @@
 	<string name="foot">ft</string>
 	<string name="mile">mi</string>
 	<string name="send_location_way_choose_title">اشتراک‌گذاری مکان با</string>
-	<string name="send_location_sms_pattern">مکان: %1$s\n%2$s</string>
+	<string name="send_location_sms_pattern">موقعیت:
+\n%1$s
+\n%2$s</string>
 	<string name="send_location">ارسال مکان</string>
 	<string name="context_menu_item_share_location">اشتراک‌گذاری مکان</string>
 	<string name="indexing_address">در حال نمایه‌کردن نشانی…</string>
@@ -1650,7 +1652,7 @@
 	
 	<string name="share_note">به‌اشتراک‌گذاری یادداشت</string>
 	
-    <string name="location_on_map">مکان: 
+    <string name="location_on_map">موقعیت: 
 \n عرض %1$s 
 \n طول %2$s</string>
 	<string name="watch">مشاهده</string>
@@ -2939,4 +2941,10 @@
     <string name="coordinate_input_accuracy_description">پس از واردکردن %1$d رقم بعد از ممیز، به‌صورت خودکار خانۀ بعدی فعال شود</string>
     <string name="coordinate_input_accuracy">%1$d رقم</string>
     <string name="go_to_next_field">رفتن به خانهٔ بعدی</string>
+    <string name="shared_string_two">دو</string>
+    <string name="shared_string_one">یک</string>
+    <string name="show_guide_line_descr">خطی بین موقعیت شما و موقعیت نشانه‌ها، روی نقشه نشان داده می‌شود.</string>
+    <string name="show_arrows_descr">با یک یا دو پیکان، محل قرارگیری نشانه‌های فعال روی نقشه نشان داده می‌شود.</string>
+    <string name="distance_indication_descr">مشخص کنید که فاصلهٔ شما تا نشانه‌های فعال چگونه نشان داده شود.</string>
+    <string name="active_markers_descr">مشخص کنید چند پیکان جهت‌نما نشان داده شود.</string>
     </resources>
diff --git a/OsmAnd/res/values-he/phrases.xml b/OsmAnd/res/values-he/phrases.xml
index 8506c1cf80..118777878e 100644
--- a/OsmAnd/res/values-he/phrases.xml
+++ b/OsmAnd/res/values-he/phrases.xml
@@ -135,8 +135,8 @@
 	<string name="poi_trade">חנות מסחר</string>
 	<string name="poi_tyres">חנות צמיגים</string>
 	<string name="poi_vacuum_cleaner">חנות שואבי אבק</string>
-	<string name="poi_fuel_avia_type">סוג</string>
-	<string name="poi_fuel_type">סוג</string>
+	<string name="poi_fuel_avia_type">סוג דלק לתעופה</string>
+	<string name="poi_fuel_type">סוג הדלק</string>
 	<string name="poi_additional_type">נוסף</string>
 	<string name="poi_payment_type">סוג תשלום</string>
 	<string name="poi_bicycle_service">שירות אופניים</string>
@@ -787,4 +787,163 @@
 	<string name="poi_aerialway_chair_lift">מעלית סקי בישיבה</string>
 	<string name="poi_aerialway_drag_lift">מעלית סקי בגרירה</string>
 	<string name="poi_wastewater_plant">מפעל לטיהור שופכין</string>
+	<string name="poi_pharmacy_dispensing">חלוקה</string>
+	<string name="poi_sewing">חנות מזון יבש</string>
+	<string name="poi_fuel_hgv_diesel">דיזל למשאיות</string>
+	<string name="poi_fuel_1_50">דלק 1:50</string>
+	<string name="poi_fuel_e85">E85</string>
+	<string name="poi_railway_buffer_stop">אוטם מסילת רכבת</string>
+	<string name="poi_helipad">מנחת</string>
+	<string name="poi_aeroway_terminal">נמל תעופה</string>
+	<string name="poi_aeroway_gate">שער נמל תעופה</string>
+
+	<string name="poi_aerialway_station">תחנת נמל תעופה</string>
+	<string name="poi_cuisine">מטבח</string>
+	<string name="poi_cuisine_pizza">פיצה</string>
+	<string name="poi_cuisine_burger">המבורגר</string>
+	<string name="poi_cuisine_coffee">קפה</string>
+	<string name="poi_cuisine_sandwich">כריך</string>
+	<string name="poi_cuisine_kebab">קבב</string>
+	<string name="poi_cuisine_doner">דונר (שווארמה)</string>
+	<string name="poi_cuisine_chicken">עוף</string>
+	<string name="poi_cuisine_ice_cream">גלידה</string>
+	<string name="poi_cuisine_sushi">סושי</string>
+	<string name="poi_cuisine_fish_and_chips">פיש אנד צ׳יפס</string>
+	<string name="poi_cuisine_seafood">מאכלי ים</string>
+	<string name="poi_cuisine_barbecue">ברביקיו</string>
+	<string name="poi_cuisine_noodle">אטריות</string>
+	<string name="poi_cuisine_donut">דונאט</string>
+	<string name="poi_cuisine_ramen">ראמן</string>
+	<string name="poi_cuisine_crepe">קרפ</string>
+	<string name="poi_cuisine_breakfast">ארוחת בוקר</string>
+	<string name="poi_cuisine_beef_bowl">גיודון</string>
+	<string name="poi_cuisine_steak">סטייק</string>
+	<string name="poi_cuisine_tapas">טאפאס</string>
+	<string name="poi_cuisine_gastropub">גסטרופאב</string>
+	<string name="poi_cuisine_heuriger">הויריגר</string>
+	<string name="poi_cuisine_curry">קארי</string>
+	<string name="poi_cuisine_grill">על האש</string>
+	<string name="poi_cuisine_bagel">בייגל</string>
+	<string name="poi_cuisine_diner">מזללה</string>
+	<string name="poi_cuisine_sausage">נקניק</string>
+	<string name="poi_cuisine_cake">עוגה</string>
+	<string name="poi_cuisine_pancake">פנקייק</string>
+	<string name="poi_cuisine_pasta">פסטה</string>
+	<string name="poi_cuisine_fast_food">מזון מהיר</string>
+	<string name="poi_cuisine_juice">מיץ</string>
+	<string name="poi_cuisine_soba">סוֹבַּה</string>
+	<string name="poi_cuisine_fine_dining">גורמה</string>
+	<string name="poi_cuisine_tea">תה</string>
+	<string name="poi_cuisine_tea_shop">חנות תה</string>
+	<string name="poi_cuisine_soup">מרק</string>
+	<string name="poi_cuisine_pie">פאי</string>
+	<string name="poi_cuisine_hotdog">נקניקייה</string>
+	<string name="poi_cuisine_fondue">פונדו</string>
+	<string name="poi_cuisine_baguette">באגט</string>
+	<string name="poi_cuisine_pastel">פסטל</string>
+	<string name="poi_cuisine_burrito">בוריטו</string>
+	<string name="poi_cuisine_teriyaki">טריאקי</string>
+	<string name="poi_cuisine_peruvian">פרואני</string>
+	<string name="poi_cuisine_bolivian">בוליבי</string>
+	<string name="poi_cuisine_malagasy">מלזי</string>
+	<string name="poi_cuisine_hawaiian">הוואיי</string>
+	<string name="poi_cuisine_english">אנגלי</string>
+	<string name="poi_cuisine_pakistani">פקיסטני</string>
+	<string name="poi_cuisine_taiwanese">טאיוואני</string>
+	<string name="poi_cuisine_tex_mex">טקס-מקס</string>
+	<string name="poi_cuisine_dutch">הולנדי</string>
+	<string name="poi_cuisine_syrian">סורי</string>
+	<string name="poi_cuisine_australian">אוסטרלי</string>
+	<string name="poi_cuisine_cajun">קייג׳וני</string>
+	<string name="poi_cuisine_egyptian">מצרי</string>
+	<string name="poi_cuisine_senegalese">סנגלי</string>
+	<string name="poi_cuisine_jewish">יהודי</string>
+	<string name="poi_cuisine_tibetan">טיבטי</string>
+
+	<string name="poi_feeding_place">מקום להאכלת חיות</string>
+
+	<string name="poi_energy_supplier">משרד ספק אנרגיה</string>
+
+	<string name="poi_vhf">ערוץ VHF</string>
+
+	<string name="poi_operational_status_open">פתוח</string>
+	<string name="poi_operational_status_closed">סגור</string>
+	<string name="poi_operational_status_restricted">מוגבל</string>
+	<string name="poi_operational_status_broken">מקולקל</string>
+	<string name="poi_operational_status_needs_maintenance">נדרשת תחזוקה</string>
+
+	<string name="poi_water_place_durability_durable">עמידות נקודת המים: עמידה</string>
+	<string name="poi_water_place_durability_emergency">עמידות נקודת המים: בחירום</string>
+
+	<string name="poi_water_purification_none">אין</string>
+	<string name="poi_water_purification_chlorine">עם כלור</string>
+	<string name="poi_water_purification_reverse_osmosis">אוסמוזה הפוכה</string>
+	<string name="poi_water_purification_aquatabs">טבליות טיהור מים</string>
+
+	<string name="poi_water_supply_water_well">באר מים</string>
+	<string name="poi_water_supply_pipeline">צנרת</string>
+	<string name="poi_water_supply_running_water">מים זורמים</string>
+	<string name="poi_water_supply_pump">משאבה</string>
+	<string name="poi_water_supply_borehole">קידוח</string>
+	<string name="poi_water_supply_water_trucking">משאיות מים</string>
+	<string name="poi_water_supply_water_tank">מיכל מים</string>
+	<string name="poi_water_supply_bottled_water">מים בבקבוק</string>
+
+	<string name="poi_water_place_access_community">קהילה</string>
+	<string name="poi_water_place_access_family">משפחה</string>
+	<string name="poi_water_place_access_multifamilies">ריבוי משפחות</string>
+
+	<string name="poi_car_yes">מכונית: יש</string>
+	<string name="poi_car_no">מכונית: אין</string>
+	<string name="poi_bicycle_yes">אופניים: יש</string>
+	<string name="poi_bicycle_no">אופניים: אין</string>
+	<string name="poi_scooter_yes">קטנוע: יש</string>
+	<string name="poi_scooter_no">קטנוע: אין</string>
+	<string name="poi_truck_yes">משאית: יש</string>
+	<string name="poi_truck_no">משאית: אין</string>
+
+	<string name="poi_parking_fee_yes">עמלת חנייה: יש</string>
+	<string name="poi_parking_fee_no">עמלת חנייה: אין</string>
+	<string name="poi_parking_fee">עמלת חנייה</string>
+
+	<string name="poi_amperage">זרם חשמלי</string>
+	<string name="poi_charging_station_output">פלט תחנת הטעינה</string>
+
+	<string name="poi_map_type_topo">סוג המפה: טפוגרפית</string>
+	<string name="poi_map_type_street">סוג המפה: רחוב</string>
+	<string name="poi_map_type_scheme">סוג המפה: סכמה</string>
+	<string name="poi_map_type_toposcope">סוג המפה: כיוונים</string>
+	<string name="poi_map_size_site">גודל המפה: אתר</string>
+	<string name="poi_map_size_city">גודל המפה: עיר</string>
+	<string name="poi_map_size_region">גודל המפה: אזור</string>
+
+	<string name="poi_charging_station_filter">תחנת טעינה</string>
+
+<string name="poi_cuisine_deli">מעדנייה</string>
+	<string name="poi_cuisine_salad">סלט</string>
+	<string name="poi_cuisine_frozen_yogurt">פרוזן יוגורט</string>
+	<string name="poi_cuisine_fried_food">אוכל מטוגן</string>
+	<string name="poi_cuisine_savory_pancakes">פנקייקים מלוחים</string>
+	<string name="poi_cuisine_bistro">ביסטרו</string>
+	<string name="poi_cuisine_bakery">מאפייה</string>
+	<string name="poi_cuisine_couscous">קוסקוס</string>
+	<string name="poi_cuisine_fried_chicken">עוף מטוגן</string>
+	<string name="poi_cuisine_dessert">קינוח</string>
+	<string name="poi_cuisine_canteen">מזנון</string>
+	<string name="poi_cuisine_tacos">טאקוס</string>
+	<string name="poi_cuisine_piadina">פיאדינה</string>
+	<string name="poi_cuisine_falafel">פלאפל</string>
+	<string name="poi_cuisine_smoothie">פרי שייק</string>
+	<string name="poi_cuisine_souvlaki">סופלקי</string>
+	<string name="poi_cuisine_snack">חטיף</string>
+	<string name="poi_cuisine_yogurt">יוגורט</string>
+	<string name="poi_cuisine_gyros">גירוס</string>
+	<string name="poi_cuisine_empanada">אמפנדה</string>
+	<string name="poi_cuisine_crepes">קרפים</string>
+	<string name="poi_cuisine_yakiniku">יקיניקו</string>
+	<string name="poi_cuisine_suki">סוקי</string>
+	<string name="poi_cuisine_udon">אוּדוֹן</string>
+	<string name="poi_cuisine_brasserie">בראסרי</string>
+	<string name="poi_cuisine_bubble_tea">באבל טי</string>
+	<string name="poi_cuisine_yakitori">יקיטורי</string>
 	</resources>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index cf83b42826..bbbf71b944 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -2446,4 +2446,75 @@
     <string name="show_gpx">Ցույց տալ GPX</string>
     <string name="count_of_lines">Տողերի քանակը</string>
     <string name="are_you_sure">Վստա՞հ եք?</string>
+    <string name="osmo_group_information_desc">- Խմբի ստեղծման ժամանակ խնդրում ենք տալ անուն և լրացնել նկարագրությունը
+\n - Ծրագրային խումբից ստեղծվում են միայն Simple տիպի, կարդալ ավելին https://osmo.mobi/g/new կայքում
+\n - Կայքի միջոցով դուք կարող եք կառավարել խումբը, տեղադրել track-եր և կետեր բոլորի համար
+\n - Մենք չենք ողջունում խմբի օգտագործումը միայն մեկ օգտագործողի կողմից, եթե դա POI խումբ չէ
+\n - Անձնական խմբերն սահմանափակվում են 8 հոգու համար
+\n - Մանրամասն պայմանները միշտ հասանելի են OsMo.mobi կայքում 
+\n - Եթե Ձեզ անհրաժեշտ է հատուկ պայմաններ - խնդրում աջակցության համար դիմել՝ osmo.mobi@gmail.com</string>
+    <string name="show_view_angle">Ցուցադրել դիտարկման ուղղությունը</string>
+    <string name="map_tile_source_descr">Ընտրեք առցանց կամ պահված քարտեզի աղբյուրը:</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">Խնդրում ենք ակտիվացնել Ծովային քարտեզների plugin-ը</string>
+    <string name="activate_srtm_plugin">Խնդրում ենք ակտիվացնել SRTM plugin-ը</string>
+    <string name="later">Ավելի ուշ</string>
+    <string name="get_full_version">Ամբողջական տարբերակը</string>
+    <string name="downloads">Ներբեռնումներ</string>
+    <string name="confirm_download_roadmaps">Վստահ եք, որ ցանկանում եք ներբեռնել ճանապարհային քարտեզը, թեև արդեն ունեք ստանդարտ (ամբողջական) քարտեզ?</string>
+    <string name="value_downloaded_of_max">"%1$.1f   %2$.1f  ՄԲ"</string>
+    <string name="file_size_in_mb">%.1f ՄԲ</string>
+    <string name="update_all">"Թարմացնել բոլորը  (%1$s ՄԲ)"</string>
+    <string name="free_downloads_used">Օգտագործված է անվճար ներբեռնումներ</string>
+    <string name="free_downloads_used_description">Ցույց տալ օգտագործված անվճար ներբեռնումները։</string>
+    <string name="application_dir_description">Ընտրեք որտեղ եք ցանկանում պահել քարտեզների ֆայլերը և այլ տվյալներ:</string>
+    <string name="enter_country_name">Մուտքագրեք երկրի անունը</string>
+    <string name="new_version">Նոր տարբերակ</string>
+    <string name="begin_with_osmand_menu_group">Առաջին քայլերը OsmAnd-ի հետ</string>
+    <string name="features_menu_group">Հնարավորությունները</string>
+    <string name="help_us_to_improve_menu_group">Օգնեք մեզ բարելավել OsmAnd-ը</string>
+    <string name="other_menu_group">Այլ</string>
+    <string name="plugins_menu_group">Պլագիններ (Plugins)</string>
+    <string name="first_usage_item">Առաջին մեկնարկը</string>
+    <string name="first_usage_item_description">Ինչպես ներբեռնել քարտեզները, սահմանել հիմնական պարամետրերը:</string>
+    <string name="planning_trip_item">Ուղեւորության պլանավորում</string>
+    <string name="faq_item">Հաճախակի տրվող հարցեր (FAQ)</string>
+    <string name="faq_item_description">Հաճախակի տրվող հարցեր (FAQ)</string>
+    <string name="instalation_troubleshooting_item">Տեղադրում և խնդիրներ լուծում</string>
+    <string name="techical_articles_item">Տեխնիկական հոդվածներ</string>
+    <string name="versions_item">Տարբերակներ</string>
+    <string name="feedback">Արձագանք</string>
+    <string name="contact_us">Կապ մեզ հետ</string>
+    <string name="map_legend">Քարտեզի նշումներ</string>
+    <string name="save_poi_too_many_uppercase">Անունը պարունակում է չափազանց շատ մեծ տառեր: Դուք իսկապես ուզում եք շարունակել?</string>
+    <string name="save_poi_without_poi_type_message">Վստահ եք, որ ցանկանում եք POI-ին պահպանել առանց տեսակը նշելու?</string>
+    <string name="poi_context_menu_modify_osm_change">Խմբագրել POI</string>
+    <string name="use_dashboard_btn">Օգտագործել Վահանակը</string>
+    <string name="use_drawer_btn">Օգտագործել Մենյու</string>
+    <string name="dashboard_or_drawer_title">Վահանակը կամ Մենյու</string>
+    <string name="dashboard_or_drawer_description">Ստատիկ Մենյուի փոխարեն, դուք կարող եք օգտագործել նոր ինտերֆեյսը որպես Վահանակ էջ: Ձեր ընտրությունը միշտ կարող է փոփոխվել գլխավոր էջի կարգավորումներում:</string>
+    <string name="update">Թարմացնել</string>
+    <string name="only_download_over_wifi">Ներբեռնել միայն WiFi-ի միջոցով</string>
+    <string name="live_update">Ավտո-թարմացում</string>
+    <string name="update_now">Թարմացնել հիմա</string>
+    <string name="missing_write_external_storage_permission">Հավելվածը SD քարտի օգտագործման թույլտվություն չունի</string>
+    <string name="last_update">Վերջին թարմացումը՝ %s</string>
+    <string name="update_time">Թարմացնան ժամը</string>
+    <string name="updates_size">Թարմացման չափը</string>
+    <string name="last_map_change">Քարտեզի վերջին փոփոխությունը՝ %s</string>
+    <string name="hourly">Ամեն ժամ</string>
+    <string name="daily">Օրեկան</string>
+    <string name="weekly">Շաբաթական</string>
+    <string name="morning">Առավոտ</string>
+    <string name="night">Գիշեր</string>
+    <string name="select_month_and_country">Ընտրեք ամիսը և երկիրը</string>
+    <string name="number_of_contributors">Ներդրողների թիվը</string>
+    <string name="number_of_edits">Խմբագրումների քանակը</string>
+    <string name="reports_for">Հաշվետվություն</string>
     </resources>
diff --git a/OsmAnd/res/values-land/sizes.xml b/OsmAnd/res/values-land/sizes.xml
index 9f19fef714..cc32b87429 100644
--- a/OsmAnd/res/values-land/sizes.xml
+++ b/OsmAnd/res/values-land/sizes.xml
@@ -5,8 +5,8 @@
     <dimen name="splash_screen_logo_top">24dp</dimen>
     <dimen name="splash_screen_text_bottom">48dp</dimen>
 
-    <dimen name="my_places_empty_state_image_margin_top">39dp</dimen>
-    <dimen name="my_places_empty_state_image_margin_bottom">39dp</dimen>
+    <dimen name="empty_state_image_margin_top">39dp</dimen>
+    <dimen name="empty_state_image_margin_bottom">39dp</dimen>
 
     <dimen name="measurement_tool_content_padding_medium">14dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large-land/sizes.xml b/OsmAnd/res/values-large-land/sizes.xml
index e44894c275..35bc80ed66 100644
--- a/OsmAnd/res/values-large-land/sizes.xml
+++ b/OsmAnd/res/values-large-land/sizes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="my_places_empty_state_image_margin_top">59dp</dimen>
-    <dimen name="my_places_empty_state_image_margin_bottom">59dp</dimen>
+    <dimen name="empty_state_image_margin_top">59dp</dimen>
+    <dimen name="empty_state_image_margin_bottom">59dp</dimen>
 
     <dimen name="measurement_tool_content_padding_medium">21dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 04cc37505e..f8ce4c32be 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -81,17 +81,17 @@
 	<dimen name="default_split_segments_data">15sp</dimen>
 	<dimen name="default_split_segments_sub">12sp</dimen>
 
-	<dimen name="my_places_empty_state_image_margin_top">63dp</dimen>
-	<dimen name="my_places_empty_state_image_margin_bottom">45dp</dimen>
-	<dimen name="my_places_empty_state_text_interval">12dp</dimen>
-	<dimen name="my_places_empty_state_button_margin_top">30dp</dimen>
-	<dimen name="my_places_empty_state_text_size">20sp</dimen>
-	<dimen name="my_places_empty_state_text_desc_size">18sp</dimen>
-	<dimen name="my_places_empty_state_text_desc_margin">68dp</dimen>
-	<dimen name="my_places_empty_state_image_margin_left">138dp</dimen>
-	<dimen name="my_places_empty_state_text_button_padding_left">72dp</dimen>
-	<dimen name="my_places_empty_state_text_button_padding_right">90dp</dimen>
-	<dimen name="my_places_empty_state_text_button_padding_top">96dp</dimen>
+	<dimen name="empty_state_image_margin_top">63dp</dimen>
+	<dimen name="empty_state_image_margin_bottom">45dp</dimen>
+	<dimen name="empty_state_text_interval">12dp</dimen>
+	<dimen name="empty_state_button_margin_top">30dp</dimen>
+	<dimen name="empty_state_text_size">20sp</dimen>
+	<dimen name="empty_state_text_desc_size">18sp</dimen>
+	<dimen name="empty_state_text_desc_margin">68dp</dimen>
+	<dimen name="empty_state_image_margin_left">138dp</dimen>
+	<dimen name="empty_state_text_button_padding_left">72dp</dimen>
+	<dimen name="empty_state_text_button_padding_right">90dp</dimen>
+	<dimen name="empty_state_text_button_padding_top">96dp</dimen>
 
 	<dimen name="bottom_sheet_cancel_button_height">72dp</dimen>
 	<dimen name="landscape_bottom_sheet_dialog_fragment_width">540dp</dimen>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index b13ce09b1e..85219f3d38 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -3072,4 +3072,11 @@
     <string name="tap_on_map_to_hide_interface">Повноекранний режим</string>
     <string name="show_on_top_bar">Показати на верхній панелі</string>
     <string name="mark_passed">Позначати пройдене</string>
+    <string name="digits_quantity">Кількість цифр</string>
+    <string name="show_number_pad">Показати цифрову панель</string>
+    <string name="shared_string_paste">Вставити</string>
+    <string name="coordinate_input_accuracy_description">Автоматично перемикається в наступне поле після введення %1$d цифр після десяткової точки</string>
+    <string name="coordinate_input_accuracy">%1$d цифр</string>
+    <string name="go_to_next_field">Перейти до наступного поля</string>
+    <string name="rename_marker">Перейменувати маркер</string>
     </resources>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index bf63973a07..4012fb9081 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -144,17 +144,17 @@
 	<dimen name="splash_screen_logo_top">150dp</dimen>
 	<dimen name="splash_screen_text_bottom">128dp</dimen>
 
-	<dimen name="my_places_empty_state_image_margin_top">42dp</dimen>
-	<dimen name="my_places_empty_state_image_margin_bottom">30dp</dimen>
-	<dimen name="my_places_empty_state_text_interval">8dp</dimen>
-	<dimen name="my_places_empty_state_button_margin_top">20dp</dimen>
-	<dimen name="my_places_empty_state_text_size">18sp</dimen>
-	<dimen name="my_places_empty_state_text_desc_size">16sp</dimen>
-	<dimen name="my_places_empty_state_text_desc_margin">45dp</dimen>
-	<dimen name="my_places_empty_state_image_margin_left">92dp</dimen>
-	<dimen name="my_places_empty_state_text_button_padding_left">48dp</dimen>
-	<dimen name="my_places_empty_state_text_button_padding_right">60dp</dimen>
-	<dimen name="my_places_empty_state_text_button_padding_top">64dp</dimen>
+	<dimen name="empty_state_image_margin_top">42dp</dimen>
+	<dimen name="empty_state_image_margin_bottom">30dp</dimen>
+	<dimen name="empty_state_text_interval">8dp</dimen>
+	<dimen name="empty_state_button_margin_top">20dp</dimen>
+	<dimen name="empty_state_text_size">18sp</dimen>
+	<dimen name="empty_state_text_desc_size">16sp</dimen>
+	<dimen name="empty_state_text_desc_margin">45dp</dimen>
+	<dimen name="empty_state_image_margin_left">92dp</dimen>
+	<dimen name="empty_state_text_button_padding_left">48dp</dimen>
+	<dimen name="empty_state_text_button_padding_right">60dp</dimen>
+	<dimen name="empty_state_text_button_padding_top">64dp</dimen>
 
     <dimen name="bottom_sheet_cancel_button_height">48dp</dimen>
 	<dimen name="landscape_bottom_sheet_dialog_fragment_width">360dp</dimen>
@@ -200,4 +200,6 @@
 
 	<dimen name="shadow_height">5dp</dimen>
 	<dimen name="map_marker_title_height">28dp</dimen>
+
+	<dimen name="fab_recycler_view_padding_bottom">88dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 97cd87b31a..2d4fa740ac 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,18 @@
          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="add_track_to_markers_descr">Select track waypoints of which OsmAnd will add to markers</string>
+    <string name="add_favourites_group_to_markers_descr">Select which favourite group you want to add to markers</string>
+    <string name="track_waypoints">Track waypoints</string>
+    <string name="favourites_group">Favourites group</string>
+    <string name="add_group">Add group</string>
+    <string name="add_group_descr">You can add group of favourites or track waypoints.</string>
+    <string name="empty_state_markers_active">Markers on map!</string>
+    <string name="empty_state_markers_active_desc">Mark places on map by tap.</string>
+    <string name="empty_state_markers_groups">Import groups</string>
+    <string name="empty_state_markers_groups_desc">You can import favourite groups or track waypoints as markers.</string>
+    <string name="empty_state_markers_history">@string/shared_string_history</string>
+    <string name="empty_state_markers_history_desc">Markers marked as passed will appear on this screen.</string>
     <string name="shared_string_two">Two</string>
     <string name="shared_string_one">One</string>
     <string name="show_guide_line_descr">A line connecting your location to locations of the active markers will be shown on the map.</string>
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..164571958b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java
@@ -0,0 +1,84 @@
+package net.osmand.plus.mapmarkers;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MarkersSyncGroup;
+import net.osmand.plus.R;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.mapmarkers.adapters.FavouritesGroupsAdapter;
+
+import java.util.List;
+
+public class AddFavouritesGroupBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
+
+	public final static String TAG = "AddFavouritesGroupBottomSheetDialogFragment";
+
+	private AddFavouriteGroupListener listener;
+
+	private List<FavoriteGroup> favoriteGroups;
+	private MapMarkersHelper mapMarkersHelper;
+
+	public void setListener(AddFavouriteGroupListener listener) {
+		this.listener = listener;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		favoriteGroups = getMyApplication().getFavorites().getFavoriteGroups();
+		mapMarkersHelper = getMyApplication().getMapMarkersHelper();
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_add_favourites_group_bottom_sheet_dialog, container);
+
+		final RecyclerView recyclerView = mainView.findViewById(R.id.favourites_group_recycler_view);
+		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		final FavouritesGroupsAdapter adapter = new FavouritesGroupsAdapter(getContext(), favoriteGroups);
+		adapter.setAdapterListener(new FavouritesGroupsAdapter.FavouritesGroupsAdapterListener() {
+			@Override
+			public void onItemClick(View view) {
+				int position = recyclerView.getChildAdapterPosition(view);
+				if (position == RecyclerView.NO_POSITION) {
+					return;
+				}
+				FavoriteGroup group = favoriteGroups.get(position - 1);
+				MarkersSyncGroup markersSyncGroup = new MarkersSyncGroup(group.name, group.name, MarkersSyncGroup.FAVORITES_TYPE, group.color);
+				mapMarkersHelper.addMarkersSyncGroup(markersSyncGroup);
+				mapMarkersHelper.syncGroup(markersSyncGroup);
+				if (listener != null) {
+					listener.onFavouriteGroupAdded();
+				}
+				dismiss();
+			}
+		});
+		recyclerView.setAdapter(adapter);
+
+		mainView.findViewById(R.id.close_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		setupHeightAndBackground(mainView, R.id.favourites_group_recycler_view);
+
+		return mainView;
+	}
+
+	public interface AddFavouriteGroupListener {
+		void onFavouriteGroupAdded();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/AddMarkersGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/AddMarkersGroupBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..738ccf1766
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/AddMarkersGroupBottomSheetDialogFragment.java
@@ -0,0 +1,75 @@
+package net.osmand.plus.mapmarkers;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.plus.R;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+
+public class AddMarkersGroupBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
+
+	public final static String TAG = "AddMarkersGroupBottomSheetDialogFragment";
+
+	private AddMarkersGroupFragmentListener listener;
+
+	public void setListener(AddMarkersGroupFragmentListener listener) {
+		this.listener = listener;
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_add_markers_group_bottom_sheet_dialog, container);
+
+		if (nightMode) {
+			((TextView) mainView.findViewById(R.id.add_group_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+		}
+
+		((ImageView) mainView.findViewById(R.id.favourites_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_fav_dark));
+		((ImageView) mainView.findViewById(R.id.waypoints_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_polygom_dark));
+
+		mainView.findViewById(R.id.favourites_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.favouritesOnClick();
+				}
+				dismiss();
+			}
+		});
+		mainView.findViewById(R.id.waypoints_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.waypointsOnClick();
+				}
+				dismiss();
+			}
+		});
+
+		mainView.findViewById(R.id.close_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		setupHeightAndBackground(mainView, R.id.add_markers_group_scroll_view);
+
+		return mainView;
+	}
+
+	interface AddMarkersGroupFragmentListener {
+
+		void favouritesOnClick();
+
+		void waypointsOnClick();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersActiveFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersActiveFragment.java
index 2f23726980..a5390a1040 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersActiveFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersActiveFragment.java
@@ -10,6 +10,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import net.osmand.Location;
 import net.osmand.data.LatLon;
@@ -25,6 +26,7 @@ import net.osmand.plus.dashboard.DashLocationFragment;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersActiveAdapter;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersActiveAdapter.MapMarkersActiveAdapterListener;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersItemTouchHelperCallback;
+import net.osmand.plus.widgets.EmptyStateRecyclerView;
 import net.osmand.util.MapUtils;
 
 public class MapMarkersActiveFragment extends Fragment implements OsmAndCompassListener, OsmAndLocationListener {
@@ -38,10 +40,9 @@ public class MapMarkersActiveFragment extends Fragment implements OsmAndCompassL
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		final RecyclerView recyclerView = new RecyclerView(getContext());
 		final MapActivity mapActivity = (MapActivity) getActivity();
-		recyclerView.setPadding(0, 0, 0, (int) mapActivity.getResources().getDimension(R.dimen.map_markers_recycler_view_padding_bottom));
-		recyclerView.setClipToPadding(false);
+		final View mainView = inflater.inflate(R.layout.fragment_map_markers_active, container, false);
+		final EmptyStateRecyclerView recyclerView = (EmptyStateRecyclerView) mainView.findViewById(R.id.list);
 		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
 		adapter = new MapMarkersActiveAdapter(mapActivity);
@@ -90,6 +91,11 @@ public class MapMarkersActiveFragment extends Fragment implements OsmAndCompassL
 				compassUpdateAllowed = false;
 			}
 		});
+
+		final View emptyView = mainView.findViewById(R.id.empty_view);
+		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		emptyImageView.setImageResource(mapActivity.getMyApplication().getSettings().isLightContent() ? R.drawable.ic_empty_state_marker_list_day : R.drawable.ic_empty_state_marker_list_night);
+		recyclerView.setEmptyView(emptyView);
 		recyclerView.setAdapter(adapter);
 		recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
 			@Override
@@ -98,7 +104,7 @@ public class MapMarkersActiveFragment extends Fragment implements OsmAndCompassL
 				compassUpdateAllowed = newState == RecyclerView.SCROLL_STATE_IDLE;
 			}
 		});
-		return recyclerView;
+		return mainView;
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
index 7386d29620..196f255e33 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
@@ -148,6 +148,7 @@ public class MapMarkersDialogFragment extends android.support.v4.app.DialogFragm
 		});
 
 		viewPager = mainView.findViewById(R.id.map_markers_view_pager);
+		viewPager.setOffscreenPageLimit(3);
 		viewPager.setSwipeLocked(true);
 		final MapMarkersViewPagerAdapter adapter = new MapMarkersViewPagerAdapter(getChildFragmentManager());
 		viewPager.setAdapter(adapter);
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroupsFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroupsFragment.java
index 88d51a7153..f6d7b732f3 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroupsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroupsFragment.java
@@ -19,6 +19,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.osmand.Location;
@@ -34,6 +35,9 @@ import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.dashboard.DashLocationFragment;
 import net.osmand.plus.mapmarkers.adapters.MapMarkerItemViewHolder;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersGroupsAdapter;
+import net.osmand.plus.mapmarkers.AddMarkersGroupBottomSheetDialogFragment.AddMarkersGroupFragmentListener;
+import net.osmand.plus.mapmarkers.AddFavouritesGroupBottomSheetDialogFragment.AddFavouriteGroupListener;
+import net.osmand.plus.widgets.EmptyStateRecyclerView;
 import net.osmand.util.MapUtils;
 
 public class MapMarkersGroupsFragment extends Fragment implements OsmAndCompassListener, OsmAndLocationListener {
@@ -49,15 +53,25 @@ public class MapMarkersGroupsFragment extends Fragment implements OsmAndCompassL
 	private Paint textPaint = new Paint();
 	private Snackbar snackbar;
 	private boolean compassUpdateAllowed = true;
+	private View mainView;
 
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final boolean night = !mapActivity.getMyApplication().getSettings().isLightContent();
-		final RecyclerView recyclerView = new RecyclerView(getContext());
-		recyclerView.setPadding(0, 0, 0, (int) mapActivity.getResources().getDimension(R.dimen.map_markers_recycler_view_padding_bottom));
-		recyclerView.setClipToPadding(false);
+		mainView = inflater.inflate(R.layout.fragment_map_markers_groups, container, false);
+
+		Fragment addMarkersGroupFragment = getChildFragmentManager().findFragmentByTag(AddMarkersGroupBottomSheetDialogFragment.TAG);
+		if (addMarkersGroupFragment != null) {
+			((AddMarkersGroupBottomSheetDialogFragment) addMarkersGroupFragment).setListener(createAddMarkersGroupFragmentListener());
+		}
+		Fragment addFavouritesGroupFragment = getChildFragmentManager().findFragmentByTag(AddFavouritesGroupBottomSheetDialogFragment.TAG);
+		if (addFavouritesGroupFragment != null) {
+			((AddFavouritesGroupBottomSheetDialogFragment) addFavouritesGroupFragment).setListener(createAddFavouritesGroupListener());
+		}
+
+		final EmptyStateRecyclerView recyclerView = (EmptyStateRecyclerView) mainView.findViewById(R.id.list);
 		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 		recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
 			@Override
@@ -222,8 +236,83 @@ public class MapMarkersGroupsFragment extends Fragment implements OsmAndCompassL
 				}
 			}
 		});
+		adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+			@Override
+			public void onChanged() {
+				changeFabVisibilityIfNeeded();
+			}
+
+			@Override
+			public void onItemRangeInserted(int positionStart, int itemCount) {
+				changeFabVisibilityIfNeeded();
+			}
+
+			@Override
+			public void onItemRangeRemoved(int positionStart, int itemCount) {
+				changeFabVisibilityIfNeeded();
+			}
+		});
+
+		final View emptyView = mainView.findViewById(R.id.empty_view);
+		mainView.findViewById(R.id.import_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				openAddGroupMenu();
+			}
+		});
+		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		emptyImageView.setImageResource(night ? R.drawable.ic_empty_state_marker_group_night : R.drawable.ic_empty_state_marker_group_day);
+		recyclerView.setEmptyView(emptyView);
 		recyclerView.setAdapter(adapter);
-		return recyclerView;
+
+		mainView.findViewById(R.id.add_group_fab).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				openAddGroupMenu();
+			}
+		});
+		return mainView;
+	}
+
+	private void changeFabVisibilityIfNeeded() {
+		mainView.findViewById(R.id.add_group_fab).setVisibility(adapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
+	}
+
+	private void openAddGroupMenu() {
+		AddMarkersGroupBottomSheetDialogFragment fragment = new AddMarkersGroupBottomSheetDialogFragment();
+		fragment.setListener(createAddMarkersGroupFragmentListener());
+		fragment.setUsedOnMap(false);
+		fragment.show(getChildFragmentManager(), AddMarkersGroupBottomSheetDialogFragment.TAG);
+	}
+
+	private void openAddFavouritesGroupMenu() {
+		AddFavouritesGroupBottomSheetDialogFragment fragment = new AddFavouritesGroupBottomSheetDialogFragment();
+		fragment.setListener(createAddFavouritesGroupListener());
+		fragment.setUsedOnMap(false);
+		fragment.show(getChildFragmentManager(), AddFavouritesGroupBottomSheetDialogFragment.TAG);
+	}
+
+	private AddFavouriteGroupListener createAddFavouritesGroupListener() {
+		return new AddFavouriteGroupListener() {
+			@Override
+			public void onFavouriteGroupAdded() {
+				updateAdapter();
+			}
+		};
+	}
+
+	private AddMarkersGroupFragmentListener createAddMarkersGroupFragmentListener() {
+		return new AddMarkersGroupFragmentListener() {
+			@Override
+			public void favouritesOnClick() {
+				openAddFavouritesGroupMenu();
+			}
+
+			@Override
+			public void waypointsOnClick() {
+
+			}
+		};
 	}
 
 	void updateAdapter() {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHistoryFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHistoryFragment.java
index f2335ba0a6..ec12497499 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHistoryFragment.java
@@ -18,6 +18,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.osmand.plus.MapMarkersHelper;
@@ -28,6 +29,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapmarkers.adapters.MapMarkerHeaderViewHolder;
 import net.osmand.plus.mapmarkers.adapters.MapMarkerItemViewHolder;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersHistoryAdapter;
+import net.osmand.plus.widgets.EmptyStateRecyclerView;
 
 public class MapMarkersHistoryFragment extends Fragment implements MapMarkersHelper.MapMarkerChangedListener {
 
@@ -73,9 +75,8 @@ public class MapMarkersHistoryFragment extends Fragment implements MapMarkersHel
 			((HistoryMarkerMenuBottomSheetDialogFragment) historyMarkerMenuFragment).setListener(createHistoryMarkerMenuListener());
 		}
 
-		final RecyclerView recyclerView = new RecyclerView(getContext());
-		recyclerView.setPadding(0, 0, 0, (int) mapActivity.getResources().getDimension(R.dimen.map_markers_recycler_view_padding_bottom));
-		recyclerView.setClipToPadding(false);
+		final View mainView = inflater.inflate(R.layout.fragment_map_markers_history, container, false);
+		final EmptyStateRecyclerView recyclerView = (EmptyStateRecyclerView) mainView.findViewById(R.id.list);
 		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
 		ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
@@ -203,11 +204,15 @@ public class MapMarkersHistoryFragment extends Fragment implements MapMarkersHel
 				}
 			}
 		});
+		final View emptyView = mainView.findViewById(R.id.empty_view);
+		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		emptyImageView.setImageResource(night ? R.drawable.ic_empty_state_marker_history_night : R.drawable.ic_empty_state_marker_history_day);
+		recyclerView.setEmptyView(emptyView);
 		recyclerView.setAdapter(adapter);
 
 		app.getMapMarkersHelper().addListener(this);
 
-		return recyclerView;
+		return mainView;
 	}
 
 	void hideSnackbar() {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/FavouritesGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/FavouritesGroupsAdapter.java
new file mode 100644
index 0000000000..1ae1f03948
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/FavouritesGroupsAdapter.java
@@ -0,0 +1,89 @@
+package net.osmand.plus.mapmarkers.adapters;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+
+import java.util.List;
+
+public class FavouritesGroupsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+	private static final int TYPE_HEADER = 12;
+	private static final int TYPE_ITEM = 13;
+
+	private FavouritesGroupsAdapterListener listener;
+	private OsmandApplication app;
+	private List<FavoriteGroup> favoriteGroups;
+	private IconsCache iconsCache;
+
+	public FavouritesGroupsAdapter(Context context, List<FavoriteGroup> favoriteGroups) {
+		this.app = (OsmandApplication) context.getApplicationContext();
+		this.favoriteGroups = favoriteGroups;
+		this.iconsCache = app.getIconsCache();
+	}
+
+	public void setAdapterListener(FavouritesGroupsAdapterListener listener) {
+		this.listener = listener;
+	}
+
+	@Override
+	public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+		if (viewType == TYPE_HEADER) {
+			View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.add_favourites_group_header, parent, false);
+			return new MapMarkersGroupHeaderViewHolder(view);
+		} else {
+			View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.markers_group_view_holder, parent, false);
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (listener != null) {
+						listener.onItemClick(view);
+					}
+				}
+			});
+			return new MapMarkersGroupViewHolder(view);
+		}
+	}
+
+	@Override
+	public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+		if (holder instanceof MapMarkersGroupHeaderViewHolder) {
+			MapMarkersGroupHeaderViewHolder markersGroupHeaderViewHolder = (MapMarkersGroupHeaderViewHolder) holder;
+			markersGroupHeaderViewHolder.title.setText(app.getText(R.string.favourites_group));
+			markersGroupHeaderViewHolder.description.setText(app.getText(R.string.add_favourites_group_to_markers_descr));
+		} else if (holder instanceof MapMarkersGroupViewHolder) {
+			FavoriteGroup favoriteGroup = getItem(position);
+			MapMarkersGroupViewHolder markersGroupViewHolder = (MapMarkersGroupViewHolder) holder;
+			int color = favoriteGroup.color == 0 || favoriteGroup.color == Color.BLACK ? app.getResources().getColor(R.color.color_favorite) : favoriteGroup.color;
+			markersGroupViewHolder.icon.setImageDrawable(iconsCache.getPaintedIcon(R.drawable.ic_action_folder, color | 0xff000000));
+			markersGroupViewHolder.name.setText(favoriteGroup.name.length() == 0 ? app.getString(R.string.shared_string_favorites) : favoriteGroup.name);
+			markersGroupViewHolder.numberCount.setText(String.valueOf(favoriteGroup.points.size()));
+		}
+	}
+
+	@Override
+	public int getItemViewType(int position) {
+		return position == 0 ? TYPE_HEADER : TYPE_ITEM;
+	}
+
+	@Override
+	public int getItemCount() {
+		return favoriteGroups.size() + 1;
+	}
+
+	private FavoriteGroup getItem(int position) {
+		return favoriteGroups.get(position - 1);
+	}
+
+	public interface FavouritesGroupsAdapterListener {
+		void onItemClick(View view);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupHeaderViewHolder.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupHeaderViewHolder.java
new file mode 100644
index 0000000000..5f1d6ad17e
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupHeaderViewHolder.java
@@ -0,0 +1,19 @@
+package net.osmand.plus.mapmarkers.adapters;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+import net.osmand.plus.R;
+
+public class MapMarkersGroupHeaderViewHolder extends RecyclerView.ViewHolder {
+
+	TextView title;
+	TextView description;
+
+	public MapMarkersGroupHeaderViewHolder(View itemView) {
+		super(itemView);
+		title = itemView.findViewById(R.id.title);
+		description = itemView.findViewById(R.id.description);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupViewHolder.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupViewHolder.java
new file mode 100644
index 0000000000..e2340da0ff
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupViewHolder.java
@@ -0,0 +1,22 @@
+package net.osmand.plus.mapmarkers.adapters;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.plus.R;
+
+public class MapMarkersGroupViewHolder extends RecyclerView.ViewHolder {
+
+	ImageView icon;
+	TextView name;
+	TextView numberCount;
+
+	public MapMarkersGroupViewHolder(View itemView) {
+		super(itemView);
+		icon = itemView.findViewById(R.id.icon);
+		name = itemView.findViewById(R.id.name_text);
+		numberCount = itemView.findViewById(R.id.number_count_text);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 05033b02e8..9769c66bc5 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -219,7 +219,14 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-		Location myLoc = map.getMyApplication().getLocationProvider().getLastStaleKnownLocation();
+		Location myLoc;
+		if (useFingerLocation && fingerLocation != null) {
+			myLoc = new Location("");
+			myLoc.setLatitude(fingerLocation.getLatitude());
+			myLoc.setLongitude(fingerLocation.getLongitude());
+		} else {
+			myLoc = map.getMyApplication().getLocationProvider().getLastStaleKnownLocation();
+		}
 		MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
 		List<MapMarker> activeMapMarkers = markersHelper.getMapMarkers();
 		int displayedWidgets = map.getMyApplication().getSettings().DISPLAYED_MARKERS_WIDGETS_COUNT.get();
diff --git a/OsmAnd/src/net/osmand/plus/widgets/EmptyStateRecyclerView.java b/OsmAnd/src/net/osmand/plus/widgets/EmptyStateRecyclerView.java
new file mode 100644
index 0000000000..ee2b129c72
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/EmptyStateRecyclerView.java
@@ -0,0 +1,70 @@
+package net.osmand.plus.widgets;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class EmptyStateRecyclerView extends RecyclerView {
+	private View emptyView;
+
+	public EmptyStateRecyclerView(Context context) {
+		super(context);
+	}
+
+	public EmptyStateRecyclerView(Context context, @Nullable AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public EmptyStateRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+	}
+
+	private AdapterDataObserver emptyStateObserver = new AdapterDataObserver() {
+		@Override
+		public void onChanged() {
+			checkIfEmpty();
+		}
+
+		@Override
+		public void onItemRangeInserted(int positionStart, int itemCount) {
+			checkIfEmpty();
+		}
+
+		@Override
+		public void onItemRangeRemoved(int positionStart, int itemCount) {
+			checkIfEmpty();
+		}
+	};
+
+	@Override
+	public void setAdapter(Adapter adapter) {
+		final Adapter oldAdapter = getAdapter();
+		if (oldAdapter != null) {
+			oldAdapter.unregisterAdapterDataObserver(emptyStateObserver);
+		}
+		super.setAdapter(adapter);
+		if (adapter != null) {
+			adapter.registerAdapterDataObserver(emptyStateObserver);
+		}
+		checkIfEmpty();
+	}
+
+	public void setEmptyView(View emptyView) {
+		this.emptyView = emptyView;
+		checkIfEmpty();
+	}
+
+	private void checkIfEmpty() {
+		if (emptyView != null && getAdapter() != null) {
+			if (getAdapter().getItemCount() == 0) {
+				setVisibility(View.GONE);
+				emptyView.setVisibility(View.VISIBLE);
+			} else {
+				emptyView.setVisibility(View.GONE);
+				setVisibility(View.VISIBLE);
+			}
+		}
+	}
+}