diff --git a/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml b/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml
index f0ff17170d..681c03e560 100644
--- a/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml
+++ b/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="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:baselineAligned="false"
     android:gravity="center_vertical"
     android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-    android:baselineAligned="false">
+    android:paddingStart="@dimen/content_padding"
+    android:paddingEnd="@dimen/content_padding"
+    android:paddingRight="@dimen/content_padding"
+    android:paddingLeft="@dimen/content_padding">
 
     <LinearLayout
         android:id="@+id/basic_item_body"
@@ -28,6 +32,8 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:paddingTop="@dimen/content_padding_small"
+                android:paddingBottom="@dimen/content_padding"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 tools:text="Some title" />
 
@@ -40,8 +46,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/bottom_sheet_content_margin"
             android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-            android:layout_marginEnd="@dimen/content_padding_half"
-            android:layout_marginRight="@dimen/content_padding_half"
+            android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+            android:layout_marginRight="@dimen/bottom_sheet_content_margin"
             tools:checked="true" />
 
     </LinearLayout>
@@ -62,11 +68,11 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon_after_divider"
             style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-            android:layout_width="@dimen/acceptable_touch_radius"
-            android:layout_height="@dimen/acceptable_touch_radius"
+            android:layout_width="@dimen/favorites_icon_right_margin"
+            android:layout_height="@dimen/favorites_icon_right_margin"
             android:layout_gravity="center"
+            android:layout_marginStart="@dimen/content_padding"
             android:layout_marginLeft="@dimen/content_padding"
-            android:layout_marginRight="@dimen/content_padding"
             app:srcCompat="@drawable/ic_action_track_line_bold_color" />
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/trip_recording_fragment.xml b/OsmAnd/res/layout/trip_recording_fragment.xml
index a460193cd5..8c43e98d5f 100644
--- a/OsmAnd/res/layout/trip_recording_fragment.xml
+++ b/OsmAnd/res/layout/trip_recording_fragment.xml
@@ -1,89 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	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:orientation="vertical"
-	android:paddingStart="@dimen/content_padding"
-	android:paddingLeft="@dimen/content_padding"
-	android:paddingTop="@dimen/bottom_sheet_content_margin"
-	android:paddingEnd="@dimen/content_padding"
-	android:paddingRight="@dimen/content_padding">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    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:orientation="vertical">
 
-	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/title"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/content_padding"
-		android:letterSpacing="@dimen/text_button_letter_spacing"
-		android:text="@string/monitoring_settings"
-		android:textSize="@dimen/default_list_text_size"
-		osmand:typeface="@string/font_roboto_medium" />
+    <net.osmand.plus.widgets.TextViewEx
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:letterSpacing="@dimen/text_button_letter_spacing"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:text="@string/monitoring_settings"
+        android:textSize="@dimen/default_list_text_size"
+        osmand:typeface="@string/font_roboto_medium" />
 
-	<include
-		android:id="@+id/show_track_on_map"
-		layout="@layout/bottom_sheet_with_switch_divider_and_additional_button" />
+    <include
+        android:id="@+id/show_track_on_map"
+        layout="@layout/bottom_sheet_with_switch_divider_and_additional_button" />
 
-	<View
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
-		android:background="?attr/dashboard_divider" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider" />
 
-	<View
-		android:layout_width="match_parent"
-		android:layout_height="@dimen/content_padding_small" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingTop="@dimen/bottom_sheet_content_margin"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1"
-		android:orientation="horizontal">
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/interval_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="@dimen/default_list_text_size"
+            tools:text="Interval value" />
 
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/interval_value"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:textSize="@dimen/default_list_text_size"
-			tools:text="Interval value" />
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/up_down_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            app:srcCompat="@drawable/ic_action_arrow_down" />
+    </LinearLayout>
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/up_down_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:background="@null"
-			app:srcCompat="@drawable/ic_action_arrow_down" />
-	</LinearLayout>
+    <LinearLayout
+        android:id="@+id/always_ask_and_range_slider_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding">
 
-	<com.google.android.material.slider.RangeSlider
-		android:id="@+id/interval_slider"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:contentDescription="@string/save_track_interval_globally"
-		android:stepSize="1"
-		app:labelBehavior="gone" />
+        <com.google.android.material.slider.RangeSlider
+            android:id="@+id/interval_slider"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/save_track_interval_globally"
+            android:stepSize="1"
+            app:haloRadius="@dimen/content_padding_small"
+            app:labelBehavior="gone"
+            app:thumbColor="@color/profile_icon_color_blue_light"
+            app:thumbRadius="@dimen/content_padding_small_half"
+            app:trackColorActive="@color/profile_icon_color_blue_light"
+            app:trackColorInactive="#4D007EB3"
+            app:tickColorInactive="#007EB3"
+            app:trackHeight="@dimen/slider_track_height"
+            tools:visibility="visible" />
 
-	<androidx.appcompat.widget.SwitchCompat
-		android:id="@+id/confirm_every_run"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_marginBottom="@dimen/content_padding"
-		android:letterSpacing="@dimen/text_button_letter_spacing"
-		android:minHeight="@dimen/context_menu_buttons_bottom_height"
-		android:paddingLeft="@dimen/content_padding_small"
-		android:paddingRight="@dimen/content_padding_small"
-		android:text="@string/confirm_every_run"
-		android:textColor="?android:textColorPrimary"
-		android:textSize="@dimen/default_list_text_size"
-		android:visibility="gone"
-		osmand:typeface="@string/font_roboto_regular"
-		tools:visibility="visible" />
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/confirm_every_run"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:letterSpacing="@dimen/text_button_letter_spacing"
+            android:minHeight="@dimen/context_menu_buttons_bottom_height"
+            android:paddingLeft="@dimen/content_padding_small"
+            android:paddingRight="@dimen/content_padding_small"
+            android:text="@string/confirm_every_run"
+            android:textColor="?attr/color_dialog_buttons"
+            android:textSize="@dimen/default_list_text_size"
+            osmand:typeface="@string/font_roboto_regular"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/second_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/content_padding"
+        android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
+        android:background="?attr/dashboard_divider" />
 
 </LinearLayout>
 
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java b/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
index f33f7dfa38..54b444ff30 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
@@ -31,7 +31,6 @@ import net.osmand.plus.UiUtilities.DialogButtonType;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.settings.backend.OsmandSettings;
@@ -50,8 +49,9 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 
 	private ImageView upDownBtn;
 	private SwitchCompat confirmEveryRun;
+	private RangeSlider intervalSlider;
 	private TextView intervalValueView;
-
+	private LinearLayout container;
 	private boolean infoExpanded;
 
 	@Override
@@ -66,11 +66,8 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 				.setCustomView(itemView)
 				.create());
 
-		int padding = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
 		final int paddingSmall = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
 
-		items.add(new DividerSpaceItem(context, padding));
-
 		LinearLayout showTrackOnMapView = itemView.findViewById(R.id.show_track_on_map);
 		TextView showTrackOnMapTitle = showTrackOnMapView.findViewById(R.id.title);
 		showTrackOnMapTitle.setText(R.string.show_track_on_map);
@@ -110,8 +107,10 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 		intervalValueView = itemView.findViewById(R.id.interval_value);
 		updateIntervalLegend();
 
-		RangeSlider intervalSlider = itemView.findViewById(R.id.interval_slider);
+		container = itemView.findViewById(R.id.always_ask_and_range_slider_container);
+		intervalSlider = itemView.findViewById(R.id.interval_slider);
 		intervalSlider.setValueTo(secondsLength + minutesLength - 1);
+		container.setVisibility(View.GONE);
 		intervalSlider.addOnChangeListener(new RangeSlider.OnChangeListener() {
 
 			@Override
@@ -218,7 +217,7 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 
 	private void toggleInfoView() {
 		infoExpanded = !infoExpanded;
-		AndroidUiHelper.updateVisibility(confirmEveryRun, infoExpanded);
+		AndroidUiHelper.updateVisibility(container, infoExpanded);
 		updateUpDownBtn();
 	}