diff --git a/OsmAnd/res/layout/along_the_route_category_Item.xml b/OsmAnd/res/layout/along_the_route_category_Item.xml
new file mode 100644
index 0000000000..b12b001632
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_category_Item.xml
@@ -0,0 +1,66 @@
+<?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:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
+		android:visibility="gone" />
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+		android:background="?attr/selectableItemBackground">
+
+		<ImageView
+			android:id="@+id/explist_indicator"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start|center_vertical"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding"
+			tools:src="@drawable/ic_action_arrow_down" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="64dp"
+			android:layout_marginRight="64dp"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some Title" />
+
+		<android.support.v7.widget.SwitchCompat
+			android:id="@+id/compound_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|end"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false" />
+
+	</FrameLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/along_the_route_category_Item_with_switch_56dp.xml b/OsmAnd/res/layout/along_the_route_category_Item_with_switch_56dp.xml
new file mode 100644
index 0000000000..b12b001632
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_category_Item_with_switch_56dp.xml
@@ -0,0 +1,66 @@
+<?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:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
+		android:visibility="gone" />
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+		android:background="?attr/selectableItemBackground">
+
+		<ImageView
+			android:id="@+id/explist_indicator"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start|center_vertical"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding"
+			tools:src="@drawable/ic_action_arrow_down" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="64dp"
+			android:layout_marginRight="64dp"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some Title" />
+
+		<android.support.v7.widget.SwitchCompat
+			android:id="@+id/compound_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|end"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false" />
+
+	</FrameLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/along_the_route_category_item.xml b/OsmAnd/res/layout/along_the_route_category_item.xml
new file mode 100644
index 0000000000..780338706b
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_category_item.xml
@@ -0,0 +1,64 @@
+<?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:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+		android:background="?attr/selectableItemBackground">
+
+		<ImageView
+			android:id="@+id/explist_indicator"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start|center_vertical"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding"
+			tools:src="@drawable/ic_action_arrow_down" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="64dp"
+			android:layout_marginRight="64dp"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some Title" />
+
+		<android.support.v7.widget.SwitchCompat
+			android:id="@+id/compound_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|end"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false" />
+
+	</FrameLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/along_the_route_radius_poi.xml b/OsmAnd/res/layout/along_the_route_radius_poi.xml
new file mode 100644
index 0000000000..12bbc80032
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_radius_poi.xml
@@ -0,0 +1,91 @@
+<?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="56dp"
+	android:minHeight="56dp"
+	android:orientation="vertical"
+	android:paddingLeft="@dimen/route_info_start_divider_margin"
+	android:paddingStart="@dimen/route_info_start_divider_margin">
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="horizontal">
+
+		<LinearLayout
+			android:id="@+id/firstCellContainer"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:text="@string/search_radius_proximity"
+				android:textSize="@dimen/default_desc_text_size" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/description"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginRight="16dp"
+				android:layout_marginTop="2dp"
+				android:textColor="@color/color_myloc_distance"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="500 m" />
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/secondCellContainer"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/titleEx"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:text="@string/shared_string_type"
+				android:textSize="@dimen/default_desc_text_size" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/descriptionEx"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginRight="16dp"
+				android:layout_marginTop="2dp"
+				android:textColor="@color/color_myloc_distance"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="Cinema" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/along_the_route_radius_simple.xml b/OsmAnd/res/layout/along_the_route_radius_simple.xml
new file mode 100644
index 0000000000..c9080d863d
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_radius_simple.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:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="44dp"
+	android:orientation="horizontal">
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="64dp"
+		android:layout_marginStart="64dp"
+		android:layout_weight="1"
+		android:text="@string/search_radius_proximity"
+		android:textSize="@dimen/default_desc_text_size" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:textColor="@color/color_myloc_distance"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="500 m" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_item_show_along_the_route.xml b/OsmAnd/res/layout/bottom_sheet_item_show_along_the_route.xml
new file mode 100644
index 0000000000..7466ba0239
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_show_along_the_route.xml
@@ -0,0 +1,99 @@
+<?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:id="@+id/package_delivered_layout"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:descendantFocusability="blocksDescendants"
+	android:minHeight="50dp">
+
+	<ImageView
+		android:id="@+id/waypoint_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginBottom="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding"
+		android:src="@drawable/ic_action_fav_dark" />
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+		android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
+		android:layout_weight="1"
+		android:gravity="center"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/waypoint_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:textSize="@dimen/default_list_text_size"
+			tools:text="Some waypoint text" />
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="2dp">
+
+			<TextView
+				android:id="@+id/waypoint_dist"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom"
+				android:maxLines="1"
+				android:textColor="@color/color_myloc_distance"
+				android:textSize="@dimen/default_sub_text_size"
+				tools:text="12 km" />
+
+			<TextView
+				android:id="@+id/waypoint_deviation"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom"
+				android:layout_marginLeft="6dp"
+				android:layout_marginStart="6dp"
+				android:drawablePadding="2dp"
+				android:maxLines="1"
+				android:textColor="@color/secondary_text_dark"
+				android:textSize="@dimen/default_sub_text_size"
+				tools:text="Intermediate point " />
+
+			<TextView
+				android:id="@+id/waypoint_desc_text"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom"
+				android:layout_weight="1"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textColor="@color/secondary_text_dark"
+				android:textSize="@dimen/default_sub_text_size"
+				tools:text="some description" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<ImageButton
+		android:id="@+id/info_close"
+		style="@style/Widget.AppCompat.ActionButton"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
+		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="2dp"
+		android:layout_marginRight="2dp"
+		android:contentDescription="@string/shared_string_delete"
+		android:focusable="false"
+		android:scaleType="center"
+		android:src="@drawable/ic_action_remove_dark"/>
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_swith_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_swith_56dp.xml
new file mode 100644
index 0000000000..4e16664838
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_swith_56dp.xml
@@ -0,0 +1,65 @@
+<?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="@dimen/bottom_sheet_selected_item_title_height"
+	android:gravity="center_vertical"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
+		android:visibility="gone" />
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground">
+
+		<ImageView
+			android:id="@+id/explist_indicator"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start|center_vertical"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding"
+			tools:src="@drawable/ic_action_arrow_down" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="64dp"
+			android:layout_marginRight="64dp"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some Title" />
+
+		<android.support.v7.widget.SwitchCompat
+			android:id="@+id/compound_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|end"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false" />
+
+	</FrameLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/bottom_sheet_menu_base.xml b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
index 7e98ba5ca1..dc7ec4009f 100644
--- a/OsmAnd/res/layout/bottom_sheet_menu_base.xml
+++ b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
@@ -36,6 +36,7 @@
 		android:background="?attr/dashboard_divider"/>
 
 	<LinearLayout
+		android:id="@+id/buttons_container"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/bottom_sheet_cancel_button_height">