diff --git a/OsmAnd/res/layout/bottom_sheet_item_list_title_with_descr.xml b/OsmAnd/res/layout/bottom_sheet_item_list_title_with_descr.xml
new file mode 100644
index 0000000000..e56e68e416
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_list_title_with_descr.xml
@@ -0,0 +1,43 @@
+<?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="@dimen/bottom_sheet_selected_item_title_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
+	android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
+	android:orientation="vertical"
+	android:paddingEnd="@dimen/content_padding"
+	android:paddingStart="@dimen/content_padding">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:ellipsize="end"
+		android:gravity="center_vertical"
+		android:maxLines="1"
+		android:letterSpacing="@dimen/text_button_letter_spacing"
+		android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="Some title" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:ellipsize="end"
+		android:maxLines="2"
+		android:letterSpacing="@dimen/description_letter_spacing"
+		android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Some description" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml b/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml
index 8c04121290..2e00611e3d 100644
--- a/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml
+++ b/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml
@@ -14,8 +14,8 @@
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding"
-		android:paddingTop="@dimen/multi_selection_menu_padding_top"
-		android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom"
+		android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
+		android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
 		android:text="@string/plan_route_open_existing_track"
 		android:textAppearance="@style/TextAppearance.ListItemTitle"
 		osmand:typeface="@string/font_roboto_medium" />
diff --git a/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml
index a138c7ee2c..7536d6ab90 100644
--- a/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml
@@ -20,8 +20,10 @@
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/choose_navigation_title"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/bottom_sheet_title_height"
+				android:layout_height="wrap_content"
 				android:gravity="center_vertical"
+				android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
+				android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
 				android:paddingEnd="@dimen/content_padding"
 				android:paddingLeft="@dimen/content_padding"
 				android:paddingRight="@dimen/content_padding"
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index a4d3e4dae6..beba6fe553 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -248,6 +248,8 @@
 	<dimen name="content_padding_small">12dp</dimen>
 	<dimen name="content_padding_half">8dp</dimen>
 	<dimen name="bottom_sheet_content_padding_small">8dp</dimen>
+	<dimen name="measurement_tool_menu_title_padding_top">13dp</dimen>
+	<dimen name="measurement_tool_menu_title_padding_bottom">5dp</dimen>
 	<dimen name="measurement_tool_divider_margin">8dp</dimen>
 	<dimen name="measurement_tool_content_padding_medium">12dp</dimen>
 	<dimen name="text_margin_small">4dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
index a7c946cf00..9cc768dad8 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
@@ -14,7 +14,6 @@ import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemButton;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 
 public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
 
@@ -27,12 +26,11 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
 	@Override
 	public void createMenuItems(Bundle savedInstanceState) {
 
-		items.add(new TitleItem(getString(R.string.exit_without_saving)));
-
 		items.add(new ShortDescriptionItem.Builder()
 				.setDescription(getString(R.string.plan_route_exit_dialog_descr))
 				.setDescriptionColorId(nightMode ? R.color.text_color_primary_dark : R.color.text_color_primary_light)
-				.setLayoutId(R.layout.bottom_sheet_item_description_long)
+				.setTitle(getString(R.string.exit_without_saving))
+				.setLayoutId(R.layout.bottom_sheet_item_list_title_with_descr)
 				.create());
 
 		items.add(new DividerSpaceItem(getContext(),
@@ -75,7 +73,7 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
 
 	@Override
 	protected int getDismissButtonTextId() {
-		return R.string.shared_string_close;
+		return R.string.shared_string_cancel;
 	}
 
 	public static void showInstance(@NonNull FragmentManager fragmentManager, @Nullable Fragment targetFragment) {