diff --git a/OsmAnd/res/drawable/chart_marker_background.xml b/OsmAnd/res/drawable/chart_marker_background_dark.xml
similarity index 60%
rename from OsmAnd/res/drawable/chart_marker_background.xml
rename to OsmAnd/res/drawable/chart_marker_background_dark.xml
index 48543a6da4..25a92a6cbb 100644
--- a/OsmAnd/res/drawable/chart_marker_background.xml
+++ b/OsmAnd/res/drawable/chart_marker_background_dark.xml
@@ -2,8 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <corners android:radius="4dp" />
-    <solid android:color="?attr/bg_color"/>
-    <stroke
-        android:width="1dp"
-        android:color="#808080" />
+    <solid android:color="@color/bg_color_dark"/>
+    <stroke android:width="1dp" android:color="#808080" />
 </shape>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/chart_marker_background_light.xml b/OsmAnd/res/drawable/chart_marker_background_light.xml
new file mode 100644
index 0000000000..6738f76b20
--- /dev/null
+++ b/OsmAnd/res/drawable/chart_marker_background_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="4dp" />
+    <solid android:color="@color/bg_color_light"/>
+    <stroke android:width="1dp" android:color="#808080" />
+</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/chart_marker_view.xml b/OsmAnd/res/layout/chart_marker_view.xml
index fa9a0f1e15..1f1bf97a91 100644
--- a/OsmAnd/res/layout/chart_marker_view.xml
+++ b/OsmAnd/res/layout/chart_marker_view.xml
@@ -8,7 +8,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:background="@drawable/chart_marker_background">
+        android:background="?attr/chart_marker_background">
 
         <LinearLayout
             android:id="@+id/text_alt_container"
diff --git a/OsmAnd/res/layout/gpx_item_list_header.xml b/OsmAnd/res/layout/gpx_item_list_header.xml
index b254b96f41..9eb5d685a5 100644
--- a/OsmAnd/res/layout/gpx_item_list_header.xml
+++ b/OsmAnd/res/layout/gpx_item_list_header.xml
@@ -58,6 +58,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginLeft="16dp"
@@ -65,6 +66,7 @@
             android:background="?attr/dashboard_divider"/>
 
         <LinearLayout
+            android:id="@+id/split_color_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
diff --git a/OsmAnd/res/layout/gpx_item_list_item.xml b/OsmAnd/res/layout/gpx_item_list_item.xml
deleted file mode 100644
index f7ecd3a9b2..0000000000
--- a/OsmAnd/res/layout/gpx_item_list_item.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/expandable_list_item_background"
-    android:minHeight="@dimen/list_item_height"
-    android:orientation="vertical"
-    android:paddingTop="10dp">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/list_content_padding"
-        android:paddingRight="@dimen/list_content_padding">
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/favorites_icon_right_margin" >
-
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="@dimen/standard_icon_size"
-                android:layout_height="@dimen/standard_icon_size"
-                android:layout_gravity="center_vertical" />
-
-            <TextView
-                android:id="@+id/additional"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:maxLines="2"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                tools:text="Additional" />
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/default_list_text_size"
-            tools:text="Name" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:layout_marginTop="5dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="@dimen/default_desc_text_size"
-            android:paddingLeft="@dimen/list_content_padding"
-            android:paddingRight="@dimen/list_content_padding"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/OsmAnd/res/layout/wpt_list_item.xml b/OsmAnd/res/layout/wpt_list_item.xml
new file mode 100644
index 0000000000..13523273c5
--- /dev/null
+++ b/OsmAnd/res/layout/wpt_list_item.xml
@@ -0,0 +1,91 @@
+<?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="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/expandable_list_item_background"
+    android:minHeight="@dimen/list_item_height"
+    android:orientation="vertical">
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"
+        android:visibility="gone"/>
+
+    <View
+        android:id="@+id/list_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"
+        android:layout_marginLeft="54dp"
+        android:visibility="gone"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/list_content_padding">
+
+        <CheckBox
+            android:id="@+id/toggle_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:focusable="false"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="@dimen/standard_icon_size"
+            android:layout_height="@dimen/standard_icon_size"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/list_content_padding"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingRight="@dimen/list_content_padding"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_list_text_size"
+                tools:text="Point title"/>
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_sub_text_size"
+                android:maxLines="2"
+                tools:text="Point description"/>
+
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/options"
+            android:contentDescription="@string/shared_string_more"
+            android:layout_width="@dimen/list_item_height"
+            android:layout_height="@dimen/list_item_height"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/dashboard_button"
+            android:src="@drawable/ic_overflow_menu_white"
+            android:visibility="visible"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/wpt_list_item_category.xml b/OsmAnd/res/layout/wpt_list_item_category.xml
new file mode 100644
index 0000000000..7d24ccb6fb
--- /dev/null
+++ b/OsmAnd/res/layout/wpt_list_item_category.xml
@@ -0,0 +1,100 @@
+<?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="fill_parent"
+              android:layout_height="wrap_content"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/group_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/list_item_divider"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/list_content_padding"
+        android:minHeight="@dimen/list_item_height"
+        android:background="?attr/bg_color"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/toggle_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/dashboard_button"
+            android:focusable="false"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:visibility="gone"
+            tools:visiblity="visible"/>
+
+        <ImageView
+            android:id="@+id/category_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:visibility="gone"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:layout_gravity="center_vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/category_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_sub_text_size"
+                osmand:typeface="@string/font_roboto_medium"
+                tools:text="Category name"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/category_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_sub_text_size"
+                tools:text="Important points in this route"/>
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/options"
+            android:contentDescription="@string/shared_string_more"
+            android:layout_width="46dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="4dp"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/dashboard_button"
+            android:focusable="false"
+            android:scaleType="center"
+            android:src="@drawable/ic_overflow_menu_white"
+            android:visibility="gone"
+            tools:visiblity="visible"/>
+
+        <ImageView
+            android:id="@+id/explist_indicator"
+            android:layout_width="24dp"
+            android:layout_height="match_parent"
+            android:scaleType="center"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index f99bf85119..4adc5366fb 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -5,6 +5,7 @@
     </declare-styleable>
     <declare-styleable name="OsmAndTheme">
         <attr name="routeParameterTitleColor" format="color"/>
+        <attr name="chart_marker_background" format="reference" />
         <!-- list colors -->
         <attr name="ctx_menu_info_divider" format="color"/>
         <attr name="searchbar_text" format="color"/>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6c8d04e364..e75ced2c55 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,10 @@
          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="points_delete_multiple_succesful">Point(s) deleted successfully.</string>
+    <string name="points_delete_multiple">You are going to delete %1$d point(s). Are you sure?</string>
+    <string name="route_points_category_name">Points on the route to pass</string>
+    <string name="track_points_category_name">Important points in this route</string>
     <string name="gpx_track">Track</string>
     <string name="max_speed">Max speed</string>
     <string name="average_speed">Average speed</string>
@@ -18,7 +22,7 @@
     <string name="shared_string_start_time">Start time</string>
     <string name="shared_string_end_time">End time</string>
     <string name="shared_string_color">Color</string>
-    <string name="select_gpx_folder">Select GPX folder</string>
+    <string name="select_gpx_folder">Select track folder</string>
     <string name="file_can_not_be_moved">File can not be moved.</string>
     <string name="shared_string_move">Move</string>
     <string name="shared_string_tracks">Tracks</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 50770a6a95..c13eb73b63 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -76,6 +76,7 @@
 
     <!-- Osmand themes styles -->
     <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
+        <item name="chart_marker_background">@drawable/chart_marker_background_light</item>
         <item name="routeParameterTitleColor">@color/color_myloc_distance</item>
         <item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_light</item>
         <item name="searchbar_text">@color/searchbar_text_light</item>
@@ -139,6 +140,7 @@
         <item name="android:actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
         <item name="android:actionModeStyle">@style/WhiteActionMode</item>
         <item name="android:actionMenuTextColor">@color/color_white</item>
+        <item name="actionOverflowButtonStyle">@style/OverflowMenuButton</item>
 
         <item name="dialog_inactive_text_color">@color/icon_color_light</item>
         <item name="secondary_icon_color">@color/icon_color_light</item>
@@ -155,6 +157,10 @@
         <item name="popupMenuStyle">@style/PopupMenuLight</item>
     </style>
 
+    <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_overflow_menu_white</item>
+    </style>
+
     <style name="PopupMenuLight" parent="@style/Widget.AppCompat.Light.PopupMenu">
         <item name="overlapAnchor">true</item>'
         <item name="android:dropDownVerticalOffset">8dip</item>
@@ -241,6 +247,7 @@
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+        <item name="chart_marker_background">@drawable/chart_marker_background_dark</item>
         <item name="routeParameterTitleColor">@color/osmand_orange</item>
         <item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_dark</item>
         <item name="searchbar_text">@color/searchbar_text_dark</item>
@@ -291,6 +298,7 @@
 
         <item name="android:actionModeBackground">@color/actionbar_dark_color</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
+        <item name="actionOverflowButtonStyle">@style/OverflowMenuButton</item>
 
         <item name="dialog_inactive_text_color">@color/dialog_inactive_text_color_dark</item>
         <item name="secondary_icon_color">@color/dialog_inactive_text_color_dark</item>
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 217e386beb..a22250b2ce 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -138,11 +138,11 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.favorites_tree, container, false);
 		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
-		View headerView = inflater.inflate(R.layout.list_shadow_header, null, false);
-		listView.addHeaderView(headerView);
-		View footerView = inflater.inflate(R.layout.list_shadow_footer, null, false);
-		listView.addFooterView(footerView);
 		favouritesAdapter.synchronizeGroups();
+		if (!favouritesAdapter.isEmpty()) {
+			listView.addHeaderView(inflater.inflate(R.layout.list_shadow_header, null, false));
+			listView.addFooterView(inflater.inflate(R.layout.list_shadow_footer, null, false));
+		}
 		listView.setAdapter(favouritesAdapter);
 		setListView(listView);
 		setHasOptionsMenu(true);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 376697a2a2..090f386cf1 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -76,6 +76,7 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -88,6 +89,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	// protected static final int DELETE_ACTION_ID = 1;
 	private boolean selectionMode = false;
 	private List<GpxInfo> selectedItems = new ArrayList<>();
+	private Set<Integer> selectedGroups = new LinkedHashSet<>();
 	private ActionMode actionMode;
 	private LoadGpxTask asyncLoader;
 	private ProcessGpxTask asyncProcessor;
@@ -271,6 +273,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				}
 			});
 			*/
+		} else {
+			View headerView = inflater.inflate(R.layout.list_shadow_header, null, false);
+			listView.addHeaderView(headerView);
 		}
 		View footerView = inflater.inflate(R.layout.list_shadow_footer, null, false);
 		listView.addFooterView(footerView);
@@ -467,6 +472,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		enableSelectionMode(true);
 		showOnMapMode = true;
 		selectedItems.clear();
+		selectedGroups.clear();
 		final Set<GpxInfo> originalSelectedItems = allGpxAdapter.getSelectedGpx();
 		selectedItems.addAll(originalSelectedItems);
 		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
@@ -533,6 +539,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		enableSelectionMode(true);
 		selectedItems.clear();
+		selectedGroups.clear();
 		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
 
 			@Override
@@ -776,6 +783,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		public void refreshSelected() {
 			selected.clear();
 			selected.addAll(getSelectedGpx());
+			Collections.sort(selected, new Comparator<GpxInfo>() {
+				@Override
+				public int compare(GpxInfo i1, GpxInfo i2) {
+					return i1.getName().toLowerCase().compareTo(i2.getName().toLowerCase());
+				}
+			});
 		}
 
 		public Set<GpxInfo> getSelectedGpx() {
@@ -958,15 +971,17 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			if (selectionMode) {
 				final CheckBox ch = (CheckBox) v.findViewById(R.id.toggle_item);
 				ch.setVisibility(View.VISIBLE);
-				//ch.setChecked(selectedItems.contains(model));
+				ch.setChecked(selectedGroups.contains(groupPosition));
 
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
 						if (ch.isChecked()) {
 							selectedItems.addAll(data.get(category.get(getGroupPosition(groupPosition))));
+							selectedGroups.add(groupPosition);
 						} else {
 							selectedItems.removeAll(data.get(category.get(getGroupPosition(groupPosition))));
+							selectedGroups.remove(groupPosition);
 						}
 						allGpxAdapter.notifyDataSetInvalidated();
 						updateSelectionMode(actionMode);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 4dacedb592..404a6cd243 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -1,56 +1,95 @@
 package net.osmand.plus.myplaces;
 
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AlertDialog;
-import android.text.Html;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.SearchView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ExpandableListView;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import net.osmand.AndroidUtils;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.FavouritesDbHelper;
-import net.osmand.plus.GPXDatabase;
+import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
+import net.osmand.plus.IconsCache;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.IntermediatePointsDialog;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.OsmandActionBarActivity;
+import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
+import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
-import net.osmand.plus.base.OsmAndListFragment;
+import net.osmand.plus.base.OsmandExpandableListFragment;
+import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
 import net.osmand.util.Algorithms;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-public class TrackPointFragment extends OsmAndListFragment {
+public class TrackPointFragment extends OsmandExpandableListFragment {
 
 	public static final String ARG_TO_FILTER_SHORT_TRACKS = "ARG_TO_FILTER_SHORT_TRACKS";
 
+	public static final int SEARCH_ID = -1;
+	public static final int DELETE_ID = 2;
+	public static final int DELETE_ACTION_ID = 3;
+	public static final int SHARE_ID = 4;
+	public static final int SELECT_MAP_MARKERS_ID = 5;
+	public static final int SELECT_MAP_MARKERS_ACTION_MODE_ID = 6;
+	public static final int SELECT_FAVORITES_ID = 7;
+	public static final int SELECT_FAVORITES_ACTION_MODE_ID = 8;
+
 	private OsmandApplication app;
-	private ArrayAdapter<GpxDisplayItem> adapter;
+	final private PointGPXAdapter adapter = new PointGPXAdapter();
 	private GpxDisplayItemType[] filterTypes = { GpxDisplayItemType.TRACK_POINTS, GpxDisplayItemType.TRACK_ROUTE_POINTS };
+	private boolean selectionMode = false;
+	private Set<GpxDisplayItem> selectedItems = new LinkedHashSet<>();
+	private Set<Integer> selectedGroups = new LinkedHashSet<>();
+	private ActionMode actionMode;
+	private SearchView searchView;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -61,24 +100,25 @@ public class TrackPointFragment extends OsmAndListFragment {
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-		getListView().setBackgroundColor(getResources().getColor(
+		listView.setBackgroundColor(getResources().getColor(
 				getMyApplication().getSettings().isLightContent() ? R.color.ctx_menu_info_view_bg_light
 						: R.color.ctx_menu_info_view_bg_dark));
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.favorites_tree, container, false);
+		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
 		setHasOptionsMenu(true);
-		View view = getActivity().getLayoutInflater().inflate(R.layout.update_index, container, false);
-		view.findViewById(R.id.header_layout).setVisibility(View.GONE);
-		ListView listView = (ListView) view.findViewById(android.R.id.list);
-		listView.setDivider(null);
-		listView.setDividerHeight(0);
+
 		TextView tv = new TextView(getActivity());
 		tv.setText(R.string.none_selected_gpx);
 		tv.setTextSize(24);
 		listView.setEmptyView(tv);
+
 		setContent(listView);
+		setListView(listView);
+		expandAllGroups();
 		return view;
 	}
 
@@ -86,50 +126,24 @@ public class TrackPointFragment extends OsmAndListFragment {
 		return (TrackActivity) getActivity();
 	}
 
-	public ArrayAdapter<?> getAdapter() {
-		return adapter;
-	}
-
-	private GPXUtilities.GPXFile getGpx() {
+	private GPXFile getGpx() {
 		return getMyActivity().getGpx();
 	}
 
-	private GPXDatabase.GpxDataItem getGpxDataItem() {
+	private GpxDataItem getGpxDataItem() {
 		return getMyActivity().getGpxDataItem();
 	}
 
-	private void setupListView(ListView listView) {
-		if (adapter.getCount() > 0) {
-			listView.addHeaderView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_header, null, false));
-			listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
+	private void expandAllGroups() {
+		for (int i = 0; i < adapter.getGroupCount(); i++) {
+			getExpandableListView().expandGroup(i);
 		}
 	}
 
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		super.onCreateOptionsMenu(menu, inflater);
-		MenuItem item = menu.add(R.string.shared_string_add_to_favorites)
-				.setIcon(R.drawable.ic_action_fav_dark)
-				.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-			@Override
-			public boolean onMenuItemClick(MenuItem item) {
-				//saveAsFavorites(filterType());
-				return true;
-			}
-		});
-		MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-
-		if (app.getSettings().USE_MAP_MARKERS.get()) {
-			item = menu.add(R.string.shared_string_add_to_map_markers)
-					.setIcon(R.drawable.ic_action_flag_dark)
-					.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-						@Override
-						public boolean onMenuItemClick(MenuItem item) {
-							//saveAsMapMarkers(GpxSelectionHelper.GpxDisplayItemType.TRACK_POINTS);
-							return true;
-						}
-					});
-			MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+	private void setupListView(ListView listView) {
+		if (!adapter.isEmpty()) {
+			listView.addHeaderView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_header, null, false));
+			listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
 		}
 	}
 
@@ -137,7 +151,7 @@ public class TrackPointFragment extends OsmAndListFragment {
 		return getArguments() != null && getArguments().getBoolean(arg);
 	}
 
-	private boolean hasFilterType(GpxDisplayItemType[] filterTypes, GpxDisplayItemType filterType) {
+	private boolean hasFilterType(GpxDisplayItemType filterType) {
 		for (GpxDisplayItemType type : filterTypes) {
 			if (type == filterType) {
 				return true;
@@ -146,11 +160,11 @@ public class TrackPointFragment extends OsmAndListFragment {
 		return false;
 	}
 
-	private List<GpxDisplayGroup> filterGroups(GpxDisplayItemType[] types) {
+	private List<GpxDisplayGroup> filterGroups() {
 		List<GpxDisplayGroup> result = getMyActivity().getGpxFile(false);
 		List<GpxDisplayGroup> groups = new ArrayList<>();
 		for (GpxDisplayGroup group : result) {
-			boolean add = types == null || hasFilterType(types, group.getType());
+			boolean add = hasFilterType(group.getType());
 			if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) {
 				Iterator<GpxDisplayItem> item = group.getModifiableList().iterator();
 				while (item.hasNext()) {
@@ -172,25 +186,13 @@ public class TrackPointFragment extends OsmAndListFragment {
 	}
 
 	public void setContent() {
-		setContent(getListView());
+		setContent(listView);
 	}
 
-	public void setContent(ListView listView) {
-		adapter = new PointGPXAdapter(new ArrayList<GpxDisplayItem>());
-		updateContent();
+	public void setContent(ExpandableListView listView) {
+		adapter.synchronizeGroups(filterGroups());
 		setupListView(listView);
-		setListAdapter(adapter);
-	}
-
-	protected void updateContent() {
-		adapter.clear();
-		List<GpxDisplayGroup> groups = filterGroups(filterTypes);
-		adapter.setNotifyOnChange(false);
-		for (GpxDisplayItem i : flatten(groups)) {
-			adapter.add(i);
-		}
-		adapter.setNotifyOnChange(true);
-		adapter.notifyDataSetChanged();
+		listView.setAdapter(adapter);
 	}
 
 	protected List<GpxDisplayItem> flatten(List<GpxDisplayGroup> groups) {
@@ -201,185 +203,698 @@ public class TrackPointFragment extends OsmAndListFragment {
 		return list;
 	}
 
-	protected void saveAsFavorites(final GpxDisplayItemType gpxDisplayItemType) {
-		AlertDialog.Builder b = new AlertDialog.Builder(getMyActivity());
-		final EditText editText = new EditText(getMyActivity());
-		final List<GpxDisplayGroup> gs = filterGroups(new GpxDisplayItemType[] { gpxDisplayItemType });
-		if (gs.size() == 0) {
-			return;
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == SELECT_MAP_MARKERS_ID) {
+			selectMapMarkers();
+			return true;
+		} else if (item.getItemId() == SELECT_FAVORITES_ID) {
+			selectFavorites();
+			return true;
+		} else if (item.getItemId() == SHARE_ID) {
+			shareItems();
+			return true;
+		} else if (item.getItemId() == DELETE_ID) {
+			enterDeleteMode();
+			return true;
+		} else {
+			return super.onOptionsItemSelected(item);
 		}
-		String name = gs.get(0).getName();
-		if(name.indexOf('\n') > 0) {
-			name = name.substring(0, name.indexOf('\n'));
-		}
-		editText.setText(name);
-		editText.setPadding(7, 3, 7, 3);
-		b.setTitle(R.string.save_as_favorites_points);
-		b.setView(editText);
-		b.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				saveFavoritesImpl(flatten(gs), editText.getText().toString());
-			}
-		});
-		b.setNegativeButton(R.string.shared_string_cancel, null);
-		b.show();
 	}
 
-	protected void saveAsMapMarkers(final GpxDisplayItemType gpxDisplayItemType) {
-		AlertDialog.Builder b = new AlertDialog.Builder(getMyActivity());
-		final List<GpxDisplayGroup> gs = filterGroups(new GpxDisplayItemType[] { gpxDisplayItemType });
-		if (gs.size() == 0) {
-			return;
-		}
-		b.setMessage(R.string.add_points_to_map_markers_q);
-		b.setPositiveButton(R.string.shared_string_add, new DialogInterface.OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				saveMapMarkersImpl(flatten(gs));
-			}
-		});
-		b.setNegativeButton(R.string.shared_string_cancel, null);
-		b.show();
+	private void selectMapMarkers() {
+		enterMapMarkersMode();
 	}
 
-	protected void saveFavoritesImpl(List<GpxDisplayItem> modifiableList, String category) {
-		FavouritesDbHelper fdb = app.getFavorites();
-		for(GpxDisplayItem i : modifiableList) {
-			if (i.locationStart != null) {
-				FavouritePoint fp = new FavouritePoint(i.locationStart.lat, i.locationStart.lon, i.name, category);
-				if (!Algorithms.isEmpty(i.description)) {
-					fp.setDescription(i.description);
-				}
-				fdb.addFavourite(fp, false);
-			}
-		}
-		fdb.saveCurrentPointsIntoFile();
+	private void selectFavorites() {
+		enterFavoritesMode();
 	}
 
-	protected void saveMapMarkersImpl(List<GpxDisplayItem> modifiableList) {
-		MapMarkersHelper markersHelper = app.getMapMarkersHelper();
-		List<LatLon> points = new ArrayList<>();
-		List<PointDescription> names = new ArrayList<>();
-		for(GpxDisplayItem i : modifiableList) {
-			if (i.locationStart != null) {
-				points.add(new LatLon(i.locationStart.lat, i.locationStart.lon));
-				names.add(new PointDescription(PointDescription.POINT_TYPE_MAP_MARKER, i.name));
-			}
-		}
-		markersHelper.addMapMarkers(points, names);
+	private void shareItems() {
+		final Uri fileUri = Uri.fromFile(new File(getGpx().path));
+		final Intent sendIntent = new Intent(Intent.ACTION_SEND);
+		sendIntent.putExtra(Intent.EXTRA_STREAM, fileUri);
+		sendIntent.setType("application/gpx+xml");
+		startActivity(sendIntent);
 	}
 
 	@Override
-	public void onListItemClick(ListView l, View v, int position, long id) {
-
-		GpxDisplayItem child = adapter.getItem(position);
-		if (child != null) {
-			if (child.group.getGpx() != null) {
-				app.getSelectedGpxHelper().setGpxFileToDisplay(child.group.getGpx());
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		menu.clear();
+		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
+				R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+		searchView = new SearchView(getActivity());
+		FavoritesActivity.updateSearchView(getActivity(), searchView);
+		MenuItemCompat.setActionView(mi, searchView);
+		searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+			@Override
+			public boolean onQueryTextSubmit(String query) {
+				adapter.getFilter().filter(query);
+				return true;
 			}
 
-			final OsmandSettings settings = app.getSettings();
-			LatLon location = new LatLon(child.locationStart.lat, child.locationStart.lon);
+			@Override
+			public boolean onQueryTextChange(String newText) {
+				adapter.getFilter().filter(newText);
+				return true;
+			}
+		});
+		MenuItemCompat.setOnActionExpandListener(mi, new MenuItemCompat.OnActionExpandListener() {
+			@Override
+			public boolean onMenuItemActionExpand(MenuItem item) {
+				return true;
+			}
 
-			if (child.group.getType() == GpxDisplayItemType.TRACK_ROUTE_POINTS) {
-				settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
-						settings.getLastKnownMapZoom(),
-						new PointDescription(PointDescription.POINT_TYPE_WPT, child.name),
-						false,
-						child.locationStart);
+			@Override
+			public boolean onMenuItemActionCollapse(MenuItem item) {
+				adapter.setFilterResults(null);
+				adapter.synchronizeGroups(filterGroups());
+				adapter.notifyDataSetChanged();
+				// Needed to hide intermediate progress bar after closing action mode
+				new Handler().postDelayed(new Runnable() {
+					public void run() {
+						hideProgressBar();
+					}
+				}, 100);
+				return true;
+			}
+		});
+
+		if (!MenuItemCompat.isActionViewExpanded(mi)) {
+			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark,
+					R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_NEVER);
+			if (getSettings().USE_MAP_MARKERS.get()) {
+				createMenuItem(menu, SELECT_MAP_MARKERS_ID, R.string.shared_string_add_to_map_markers, R.drawable.ic_action_flag_dark,
+						R.drawable.ic_action_flag_dark, MenuItemCompat.SHOW_AS_ACTION_NEVER);
 			} else {
-				settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
-						settings.getLastKnownMapZoom(),
-						new PointDescription(PointDescription.POINT_TYPE_GPX_ITEM, child.group.getGpxName()),
-						false,
-						child);
+				createMenuItem(menu, SELECT_MAP_MARKERS_ID, R.string.select_destination_and_intermediate_points, R.drawable.ic_action_intermediate,
+						R.drawable.ic_action_intermediate, MenuItemCompat.SHOW_AS_ACTION_NEVER);
 			}
-			MapActivity.launchMapActivityMoveToTop(getActivity());
+			createMenuItem(menu, SELECT_FAVORITES_ID, R.string.shared_string_add_to_favorites, R.drawable.ic_action_fav_dark,
+					R.drawable.ic_action_fav_dark, MenuItemCompat.SHOW_AS_ACTION_NEVER);
+			createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark,
+					R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_NEVER);
 		}
 	}
 
-	class PointGPXAdapter extends ArrayAdapter<GpxDisplayItem> {
-
-		Map<GpxDisplayItemType, List<GpxDisplayItem>> itemTypes = new LinkedHashMap<>();
-		List<GpxDisplayItemType> types = new ArrayList<>();
-
-		PointGPXAdapter(List<GpxDisplayItem> items) {
-			super(getActivity(), R.layout.gpx_list_item_tab_content, items);
+	public void showProgressBar() {
+		OsmandActionBarActivity activity = getActionBarActivity();
+		if (activity != null) {
+			activity.setSupportProgressBarIndeterminateVisibility(true);
 		}
+	}
 
-		@Override
-		public void add(GpxDisplayItem item) {
-			super.add(item);
-			GpxDisplayItemType type = item.group.getType();
-			List<GpxDisplayItem> items = itemTypes.get(type);
-			if (items == null) {
-				items = new ArrayList<>();
-				itemTypes.put(type, items);
-			}
-			items.add(item);
-			if (!types.contains(type)) {
-				types.add(type);
-			}
+	public void hideProgressBar() {
+		OsmandActionBarActivity activity = getActionBarActivity();
+		if (activity != null) {
+			activity.setSupportProgressBarIndeterminateVisibility(false);
 		}
+	}
 
-		@Override
-		public void clear() {
-			super.clear();
-			types.clear();
-			itemTypes.clear();
-		}
+	private void enableSelectionMode(boolean selectionMode) {
+		this.selectionMode = selectionMode;
+	}
 
-		@NonNull
-		@Override
-		public View getView(int position, View convertView, @NonNull ViewGroup parent) {
-			GpxDisplayItem child = adapter.getItem(position);
+	private void enterDeleteMode() {
 
-			View row = convertView;
-			if (row == null) {
-				LayoutInflater inflater = getMyActivity().getLayoutInflater();
-				row = inflater.inflate(R.layout.gpx_item_list_item, parent, false);
+		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
+
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+				enableSelectionMode(true);
+				createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete,
+						R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark,
+						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+				selectedItems.clear();
+				selectedGroups.clear();
+				adapter.notifyDataSetInvalidated();
+				updateSelectionMode(mode);
+				return true;
 			}
 
-			TextView label = (TextView) row.findViewById(R.id.name);
-			TextView description = (TextView) row.findViewById(R.id.description);
-			TextView additional = (TextView) row.findViewById(R.id.additional);
-			ImageView icon = (ImageView) row.findViewById(R.id.icon);
-			if (child.splitMetric >= 0 && child.splitName != null) {
-				additional.setVisibility(View.VISIBLE);
-				icon.setVisibility(View.INVISIBLE);
-				additional.setText(child.splitName);
-			} else {
-				icon.setVisibility(View.VISIBLE);
-				additional.setVisibility(View.INVISIBLE);
-				if (child.group.getType() == GpxDisplayItemType.TRACK_ROUTE_POINTS) {
-					icon.setImageDrawable(app.getIconsCache().getThemedIcon(R.drawable.ic_action_markers_dark));
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+				return false;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode) {
+				enableSelectionMode(false);
+				adapter.notifyDataSetInvalidated();
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+				if (item.getItemId() == DELETE_ACTION_ID) {
+					mode.finish();
+					deleteItemsAction();
+				}
+				return true;
+			}
+
+		});
+
+	}
+
+	private void deleteItemsAction() {
+		if (selectedItems.size() > 0) {
+			AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+			b.setMessage(getString(R.string.points_delete_multiple, selectedItems.size()));
+			b.setPositiveButton(R.string.shared_string_delete, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					if (actionMode != null) {
+						actionMode.finish();
+					}
+					deleteItems();
+				}
+			});
+			b.setNegativeButton(R.string.shared_string_cancel, null);
+			b.show();
+		}
+	}
+
+	private void deleteItems() {
+		new AsyncTask<Void, Object, String>() {
+
+			@Override
+			protected void onPreExecute() {
+				showProgressBar();
+			}
+
+			@Override
+			protected void onPostExecute(String result) {
+				hideProgressBar();
+				adapter.synchronizeGroups(filterGroups());
+			}
+
+			@Override
+			protected String doInBackground(Void... params) {
+				GPXFile gpx = getGpx();
+				SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper();
+				if (gpx != null) {
+					for (GpxDisplayItem item : selectedItems) {
+						if (gpx.showCurrentTrack) {
+							savingTrackHelper.deletePointData(item.locationStart);
+						} else {
+							gpx.deleteWptPt(item.locationStart);
+						}
+					}
+					if (gpx.showCurrentTrack) {
+						GPXUtilities.writeGpxFile(new File(gpx.path), gpx, app);
+						boolean selected = app.getSelectedGpxHelper().getSelectedFileByPath(gpx.path) != null;
+						if (selected) {
+							app.getSelectedGpxHelper().setGpxFileToDisplay(gpx);
+						}
+					}
+				}
+				selectedItems.clear();
+				selectedGroups.clear();
+				return getString(R.string.points_delete_multiple_succesful);
+			}
+
+		}.execute();
+	}
+
+	private void enterMapMarkersMode() {
+		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
+
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+				enableSelectionMode(true);
+				if (getSettings().USE_MAP_MARKERS.get()) {
+					createMenuItem(menu, SELECT_MAP_MARKERS_ACTION_MODE_ID, R.string.shared_string_add_to_map_markers,
+							R.drawable.ic_action_flag_dark, R.drawable.ic_action_flag_dark,
+							MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				} else {
-					int groupColor = child.group.getColor();
-					if (child.locationStart != null) {
-						groupColor = child.locationStart.getColor(groupColor);
+					createMenuItem(menu, SELECT_MAP_MARKERS_ACTION_MODE_ID, R.string.select_destination_and_intermediate_points,
+							R.drawable.ic_action_intermediate, R.drawable.ic_action_intermediate,
+							MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+				}
+				selectedItems.clear();
+				selectedGroups.clear();
+				adapter.notifyDataSetInvalidated();
+				updateSelectionMode(mode);
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+				return false;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode) {
+				enableSelectionMode(false);
+				adapter.notifyDataSetInvalidated();
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+				if (item.getItemId() == SELECT_MAP_MARKERS_ACTION_MODE_ID) {
+					mode.finish();
+					selectMapMarkersImpl();
+				}
+				return true;
+			}
+		});
+
+	}
+
+	private void selectMapMarkersImpl() {
+		if (!selectedItems.isEmpty()) {
+			if (getSettings().USE_MAP_MARKERS.get()) {
+				MapMarkersHelper markersHelper = app.getMapMarkersHelper();
+				List<LatLon> points = new ArrayList<>();
+				List<PointDescription> names = new ArrayList<>();
+				for(GpxDisplayItem i : selectedItems) {
+					if (i.locationStart != null) {
+						points.add(new LatLon(i.locationStart.lat, i.locationStart.lon));
+						names.add(new PointDescription(PointDescription.POINT_TYPE_MAP_MARKER, i.name));
 					}
-					if (groupColor == 0) {
-						groupColor = getMyActivity().getResources().getColor(R.color.gpx_track);
+				}
+				markersHelper.addMapMarkers(points, names);
+				MapActivity.launchMapActivityMoveToTop(getActivity());
+			} else {
+				final TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper();
+				for (GpxDisplayItem i : selectedItems) {
+					if (i.locationStart != null) {
+						targetPointsHelper.navigateToPoint(new LatLon(i.locationStart.lat, i.locationStart.lon), false,
+								targetPointsHelper.getIntermediatePoints().size() + 1,
+								new PointDescription(PointDescription.POINT_TYPE_FAVORITE, i.name));
 					}
-					icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getMyActivity(), groupColor, false));
+				}
+				if (getMyApplication().getRoutingHelper().isRouteCalculated()) {
+					targetPointsHelper.updateRouteAndRefresh(true);
+				}
+				IntermediatePointsDialog.openIntermediatePointsDialog(getActivity(), getMyApplication(), true);
+			}
+		}
+	}
+
+	private void enterFavoritesMode() {
+		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
+
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+				enableSelectionMode(true);
+				createMenuItem(menu, SELECT_FAVORITES_ACTION_MODE_ID, R.string.shared_string_add_to_favorites,
+						R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_dark,
+						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+				selectedItems.clear();
+				selectedGroups.clear();
+				adapter.notifyDataSetInvalidated();
+				updateSelectionMode(mode);
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+				return false;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode) {
+				enableSelectionMode(false);
+				adapter.notifyDataSetInvalidated();
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+				if (item.getItemId() == SELECT_FAVORITES_ACTION_MODE_ID) {
+					mode.finish();
+					selectFavoritesImpl();
+				}
+				return true;
+			}
+		});
+
+	}
+
+	private void selectFavoritesImpl() {
+		if (!selectedItems.isEmpty()) {
+			AlertDialog.Builder b = new AlertDialog.Builder(getMyActivity());
+			final EditText editText = new EditText(getMyActivity());
+			String name = selectedItems.iterator().next().group.getName();
+			if(name.indexOf('\n') > 0) {
+				name = name.substring(0, name.indexOf('\n'));
+			}
+			editText.setText(name);
+			int leftMargin = AndroidUtils.dpToPx(getContext(), 16f);
+			int topMargin = AndroidUtils.dpToPx(getContext(), 8f);
+			editText.setPadding(leftMargin, topMargin, leftMargin, topMargin);
+			b.setTitle(R.string.save_as_favorites_points);
+			b.setView(editText);
+			b.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					FavouritesDbHelper fdb = app.getFavorites();
+					for(GpxDisplayItem i : selectedItems) {
+						if (i.locationStart != null) {
+							FavouritePoint fp = new FavouritePoint(i.locationStart.lat, i.locationStart.lon, i.name, editText.getText().toString());
+							if (!Algorithms.isEmpty(i.description)) {
+								fp.setDescription(i.description);
+							}
+							fdb.addFavourite(fp, false);
+						}
+					}
+					fdb.saveCurrentPointsIntoFile();
+					MapActivity.launchMapActivityMoveToTop(getActivity());
+				}
+			});
+			b.setNegativeButton(R.string.shared_string_cancel, null);
+			b.show();
+		}
+	}
+
+	private void updateSelectionMode(ActionMode m) {
+		if (selectedItems.size() > 0) {
+			m.setTitle(selectedItems.size() + " " + getMyApplication().getString(R.string.shared_string_selected_lowercase));
+		} else {
+			m.setTitle("");
+		}
+	}
+
+	@Override
+	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
+		if (selectionMode) {
+			CheckBox ch = (CheckBox) v.findViewById(R.id.toggle_item);
+			GpxDisplayItem item = adapter.getChild(groupPosition, childPosition);
+			ch.setChecked(!ch.isChecked());
+			if (ch.isChecked()) {
+				selectedItems.add(item);
+			} else {
+				selectedItems.remove(item);
+			}
+			updateSelectionMode(actionMode);
+		} else {
+			final GpxDisplayItem item = adapter.getChild(groupPosition, childPosition);
+			if (item != null) {
+				if (item.group.getGpx() != null) {
+					app.getSelectedGpxHelper().setGpxFileToDisplay(item.group.getGpx());
+				}
+				final OsmandSettings settings = app.getSettings();
+				LatLon location = new LatLon(item.locationStart.lat, item.locationStart.lon);
+				settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+						settings.getLastKnownMapZoom(),
+						new PointDescription(PointDescription.POINT_TYPE_WPT, item.name),
+						false,
+						item.locationStart);
+
+				MapActivity.launchMapActivityMoveToTop(getActivity());
+			}
+		}
+		return true;
+	}
+
+	class PointGPXAdapter extends OsmandBaseExpandableListAdapter implements Filterable {
+
+		Map<GpxDisplayGroup, List<GpxDisplayItem>> itemGroups = new LinkedHashMap<>();
+		List<GpxDisplayGroup> groups = new ArrayList<>();
+		Filter myFilter;
+		private Set<?> filter;
+
+		public void synchronizeGroups(List<GpxDisplayGroup> gs) {
+			itemGroups.clear();
+			groups.clear();
+			Set<?> flt = filter;
+			Collections.sort(gs, new Comparator<GpxDisplayGroup>() {
+				@Override
+				public int compare(GpxDisplayGroup g1, GpxDisplayGroup g2) {
+					int i1 = g1.getType().ordinal();
+					int i2 = g2.getType().ordinal();
+					return i1 < i2 ? -1 : (i1 == i2 ? 0 : 1);
+				}
+			});
+			for (GpxDisplayGroup g : gs) {
+				if (g.getModifiableList().isEmpty()) {
+					continue;
+				}
+				boolean empty = true;
+				if (flt == null) {
+					empty = false;
+					itemGroups.put(g, new ArrayList<>(g.getModifiableList()));
+				} else {
+					ArrayList<GpxDisplayItem> list = new ArrayList<>();
+					for (GpxDisplayItem i : g.getModifiableList()) {
+						if (flt.contains(i)) {
+							list.add(i);
+							empty = false;
+						}
+					}
+					itemGroups.put(g, list);
+				}
+				if (!empty) {
+					groups.add(g);
 				}
 			}
-			row.setTag(child);
+			notifyDataSetChanged();
+		}
 
-			label.setText(Html.fromHtml(child.name.replace("\n", "<br/>")));
-			boolean expand = true; //child.expanded || isArgumentTrue(ARG_TO_EXPAND_TRACK_INFO)
-			if (expand && !Algorithms.isEmpty(child.description)) {
-				String d = child.description;
-				description.setText(Html.fromHtml(d));
+		@Override
+		public GpxDisplayItem getChild(int groupPosition, int childPosition) {
+			return itemGroups.get(groups.get(groupPosition)).get(childPosition);
+		}
+
+		@Override
+		public long getChildId(int groupPosition, int childPosition) {
+			return groupPosition * 10000 + childPosition;
+		}
+
+		@Override
+		public int getChildrenCount(int groupPosition) {
+			return itemGroups.get(groups.get(groupPosition)).size();
+		}
+
+		@Override
+		public GpxDisplayGroup getGroup(int groupPosition) {
+			return groups.get(groupPosition);
+		}
+
+		@Override
+		public int getGroupCount() {
+			return groups.size();
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return false;
+		}
+
+		@Override
+		public boolean isChildSelectable(int groupPosition, int childPosition) {
+			return true;
+		}
+
+		@Override
+		public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+			View row = convertView;
+			boolean checkBox = row != null && row.findViewById(R.id.toggle_item) instanceof CheckBox;
+			boolean same = (selectionMode && checkBox) || (!selectionMode && !checkBox);
+			if (row == null || !same) {
+				LayoutInflater inflater = getActivity().getLayoutInflater();
+				row = inflater.inflate(R.layout.wpt_list_item_category, parent, false);
+			}
+			row.setOnClickListener(null);
+			final GpxDisplayGroup group = getGroup(groupPosition);
+			row.findViewById(R.id.group_divider).setVisibility(groupPosition == 0 ? View.GONE : View.VISIBLE);
+			TextView label = (TextView) row.findViewById(R.id.category_name);
+			TextView description = (TextView) row.findViewById(R.id.category_desc);
+			if (group.getType() == GpxDisplayItemType.TRACK_POINTS) {
+				label.setText(getString(R.string.waypoints));
+				description.setText(getString(R.string.track_points_category_name));
+			} else {
+				label.setText(getString(R.string.route_points));
+				description.setText(getString(R.string.route_points_category_name));
+			}
+
+			if (selectionMode) {
+				final CheckBox ch = (CheckBox) row.findViewById(R.id.toggle_item);
+				ch.setVisibility(View.VISIBLE);
+				ch.setChecked(selectedGroups.contains(groupPosition));
+
+				ch.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						List<GpxDisplayItem> items = itemGroups.get(group);
+						if (ch.isChecked()) {
+							selectedGroups.add(groupPosition);
+							if (items != null) {
+								selectedItems.addAll(items);
+							}
+						} else {
+							selectedGroups.remove(groupPosition);
+							if (items != null) {
+								selectedItems.removeAll(items);
+							}
+						}
+						adapter.notifyDataSetInvalidated();
+						updateSelectionMode(actionMode);
+					}
+				});
+			} else {
+				final CheckBox ch = (CheckBox) row.findViewById(R.id.toggle_item);
+				ch.setVisibility(View.GONE);
+			}
+			row.findViewById(R.id.category_icon).setVisibility(View.GONE);
+			row.findViewById(R.id.options).setVisibility(View.GONE);
+			return row;
+		}
+
+
+		@Override
+		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView,
+								 ViewGroup parent) {
+			View row = convertView;
+			if (row == null) {
+				LayoutInflater inflater = getActivity().getLayoutInflater();
+				row = inflater.inflate(R.layout.wpt_list_item, parent, false);
+			}
+			if (childPosition == 0) {
+				row.findViewById(R.id.divider).setVisibility(View.VISIBLE);
+				row.findViewById(R.id.list_divider).setVisibility(View.GONE);
+			} else {
+				row.findViewById(R.id.divider).setVisibility(View.GONE);
+				row.findViewById(R.id.list_divider).setVisibility(View.VISIBLE);
+			}
+
+			ImageView icon = (ImageView) row.findViewById(R.id.icon);
+			TextView title = (TextView) row.findViewById(R.id.label);
+			TextView description = (TextView) row.findViewById(R.id.description);
+
+			final GpxDisplayItem gpxItem = getChild(groupPosition, childPosition);
+			boolean isWpt = gpxItem.group.getType() == GpxDisplayItemType.TRACK_POINTS;
+			ImageView options = (ImageView) row.findViewById(R.id.options);
+			if (isWpt) {
+				options.setFocusable(false);
+				options.setImageDrawable(getMyApplication().getIconsCache().getThemedIcon(
+						R.drawable.ic_overflow_menu_white));
+				options.setVisibility(View.VISIBLE);
+				options.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						IconsCache iconsCache = getMyApplication().getIconsCache();
+						final PopupMenu optionsMenu = new PopupMenu(getActivity(), v);
+						DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
+
+						MenuItem menuItem = optionsMenu.getMenu().add(R.string.shared_string_edit).setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_edit_dark));
+						menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+							@Override
+							public boolean onMenuItemClick(MenuItem mItem) {
+								final OsmandSettings settings = app.getSettings();
+								LatLon location = new LatLon(gpxItem.locationStart.lat, gpxItem.locationStart.lon);
+								settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+										settings.getLastKnownMapZoom(),
+										new PointDescription(PointDescription.POINT_TYPE_WPT, gpxItem.name),
+										false,
+										gpxItem.locationStart);
+								//todo: open edit dialog
+
+								MapActivity.launchMapActivityMoveToTop(getActivity());
+								return true;
+							}
+						});
+						optionsMenu.show();
+					}
+				});
+				int groupColor = gpxItem.group.getColor();
+				if (gpxItem.locationStart != null) {
+					groupColor = gpxItem.locationStart.getColor(groupColor);
+				}
+				if (groupColor == 0) {
+					groupColor = getMyActivity().getResources().getColor(R.color.gpx_track);
+				}
+				icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), groupColor, false));
+			} else {
+				icon.setImageDrawable(app.getIconsCache().getThemedIcon(R.drawable.ic_action_marker_dark));
+				options.setVisibility(View.GONE);
+			}
+			title.setText(gpxItem.name);
+			if (!Algorithms.isEmpty(gpxItem.description)) {
+				description.setText(gpxItem.description);
 				description.setVisibility(View.VISIBLE);
 			} else {
 				description.setVisibility(View.GONE);
 			}
 
+			final CheckBox ch = (CheckBox) row.findViewById(R.id.toggle_item);
+			if (selectionMode) {
+				ch.setVisibility(View.VISIBLE);
+				ch.setChecked(selectedItems.contains(gpxItem));
+				row.findViewById(R.id.icon).setVisibility(View.GONE);
+				ch.setOnClickListener(new View.OnClickListener() {
+
+					@Override
+					public void onClick(View v) {
+						if (ch.isChecked()) {
+							selectedItems.add(gpxItem);
+						} else {
+							selectedItems.remove(gpxItem);
+						}
+						updateSelectionMode(actionMode);
+					}
+				});
+			} else {
+				row.findViewById(R.id.icon).setVisibility(View.VISIBLE);
+				ch.setVisibility(View.GONE);
+			}
 			return row;
 		}
+
+		@Override
+		public Filter getFilter() {
+			if (myFilter == null) {
+				myFilter = new PointsFilter();
+			}
+			return myFilter;
+		}
+
+		public void setFilterResults(Set<?> values) {
+			this.filter = values;
+		}
+	}
+
+	public class PointsFilter extends Filter {
+
+		public PointsFilter() {
+		}
+
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+			FilterResults results = new FilterResults();
+			if (constraint == null || constraint.length() == 0) {
+				results.values = null;
+				results.count = 1;
+			} else {
+				Set<Object> filter = new HashSet<>();
+				String cs = constraint.toString().toLowerCase();
+				for (GpxDisplayGroup g : filterGroups()) {
+					for (GpxDisplayItem i : g.getModifiableList()) {
+						if (i.name.toLowerCase().contains(cs)) {
+							filter.add(i);
+						}
+					}
+				}
+				results.values = filter;
+				results.count = filter.size();
+			}
+			return results;
+		}
+
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+			synchronized (adapter) {
+				adapter.setFilterResults((Set<?>) results.values);
+				adapter.synchronizeGroups(filterGroups());
+			}
+			adapter.notifyDataSetChanged();
+			expandAllGroups();
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 1d22338079..b249655291 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -199,95 +199,97 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	}
 
 	private void setupListView(ListView listView) {
-		if (adapter.getCount() > 0) {
-			View view = getActivity().getLayoutInflater().inflate(R.layout.gpx_item_list_header, null, false);
-			listView.addHeaderView(view);
-			listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
-			final ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
-			final View splitIntervalView = view.findViewById(R.id.split_interval_view);
-			final View colorView = view.findViewById(R.id.color_view);
-			final SwitchCompat vis = (SwitchCompat) view.findViewById(R.id.showOnMapToggle);
-			vis.setChecked(app.getSelectedGpxHelper().getSelectedFileByPath(getGpx().path) != null);
-			vis.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-					SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
-					if (vis.isChecked() && sf.getModifiableGpxFile() != null) {
-						sf.processPoints();
-						updateColorView(colorView);
+		View view = getActivity().getLayoutInflater().inflate(R.layout.gpx_item_list_header, null, false);
+		listView.addHeaderView(view);
+		listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
+		final ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
+		final View splitColorView = view.findViewById(R.id.split_color_view);
+		final View divider = view.findViewById(R.id.divider);
+		final View splitIntervalView = view.findViewById(R.id.split_interval_view);
+		final View colorView = view.findViewById(R.id.color_view);
+		final SwitchCompat vis = (SwitchCompat) view.findViewById(R.id.showOnMapToggle);
+		vis.setChecked(app.getSelectedGpxHelper().getSelectedFileByPath(getGpx().path) != null);
+		vis.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
+				if (vis.isChecked() && sf.getModifiableGpxFile() != null) {
+					sf.processPoints();
+					updateColorView(colorView);
+				} else {
+					updateColorView(colorView);
+				}
+			}
+		});
+		imageView.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
+				if (vis.isChecked() && sf.getGpxFile() != null) {
+					final List<GpxDisplayGroup> groups = getOriginalGroups();
+					if (groups.size() > 0 && groups.get(0).getModifiableList().size() > 0) {
+						GpxDisplayItem item = groups.get(0).getModifiableList().get(0);
+						app.getSettings().setMapLocationToShow(item.locationStart.lat, item.locationStart.lon,
+								15,
+								new PointDescription(PointDescription.POINT_TYPE_GPX_ITEM, item.group.getGpxName()),
+								false,
+								item);
 					} else {
-						updateColorView(colorView);
-					}
-				}
-			});
-			imageView.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
-					if (vis.isChecked() && sf.getGpxFile() != null) {
-						final List<GpxDisplayGroup> groups = getOriginalGroups();
-						if (groups.size() > 0 && groups.get(0).getModifiableList().size() > 0) {
-							GpxDisplayItem item = groups.get(0).getModifiableList().get(0);
-							app.getSettings().setMapLocationToShow(item.locationStart.lat, item.locationStart.lon,
+						GPXUtilities.WptPt wpt = sf.getGpxFile().findPointToShow();
+						if (wpt != null) {
+							app.getSettings().setMapLocationToShow(wpt.getLatitude(), wpt.getLongitude(),
 									15,
-									new PointDescription(PointDescription.POINT_TYPE_GPX_ITEM, item.group.getGpxName()),
+									new PointDescription(PointDescription.POINT_TYPE_WPT, wpt.name),
 									false,
-									item);
-						} else {
-							GPXUtilities.WptPt wpt = sf.getGpxFile().findPointToShow();
-							if (wpt != null) {
-								app.getSettings().setMapLocationToShow(wpt.getLatitude(), wpt.getLongitude(),
-										15,
-										new PointDescription(PointDescription.POINT_TYPE_WPT, wpt.name),
-										false,
-										wpt);
-							}
+									wpt);
 						}
-						MapActivity.launchMapActivityMoveToTop(getMyActivity());
 					}
+					MapActivity.launchMapActivityMoveToTop(getMyActivity());
 				}
-			});
-			updateColorView(colorView);
-			colorView.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					final ListPopupWindow popup = new ListPopupWindow(getActivity());
-					popup.setAnchorView(colorView);
-					popup.setContentWidth(AndroidUtils.dpToPx(app, 200f));
-					popup.setModal(true);
-					popup.setDropDownGravity(Gravity.RIGHT | Gravity.TOP);
-					popup.setVerticalOffset(AndroidUtils.dpToPx(app, -48f));
-					popup.setHorizontalOffset(AndroidUtils.dpToPx(app, -6f));
-					final GpxAppearanceAdapter gpxApprAdapter = new GpxAppearanceAdapter(getActivity(),
-							getGpx().getColor(0), GpxAppearanceAdapterType.TRACK_COLOR);
-					popup.setAdapter(gpxApprAdapter);
-					popup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			}
+		});
+		updateColorView(colorView);
+		colorView.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				final ListPopupWindow popup = new ListPopupWindow(getActivity());
+				popup.setAnchorView(colorView);
+				popup.setContentWidth(AndroidUtils.dpToPx(app, 200f));
+				popup.setModal(true);
+				popup.setDropDownGravity(Gravity.RIGHT | Gravity.TOP);
+				popup.setVerticalOffset(AndroidUtils.dpToPx(app, -48f));
+				popup.setHorizontalOffset(AndroidUtils.dpToPx(app, -6f));
+				final GpxAppearanceAdapter gpxApprAdapter = new GpxAppearanceAdapter(getActivity(),
+						getGpx().getColor(0), GpxAppearanceAdapterType.TRACK_COLOR);
+				popup.setAdapter(gpxApprAdapter);
+				popup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
-						@Override
-						public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-							AppearanceListItem item = gpxApprAdapter.getItem(position);
-							if (item != null) {
-								if (item.getAttrName() == CURRENT_TRACK_COLOR_ATTR) {
-									int clr = item.getColor();
-									if (vis.isChecked()) {
-										SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
-										if (clr != 0 && sf.getModifiableGpxFile() != null) {
-											sf.getModifiableGpxFile().setColor(clr);
-											app.getGpxDatabase().updateColor(getGpxDataItem(), clr);
-										}
-									} else {
+					@Override
+					public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+						AppearanceListItem item = gpxApprAdapter.getItem(position);
+						if (item != null) {
+							if (item.getAttrName() == CURRENT_TRACK_COLOR_ATTR) {
+								int clr = item.getColor();
+								if (vis.isChecked()) {
+									SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
+									if (clr != 0 && sf.getModifiableGpxFile() != null) {
+										sf.getModifiableGpxFile().setColor(clr);
 										app.getGpxDatabase().updateColor(getGpxDataItem(), clr);
 									}
+								} else {
+									app.getGpxDatabase().updateColor(getGpxDataItem(), clr);
 								}
 							}
-							popup.dismiss();
-							updateColorView(colorView);
 						}
-					});
-					popup.show();
-				}
-			});
+						popup.dismiss();
+						updateColorView(colorView);
+					}
+				});
+				popup.show();
+			}
+		});
 
+		if (adapter.getCount() > 0) {
 			prepareSplitIntervalAdapterData();
 			setupSplitIntervalView(splitIntervalView);
 			updateSplitIntervalView(splitIntervalView);
@@ -320,6 +322,9 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 					popup.show();
 				}
 			});
+		} else {
+			splitColorView.setVisibility(View.GONE);
+			divider.setVisibility(View.GONE);
 		}
 	}
 
@@ -518,14 +523,12 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 
 			final OsmandSettings settings = app.getSettings();
 			LatLon location = new LatLon(child.locationStart.lat, child.locationStart.lon);
-
-			if (child.group.getType() == GpxDisplayItemType.TRACK_POINTS) {
-				settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+			settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
 						settings.getLastKnownMapZoom(),
-						new PointDescription(PointDescription.POINT_TYPE_WPT, child.locationStart.name),
+						new PointDescription(PointDescription.POINT_TYPE_GPX_ITEM, child.group.getGpxName()),
 						false,
-						child.locationStart);
-			}
+						child);
+
 			MapActivity.launchMapActivityMoveToTop(getActivity());
 		}
 	}