diff --git a/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml
index ad071dcc25..d777eb52c4 100644
--- a/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml
+++ b/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
        android:drawable="@drawable/marker_circle_background_dark_n"
-       android:insetBottom="14dp"
-       android:insetLeft="14dp"
-       android:insetRight="14dp"
-       android:insetTop="14dp"/>
\ No newline at end of file
+       android:insetBottom="@dimen/context_menu_first_line_top_margin"
+       android:insetLeft="@dimen/context_menu_first_line_top_margin"
+       android:insetRight="@dimen/context_menu_first_line_top_margin"
+       android:insetTop="@dimen/context_menu_first_line_top_margin"/>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml
index b20f1f27f0..8c2cc54e0a 100644
--- a/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml
+++ b/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
        android:drawable="@drawable/marker_circle_background_light_n"
-       android:insetBottom="14dp"
-       android:insetLeft="14dp"
-       android:insetRight="14dp"
-       android:insetTop="14dp"/>
\ No newline at end of file
+       android:insetBottom="@dimen/context_menu_first_line_top_margin"
+       android:insetLeft="@dimen/context_menu_first_line_top_margin"
+       android:insetRight="@dimen/context_menu_first_line_top_margin"
+       android:insetTop="@dimen/context_menu_first_line_top_margin"/>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml
index e9ab9f1da0..26b6310ad7 100644
--- a/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml
+++ b/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
        android:drawable="@drawable/marker_circle_background_on_map_n"
-       android:insetBottom="14dp"
-       android:insetLeft="14dp"
-       android:insetRight="14dp"
-       android:insetTop="14dp"/>
\ No newline at end of file
+       android:insetBottom="@dimen/context_menu_first_line_top_margin"
+       android:insetLeft="@dimen/context_menu_first_line_top_margin"
+       android:insetRight="@dimen/context_menu_first_line_top_margin"
+       android:insetTop="@dimen/context_menu_first_line_top_margin"/>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml
index 87a731b9d6..849b4ac748 100644
--- a/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml
+++ b/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
        android:drawable="@drawable/marker_circle_background_p"
-       android:insetBottom="14dp"
-       android:insetLeft="14dp"
-       android:insetRight="14dp"
-       android:insetTop="14dp">
+       android:insetBottom="@dimen/context_menu_first_line_top_margin"
+       android:insetLeft="@dimen/context_menu_first_line_top_margin"
+       android:insetRight="@dimen/context_menu_first_line_top_margin"
+       android:insetTop="@dimen/context_menu_first_line_top_margin">
 
 </inset>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 9a611c8672..3c3615d0af 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -70,9 +70,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginEnd="@dimen/text_margin_small"
                     android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginRight="@dimen/text_margin_small"
                     android:layout_marginStart="@dimen/measurement_tool_text_margin"
                     android:layout_toEndOf="@id/main_icon"
                     android:layout_toRightOf="@id/main_icon"
@@ -108,9 +108,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginEnd="@dimen/text_margin_small"
                     android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginRight="@dimen/text_margin_small"
                     android:layout_marginStart="@dimen/measurement_tool_text_margin"
                     android:layout_toEndOf="@id/main_icon"
                     android:layout_toRightOf="@id/main_icon"
@@ -123,9 +123,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginEnd="@dimen/text_margin_small"
                     android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginRight="@dimen/text_margin_small"
                     android:layout_marginStart="@dimen/measurement_tool_text_margin"
                     android:layout_toEndOf="@id/main_icon"
                     android:layout_toRightOf="@id/main_icon"
diff --git a/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml b/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml
index d85da7b8fc..fa57a31b82 100644
--- a/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml
+++ b/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml
@@ -47,8 +47,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
-                            android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                            android:layout_marginEnd="@dimen/text_margin_small"
+                            android:layout_marginRight="@dimen/text_margin_small"
                             android:ellipsize="end"
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.ListItemTitle"
@@ -86,8 +86,8 @@
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:maxLines="1"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingLeft="@dimen/list_content_padding"
+                    android:paddingRight="@dimen/list_content_padding"
                     android:text="@string/shared_string_options"
                     android:textAllCaps="true"
                     android:textColor="?attr/color_dialog_buttons"
diff --git a/OsmAnd/res/layout/close_measurement_tool_dialog.xml b/OsmAnd/res/layout/close_measurement_tool_dialog.xml
index e1c823056a..66d2b6fa42 100644
--- a/OsmAnd/res/layout/close_measurement_tool_dialog.xml
+++ b/OsmAnd/res/layout/close_measurement_tool_dialog.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:padding="@dimen/bottom_sheet_content_padding">
+    android:padding="@dimen/content_padding">
 
     <TextView
         android:layout_width="0dp"
diff --git a/OsmAnd/res/layout/fragment_coordinate_input_dialog.xml b/OsmAnd/res/layout/fragment_coordinate_input_dialog.xml
index bd3c04fbbc..df67805097 100644
--- a/OsmAnd/res/layout/fragment_coordinate_input_dialog.xml
+++ b/OsmAnd/res/layout/fragment_coordinate_input_dialog.xml
@@ -175,7 +175,7 @@
 
             <ImageView
                 android:id="@+id/show_hide_keyboard_icon"
-                android:padding="@dimen/bottom_sheet_content_padding"
+                android:padding="@dimen/content_padding"
                 android:background="?attr/selectableItemBackground"
                 android:layout_gravity="center_vertical"
                 android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/fragment_map_markers_dialog.xml b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
index 195dbb1ccb..1a8842e136 100644
--- a/OsmAnd/res/layout/fragment_map_markers_dialog.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
@@ -45,8 +45,8 @@
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:maxLines="1"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingLeft="@dimen/content_padding"
+                    android:paddingRight="@dimen/content_padding"
                     android:text="@string/shared_string_options"
                     android:textAllCaps="true"
                     android:textColor="@color/color_white"
@@ -77,7 +77,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="5dp"
+            android:layout_height="@dimen/shadow_height"
             android:layout_gravity="bottom"
             android:alpha="0.5"
             android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/fragment_marker_coordinate_input_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_coordinate_input_bottom_sheet_dialog.xml
index e970fe8da9..0043b20544 100644
--- a/OsmAnd/res/layout/fragment_marker_coordinate_input_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_coordinate_input_bottom_sheet_dialog.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/fast_coordinates_input"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -34,10 +34,10 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_descr_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/fast_coordinates_input_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
diff --git a/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml b/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml
index cd2b841a19..9a9d487f03 100644
--- a/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml
+++ b/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/shared_string_options"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -38,8 +38,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:descendantFocusability="blocksDescendants"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding">
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding">
 
                 <ImageView
                     android:layout_gravity="center_vertical"
@@ -83,8 +83,8 @@
                 android:textAllCaps="true"
                 android:paddingTop="@dimen/bottom_sheet_content_padding_small"
                 android:paddingBottom="@dimen/bottom_sheet_content_padding_small"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/coordinates_format"/>
diff --git a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
index b89be37e6b..a53f553019 100644
--- a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
@@ -17,7 +17,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			android:paddingBottom="8dp">
+			android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
 
 			<LinearLayout
 				android:layout_width="match_parent"
@@ -25,10 +25,10 @@
 				android:gravity="center_vertical"
 				android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
 				android:orientation="horizontal"
-				android:paddingEnd="@dimen/bottom_sheet_content_padding"
-				android:paddingLeft="@dimen/bottom_sheet_content_padding"
-				android:paddingRight="@dimen/bottom_sheet_content_padding"
-				android:paddingStart="@dimen/bottom_sheet_content_padding">
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding">
 
 				<ImageView
 					android:id="@+id/map_marker_icon"
@@ -82,10 +82,10 @@
 				android:background="?attr/selectableItemBackground"
 				android:gravity="center_vertical"
 				android:minHeight="@dimen/bottom_sheet_list_item_height"
-				android:paddingEnd="@dimen/bottom_sheet_content_padding"
-				android:paddingLeft="@dimen/bottom_sheet_content_padding"
-				android:paddingRight="@dimen/bottom_sheet_content_padding"
-				android:paddingStart="@dimen/bottom_sheet_content_padding">
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding">
 
 				<ImageView
 					android:id="@+id/make_active_icon"
@@ -110,10 +110,10 @@
 				android:background="?attr/selectableItemBackground"
 				android:gravity="center_vertical"
 				android:minHeight="@dimen/bottom_sheet_list_item_height"
-				android:paddingEnd="@dimen/bottom_sheet_content_padding"
-				android:paddingLeft="@dimen/bottom_sheet_content_padding"
-				android:paddingRight="@dimen/bottom_sheet_content_padding"
-				android:paddingStart="@dimen/bottom_sheet_content_padding">
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding">
 
 				<ImageView
 					android:id="@+id/delete_icon"
diff --git a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
index 2253a3ead1..ab56b39923 100644
--- a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
@@ -17,16 +17,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="8dp">
+            android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
 
             <net.osmand.plus.widgets.TextViewEx
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/shared_string_options"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -37,15 +37,15 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/sort_by_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/standard_icon_size"
+                    android:layout_height="@dimen/standard_icon_size"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
@@ -66,15 +66,15 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/show_direction_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/standard_icon_size"
+                    android:layout_height="@dimen/standard_icon_size"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
@@ -105,10 +105,10 @@
             <View
                 android:layout_width="wrap_content"
                 android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-                android:layout_marginLeft="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginStart="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+                android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+                android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
                 android:background="?attr/dashboard_divider"/>
 
             <LinearLayout
@@ -118,15 +118,15 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/coordinate_input_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/standard_icon_size"
+                    android:layout_height="@dimen/standard_icon_size"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
@@ -147,15 +147,15 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/build_route_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/standard_icon_size"
+                    android:layout_height="@dimen/standard_icon_size"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
@@ -176,15 +176,15 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/save_as_new_track_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/standard_icon_size"
+                    android:layout_height="@dimen/standard_icon_size"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
@@ -203,10 +203,10 @@
                 android:id="@+id/move_all_to_history_divider"
                 android:layout_width="wrap_content"
                 android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-                android:layout_marginLeft="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginStart="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+                android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+                android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
                 android:background="?attr/dashboard_divider"/>
 
             <LinearLayout
@@ -215,15 +215,15 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/move_all_to_history_icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="@dimen/standard_icon_size"
+                    android:layout_height="@dimen/standard_icon_size"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
diff --git a/OsmAnd/res/layout/fragment_marker_order_by_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_order_by_bottom_sheet_dialog.xml
index 3d5498ba61..db93b04e55 100644
--- a/OsmAnd/res/layout/fragment_marker_order_by_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_order_by_bottom_sheet_dialog.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 tools:text="@string/order_by"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -37,10 +37,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:gravity="center_vertical">
 
                 <ImageView
@@ -66,10 +66,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:gravity="center_vertical">
 
                 <ImageView
@@ -95,10 +95,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:gravity="center_vertical">
 
                 <ImageView
@@ -124,10 +124,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:gravity="center_vertical">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_marker_save_as_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_save_as_track_bottom_sheet_dialog.xml
index e2082b0b50..6cdf00ddf6 100644
--- a/OsmAnd/res/layout/fragment_marker_save_as_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_save_as_track_bottom_sheet_dialog.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/marker_save_as_track"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -34,10 +34,10 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_descr_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/marker_save_as_track_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
diff --git a/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
index d94792fa53..c818680b60 100644
--- a/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/show_direction"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -34,10 +34,10 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_descr_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/marker_show_distance_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
@@ -122,8 +122,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:descendantFocusability="blocksDescendants"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding">
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding">
 
                 <TextView
                     android:layout_width="0dp"
@@ -152,8 +152,8 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding">
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding">
 
                 <TextView
                     android:layout_width="0dp"
@@ -194,10 +194,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/bottom_sheet_list_item_height"
                     android:minHeight="@dimen/bottom_sheet_list_item_height"
-                    android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                    android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                    android:paddingRight="@dimen/bottom_sheet_content_padding"
-                    android:paddingStart="@dimen/bottom_sheet_content_padding">
+                    android:paddingEnd="@dimen/content_padding"
+                    android:paddingLeft="@dimen/content_padding"
+                    android:paddingRight="@dimen/content_padding"
+                    android:paddingStart="@dimen/content_padding">
 
                     <ImageView
                         android:id="@+id/top_bar_icon"
@@ -243,10 +243,10 @@
                     android:layout_height="@dimen/bottom_sheet_list_item_height"
                     android:foreground="?attr/selectableItemBackground"
                     android:minHeight="@dimen/bottom_sheet_list_item_height"
-                    android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                    android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                    android:paddingRight="@dimen/bottom_sheet_content_padding"
-                    android:paddingStart="@dimen/bottom_sheet_content_padding">
+                    android:paddingEnd="@dimen/content_padding"
+                    android:paddingLeft="@dimen/content_padding"
+                    android:paddingRight="@dimen/content_padding"
+                    android:paddingStart="@dimen/content_padding">
 
                     <ImageView
                         android:id="@+id/widget_icon"
@@ -292,10 +292,10 @@
                     android:layout_height="@dimen/bottom_sheet_list_item_height"
                     android:foreground="?attr/selectableItemBackground"
                     android:minHeight="@dimen/bottom_sheet_list_item_height"
-                    android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                    android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                    android:paddingRight="@dimen/bottom_sheet_content_padding"
-                    android:paddingStart="@dimen/bottom_sheet_content_padding">
+                    android:paddingEnd="@dimen/content_padding"
+                    android:paddingLeft="@dimen/content_padding"
+                    android:paddingRight="@dimen/content_padding"
+                    android:paddingStart="@dimen/content_padding">
 
                     <ImageView
                         android:id="@+id/none_icon"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 2c76e6e020..ec18d52894 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -65,9 +65,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                android:layout_marginEnd="@dimen/text_margin_small"
                 android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                android:layout_marginRight="@dimen/text_margin_small"
                 android:layout_marginStart="@dimen/measurement_tool_text_margin"
                 android:layout_toEndOf="@id/main_icon"
                 android:layout_toRightOf="@id/main_icon"
@@ -103,9 +103,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                android:layout_marginEnd="@dimen/text_margin_small"
                 android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                android:layout_marginRight="@dimen/text_margin_small"
                 android:layout_marginStart="@dimen/measurement_tool_text_margin"
                 android:layout_toEndOf="@id/main_icon"
                 android:layout_toRightOf="@id/main_icon"
@@ -118,9 +118,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                android:layout_marginEnd="@dimen/text_margin_small"
                 android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                android:layout_marginRight="@dimen/text_margin_small"
                 android:layout_marginStart="@dimen/measurement_tool_text_margin"
                 android:layout_toEndOf="@id/main_icon"
                 android:layout_toRightOf="@id/main_icon"
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 4e1a338a84..dabbd5dcea 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -17,17 +17,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="8dp">
+            android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/options_title"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/shared_string_options"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -38,10 +38,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/snap_to_road_icon"
@@ -99,10 +99,10 @@
             <View
                 android:layout_width="wrap_content"
                 android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-                android:layout_marginLeft="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginStart="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+                android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+                android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
                 android:background="?attr/dashboard_divider"/>
 
             <RelativeLayout
@@ -111,10 +111,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:visibility="gone">
 
                 <ImageView
@@ -143,10 +143,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/save_as_new_track_icon"
@@ -174,10 +174,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/add_to_the_track_icon"
@@ -202,10 +202,10 @@
             <View
                 android:layout_width="wrap_content"
                 android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-                android:layout_marginLeft="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginStart="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+                android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+                android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
                 android:background="?attr/dashboard_divider"/>
 
             <RelativeLayout
@@ -214,10 +214,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/clear_all_icon"
diff --git a/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
index 7b10fff56d..14af472791 100644
--- a/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
@@ -24,10 +24,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/shared_string_options"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -39,10 +39,10 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:visibility="gone"
                 tools:visibility="visible">
 
@@ -71,10 +71,10 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/navigate_icon"
@@ -99,10 +99,10 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/make_round_trip_icon"
@@ -161,10 +161,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/sort_by"
                 android:textAllCaps="true"
                 android:textColor="?android:textColorSecondary"
@@ -178,10 +178,10 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/door_to_door_icon"
@@ -207,10 +207,10 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/reverse_icon"
diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
index 0d4407b103..5606b9625f 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/shared_string_save_as_gpx"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
@@ -34,10 +34,10 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_descr_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/measurement_tool_save_as_new_track_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
@@ -121,10 +121,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/route_point_icon"
@@ -152,10 +152,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/line_icon"
diff --git a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
index 828941f378..ff13e0cad9 100644
--- a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
@@ -22,10 +22,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
                 android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/selected_point_icon"
@@ -104,10 +104,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/move_point_icon"
@@ -135,10 +135,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/delete_point_icon"
@@ -163,10 +163,10 @@
             <View
                 android:layout_width="wrap_content"
                 android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-                android:layout_marginLeft="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginStart="@dimen/measurement_tool_bottom_divider_margin_start"
-                android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+                android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+                android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
+                android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
                 android:background="?attr/dashboard_divider"/>
 
             <RelativeLayout
@@ -175,10 +175,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/add_point_after_icon"
@@ -206,10 +206,10 @@
                 android:layout_height="@dimen/bottom_sheet_list_item_height"
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding">
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/add_point_before_icon"
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 1b44ff7b8b..931b53f5ed 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -23,20 +23,20 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/choose_navigation_type"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_descr_height"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/measurement_tool_snap_to_road_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
index 783198f543..ee7652a09c 100644
--- a/OsmAnd/res/layout/list_item_icon_and_title.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -6,10 +6,10 @@
     android:layout_height="@dimen/bottom_sheet_list_item_height"
     android:background="?attr/selectableItemBackground"
     android:minHeight="@dimen/bottom_sheet_list_item_height"
-    android:paddingEnd="@dimen/bottom_sheet_content_padding"
-    android:paddingLeft="@dimen/bottom_sheet_content_padding"
-    android:paddingRight="@dimen/bottom_sheet_content_padding"
-    android:paddingStart="@dimen/bottom_sheet_content_padding">
+    android:paddingEnd="@dimen/content_padding"
+    android:paddingLeft="@dimen/content_padding"
+    android:paddingRight="@dimen/content_padding"
+    android:paddingStart="@dimen/content_padding">
 
     <ImageView
         android:id="@+id/icon"
diff --git a/OsmAnd/res/layout/map_marker_item_header.xml b/OsmAnd/res/layout/map_marker_item_header.xml
index bea554a14b..e6665ec2f7 100644
--- a/OsmAnd/res/layout/map_marker_item_header.xml
+++ b/OsmAnd/res/layout/map_marker_item_header.xml
@@ -10,22 +10,22 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/bottom_sheet_list_item_height"
         android:orientation="horizontal"
         android:background="?attr/bg_color">
 
         <ImageView
             android:id="@+id/icon"
             android:scaleType="centerInside"
-            android:layout_width="56dp"
-            android:layout_height="48dp"
+            android:layout_width="@dimen/map_button_shadow_width"
+            android:layout_height="match_parent"
             tools:src="@drawable/ic_action_fav_dark"
             tools:visibility="visible"
             android:visibility="gone"/>
 
         <View
             android:id="@+id/icon_space"
-            android:layout_width="16dp"
+            android:layout_width="@dimen/content_padding"
             android:layout_height="match_parent"/>
 
         <android.support.v7.widget.AppCompatTextView
@@ -40,8 +40,8 @@
             android:id="@+id/disable_group_switch"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+            android:layout_marginRight="@dimen/bottom_sheet_content_margin"
             android:focusableInTouchMode="true"/>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml
index 3f1f1d6c38..2ebd8cd890 100644
--- a/OsmAnd/res/layout/map_marker_item_new.xml
+++ b/OsmAnd/res/layout/map_marker_item_new.xml
@@ -25,13 +25,13 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="56dp"
+            android:layout_height="@dimen/map_button_shadow_width"
             android:background="?attr/selectableItemBackground">
 
             <android.support.v7.widget.AppCompatImageView
                 android:id="@+id/map_marker_reorder_icon"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
+                android:layout_width="@dimen/map_button_shadow_width"
+                android:layout_height="@dimen/map_button_shadow_width"
                 android:layout_gravity="center_vertical"
                 android:scaleType="centerInside"
                 android:tint="?attr/secondary_icon_color"
@@ -39,7 +39,7 @@
 
             <View
                 android:id="@+id/flag_icon_left_space"
-                android:layout_width="16dp"
+                android:layout_width="@dimen/content_padding"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 tools:visibility="visible"/>
@@ -49,8 +49,8 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+                android:layout_marginRight="@dimen/bottom_sheet_content_margin"
                 tools:src="@drawable/ic_action_flag_dark"/>
 
             <LinearLayout
@@ -61,7 +61,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="28dp">
+                    android:layout_height="@dimen/map_marker_title_height">
 
                     <android.support.v7.widget.AppCompatTextView
                         android:id="@+id/map_marker_title"
@@ -96,8 +96,8 @@
                         android:id="@+id/map_marker_direction_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginEnd="@dimen/text_margin_small"
+                        android:layout_marginRight="@dimen/text_margin_small"
                         tools:src="@drawable/ic_direction_arrow"/>
 
                     <android.support.v7.widget.AppCompatTextView
@@ -110,7 +110,7 @@
 
                     <View
                         android:id="@+id/map_marker_left_point_space"
-                        android:layout_width="4dp"
+                        android:layout_width="@dimen/text_margin_small"
                         android:layout_height="match_parent"/>
 
                     <android.support.v7.widget.AppCompatTextView
@@ -125,7 +125,7 @@
 
                     <View
                         android:id="@+id/map_marker_right_point_space"
-                        android:layout_width="4dp"
+                        android:layout_width="@dimen/text_margin_small"
                         android:layout_height="match_parent"/>
 
                     <android.support.v7.widget.AppCompatTextView
@@ -143,8 +143,8 @@
 
             <ImageButton
                 android:id="@+id/map_marker_options_button"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
+                android:layout_width="@dimen/map_button_shadow_width"
+                android:layout_height="@dimen/map_button_shadow_width"
                 android:focusableInTouchMode="true"
                 tools:background="@drawable/marker_circle_background_dark_with_inset"
                 tools:src="@drawable/ic_action_marker_passed"/>
@@ -158,10 +158,10 @@
                     android:id="@+id/map_marker_check_box"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginRight="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginTop="@dimen/bottom_sheet_content_margin"
                     android:visibility="gone"
                     tools:visibility="visible"/>
             </FrameLayout>
@@ -172,8 +172,8 @@
             android:id="@+id/divider"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginLeft="56dp"
-            android:layout_marginStart="56dp"
+            android:layout_marginLeft="@dimen/map_button_shadow_width"
+            android:layout_marginStart="@dimen/map_button_shadow_width"
             tools:background="?attr/dashboard_divider"/>
     </LinearLayout>
 
diff --git a/OsmAnd/res/layout/map_marker_item_show_hide_history.xml b/OsmAnd/res/layout/map_marker_item_show_hide_history.xml
index 908b633e61..3d066409d2 100644
--- a/OsmAnd/res/layout/map_marker_item_show_hide_history.xml
+++ b/OsmAnd/res/layout/map_marker_item_show_hide_history.xml
@@ -10,19 +10,19 @@
     <FrameLayout
         android:background="?attr/selectableItemBackground"
         android:layout_width="match_parent"
-        android:layout_height="48dp">
+        android:layout_height="@dimen/bottom_sheet_list_item_height">
 
         <net.osmand.plus.widgets.TextViewEx
             android:background="?attr/bg_color"
             android:id="@+id/show_hide_history_title"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="56dp"
-            android:paddingStart="56dp"
+            android:paddingLeft="@dimen/map_button_shadow_width"
+            android:paddingStart="@dimen/map_button_shadow_width"
             android:textAllCaps="true"
             android:gravity="center_vertical"
             tools:text="Show passed"
-            android:textSize="12sp"
+            android:textSize="@dimen/default_sub_text_size"
             osmand:typeface="@string/font_roboto_medium"
             android:textColor="@color/dashboard_blue"/>
 
diff --git a/OsmAnd/res/layout/marker_coordinate_formats.xml b/OsmAnd/res/layout/marker_coordinate_formats.xml
index 3d589075c9..f342c3d05a 100644
--- a/OsmAnd/res/layout/marker_coordinate_formats.xml
+++ b/OsmAnd/res/layout/marker_coordinate_formats.xml
@@ -12,10 +12,10 @@
         android:background="?attr/selectableItemBackground"
         android:gravity="center_vertical"
         android:minHeight="@dimen/bottom_sheet_list_item_height"
-        android:paddingEnd="@dimen/bottom_sheet_content_padding"
-        android:paddingLeft="@dimen/bottom_sheet_content_padding"
-        android:paddingRight="@dimen/bottom_sheet_content_padding"
-        android:paddingStart="@dimen/bottom_sheet_content_padding">
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingStart="@dimen/content_padding">
 
         <ImageView
             android:id="@+id/degrees_icon"
@@ -51,10 +51,10 @@
         android:background="?attr/selectableItemBackground"
         android:gravity="center_vertical"
         android:minHeight="@dimen/bottom_sheet_list_item_height"
-        android:paddingEnd="@dimen/bottom_sheet_content_padding"
-        android:paddingLeft="@dimen/bottom_sheet_content_padding"
-        android:paddingRight="@dimen/bottom_sheet_content_padding"
-        android:paddingStart="@dimen/bottom_sheet_content_padding">
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingStart="@dimen/content_padding">
 
         <ImageView
             android:id="@+id/minutes_icon"
@@ -89,10 +89,10 @@
         android:background="?attr/selectableItemBackground"
         android:gravity="center_vertical"
         android:minHeight="@dimen/bottom_sheet_list_item_height"
-        android:paddingEnd="@dimen/bottom_sheet_content_padding"
-        android:paddingLeft="@dimen/bottom_sheet_content_padding"
-        android:paddingRight="@dimen/bottom_sheet_content_padding"
-        android:paddingStart="@dimen/bottom_sheet_content_padding">
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingStart="@dimen/content_padding">
 
         <ImageView
             android:id="@+id/seconds_icon"
diff --git a/OsmAnd/res/layout/markers_track_name_edit_text.xml b/OsmAnd/res/layout/markers_track_name_edit_text.xml
index e16cc49fea..35196fb3e4 100644
--- a/OsmAnd/res/layout/markers_track_name_edit_text.xml
+++ b/OsmAnd/res/layout/markers_track_name_edit_text.xml
@@ -15,10 +15,10 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:hint="@string/shared_string_name"
-		android:paddingEnd="@dimen/bottom_sheet_content_padding"
-		android:paddingLeft="@dimen/bottom_sheet_content_padding"
-		android:paddingRight="@dimen/bottom_sheet_content_padding"
-		android:paddingStart="@dimen/bottom_sheet_content_padding">
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding">
 
 		<android.support.design.widget.TextInputEditText
 			android:id="@+id/name_edit_text"
diff --git a/OsmAnd/res/layout/markers_track_name_text_field_box.xml b/OsmAnd/res/layout/markers_track_name_text_field_box.xml
index 06d00f65ff..66b7598238 100644
--- a/OsmAnd/res/layout/markers_track_name_text_field_box.xml
+++ b/OsmAnd/res/layout/markers_track_name_text_field_box.xml
@@ -15,10 +15,10 @@
 		android:id="@+id/name_text_box"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingEnd="@dimen/bottom_sheet_content_padding"
-		android:paddingLeft="@dimen/bottom_sheet_content_padding"
-		android:paddingRight="@dimen/bottom_sheet_content_padding"
-		android:paddingStart="@dimen/bottom_sheet_content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding"
 		app:labelText="@string/shared_string_name">
 
 		<studio.carbonylgroup.textfieldboxes.ExtendedEditText
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 27608314e3..45277613a4 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="@dimen/bottom_sheet_list_item_height"
     android:descendantFocusability="blocksDescendants">
 
     <RelativeLayout
@@ -18,12 +18,12 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:paddingBottom="12dp"
-            android:paddingEnd="16dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingStart="16dp"
-            android:paddingTop="12dp"
+            android:paddingBottom="@dimen/measurement_tool_content_padding_medium"
+            android:paddingEnd="@dimen/content_padding"
+            android:paddingLeft="@dimen/content_padding"
+            android:paddingRight="@dimen/content_padding"
+            android:paddingStart="@dimen/content_padding"
+            android:paddingTop="@dimen/measurement_tool_content_padding_medium"
             android:tint="?attr/secondary_icon_color"
             tools:src="@drawable/ic_action_reorder"/>
 
@@ -32,8 +32,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+            android:layout_marginRight="@dimen/bottom_sheet_content_margin"
             android:layout_toEndOf="@id/measure_point_reorder_icon"
             android:layout_toRightOf="@id/measure_point_reorder_icon"
             tools:src="@drawable/ic_action_measure_point"/>
@@ -47,12 +47,12 @@
             android:layout_centerVertical="true"
             android:background="?attr/selectableItemBackground"
             android:focusableInTouchMode="true"
-            android:paddingBottom="12dp"
-            android:paddingEnd="16dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingStart="16dp"
-            android:paddingTop="12dp"
+            android:paddingBottom="@dimen/measurement_tool_content_padding_medium"
+            android:paddingEnd="@dimen/content_padding"
+            android:paddingLeft="@dimen/content_padding"
+            android:paddingRight="@dimen/content_padding"
+            android:paddingStart="@dimen/content_padding"
+            android:paddingTop="@dimen/measurement_tool_content_padding_medium"
             tools:src="@drawable/ic_action_remove_dark"/>
 
         <LinearLayout
@@ -95,8 +95,8 @@
                     android:layout_height="wrap_content"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_sub_text_size"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+                    android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
                     tools:text="Altitude: 345 m"/>
 
                 <android.support.v7.widget.AppCompatTextView
diff --git a/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml b/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml
index 900a8c58c3..739f944357 100644
--- a/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml
+++ b/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml
@@ -108,8 +108,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                    android:layout_marginEnd="@dimen/text_margin_small"
+                    android:layout_marginRight="@dimen/text_margin_small"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textAppearance="@style/TextAppearance.ListItemTitle"
diff --git a/OsmAnd/res/layout/save_gpx_dialog.xml b/OsmAnd/res/layout/save_gpx_dialog.xml
index ef4f0a66b2..b7da430e2b 100644
--- a/OsmAnd/res/layout/save_gpx_dialog.xml
+++ b/OsmAnd/res/layout/save_gpx_dialog.xml
@@ -38,7 +38,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/bottom_sheet_content_padding">
+        android:padding="@dimen/content_padding">
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/toggle_show_on_map"
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 00d6df7e50..a928c35100 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -75,6 +75,8 @@
     <dimen name="default_sub_text_size">14sp</dimen>
 	<dimen name="welcome_header_text_size">27sp</dimen>
 
+	<dimen name="dialog_header_text_size">24sp</dimen>
+
 	<dimen name="default_split_segments_overview">15sp</dimen>
 	<dimen name="default_split_segments_data">15sp</dimen>
 	<dimen name="default_split_segments_sub">12sp</dimen>
@@ -97,11 +99,11 @@
 	<dimen name="measurement_tool_select_radius">30dp</dimen>
 	<dimen name="bottom_sheet_content_margin">24dp</dimen>
 	<dimen name="bottom_sheet_content_margin_small">12dp</dimen>
-	<dimen name="bottom_sheet_content_padding">24dp</dimen>
+	<dimen name="content_padding">24dp</dimen>
 	<dimen name="bottom_sheet_content_padding_small">12dp</dimen>
 	<dimen name="measurement_tool_divider_margin">12dp</dimen>
 	<dimen name="measurement_tool_content_padding_medium">18dp</dimen>
-	<dimen name="measurement_tool_text_margin_small">6dp</dimen>
+	<dimen name="text_margin_small">6dp</dimen>
 	<dimen name="measurement_tool_text_margin">12dp</dimen>
 	<dimen name="measurement_tool_points_list_container_height">330dp</dimen>
 	<dimen name="measurement_tool_up_down_row_height">48dp</dimen>
@@ -118,13 +120,16 @@
 	<dimen name="bottom_sheet_descr_height">66dp</dimen>
 	<dimen name="bottom_sheet_list_item_height">72dp</dimen>
 	<dimen name="bottom_sheet_icon_margin">36dp</dimen>
-	<dimen name="measurement_tool_bottom_divider_margin_top">11dp</dimen>
-	<dimen name="measurement_tool_bottom_divider_margin_bottom">12dp</dimen>
-	<dimen name="measurement_tool_bottom_divider_margin_start">96dp</dimen>
+	<dimen name="bottom_sheet_divider_margin_top">11dp</dimen>
+	<dimen name="bottom_sheet_divider_margin_bottom">12dp</dimen>
+	<dimen name="bottom_sheet_divider_margin_start">84dp</dimen>
 	<dimen name="bottom_sheet_image_text_margin_start">15dp</dimen>
 	<dimen name="bottom_sheet_selected_item_title_height">84dp</dimen>
 
 	<dimen name="map_markers_recycler_view_padding_bottom">78dp</dimen>
 	<dimen name="map_markers_recycler_view_padding_top">15dp</dimen>
+
+	<dimen name="shadow_height">8dp</dimen>
+	<dimen name="map_marker_title_height">42dp</dimen>
     
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index d43bf1466d..aacd678beb 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -162,11 +162,11 @@
 	<dimen name="measurement_tool_select_radius">20dp</dimen>
 	<dimen name="bottom_sheet_content_margin">16dp</dimen>
 	<dimen name="bottom_sheet_content_margin_small">8dp</dimen>
-	<dimen name="bottom_sheet_content_padding">16dp</dimen>
+	<dimen name="content_padding">16dp</dimen>
 	<dimen name="bottom_sheet_content_padding_small">8dp</dimen>
 	<dimen name="measurement_tool_divider_margin">8dp</dimen>
 	<dimen name="measurement_tool_content_padding_medium">12dp</dimen>
-	<dimen name="measurement_tool_text_margin_small">4dp</dimen>
+	<dimen name="text_margin_small">4dp</dimen>
 	<dimen name="measurement_tool_text_margin">8dp</dimen>
 	<dimen name="measurement_tool_points_list_container_height">220dp</dimen>
 	<dimen name="measurement_tool_up_down_row_height">48dp</dimen>
@@ -183,12 +183,15 @@
 	<dimen name="bottom_sheet_descr_height">44dp</dimen>
 	<dimen name="bottom_sheet_list_item_height">48dp</dimen>
 	<dimen name="bottom_sheet_icon_margin">24dp</dimen>
-	<dimen name="measurement_tool_bottom_divider_margin_top">7dp</dimen>
-	<dimen name="measurement_tool_bottom_divider_margin_bottom">8dp</dimen>
-	<dimen name="measurement_tool_bottom_divider_margin_start">64dp</dimen>
+	<dimen name="bottom_sheet_divider_margin_top">7dp</dimen>
+	<dimen name="bottom_sheet_divider_margin_bottom">8dp</dimen>
+	<dimen name="bottom_sheet_divider_margin_start">64dp</dimen>
 	<dimen name="bottom_sheet_image_text_margin_start">10dp</dimen>
 	<dimen name="bottom_sheet_selected_item_title_height">56dp</dimen>
 	
 	<dimen name="map_markers_recycler_view_padding_bottom">52dp</dimen>
 	<dimen name="map_markers_recycler_view_padding_top">10dp</dimen>
+
+	<dimen name="shadow_height">5dp</dimen>
+	<dimen name="map_marker_title_height">28dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java
index d8fe089349..c6b8d359be 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java
@@ -117,7 +117,7 @@ public class HistoryMarkerMenuBottomSheetDialogFragment extends BottomSheetDialo
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+							>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
index 91a8c769d7..c8721fb477 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
@@ -179,7 +179,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+							>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java
index 6ee9925660..c2cee573e1 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java
@@ -98,7 +98,7 @@ public class OrderByBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+							>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
index 42e3ed58f0..cf6a765044 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
@@ -141,7 +141,7 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends BottomSheetDialog
 				}
 
 				if (!portrait) {
-					if (screenHeight - statusBarHeight - mainView.getHeight() >= AndroidUtils.dpToPx(getActivity(), 8)) {
+					if (screenHeight - statusBarHeight - mainView.getHeight() >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
index 284454f23e..a8cff6f07d 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
@@ -120,7 +120,7 @@ public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragm
 
 					if (!portrait) {
 						if (screenHeight - statusBarHeight - mainView.getHeight()
-								>= AndroidUtils.dpToPx(getActivity(), 8)) {
+								>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 							AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 									R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 						} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java
index dacf153f6c..a9530827fc 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java
@@ -161,7 +161,7 @@ public class ShowDirectionBottomSheetDialogFragment extends BottomSheetDialogFra
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+							>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 81bb38aac4..d8fec9de3f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -150,7 +150,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+							>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
index b196f1410c..6588e9fd12 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
@@ -176,7 +176,7 @@ public class SelectedPointBottomSheetDialogFragment extends BottomSheetDialogFra
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+							>= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) {
 						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {