diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 710a81682c..91bc741fab 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_transparent"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true">
 
     <LinearLayout
         android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
+        android:clickable="true"
         tools:background="@drawable/bg_bottom_menu_dark">
 
         <ProgressBar
@@ -24,7 +25,7 @@
             android:layout_height="wrap_content"
             android:minHeight="0dp"
             android:visibility="gone"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -33,7 +34,7 @@
             <RelativeLayout
                 android:id="@+id/up_down_row"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/measurement_tool_controls_height"
+                android:layout_height="@dimen/measurement_tool_controls_height_land"
                 android:layout_weight="0.45"
                 android:background="?attr/selectableItemBackground">
 
@@ -69,43 +70,39 @@
                     android:id="@+id/measurement_distance_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin"
-                    android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin"
-                    android:layout_marginStart="@dimen/measurement_tool_text_margin"
+                    android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
+                    android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
+                    android:layout_marginTop="@dimen/measurement_tool_button_padding"
+                    android:layout_marginEnd="@dimen/text_margin_small"
+                    android:layout_marginRight="@dimen/text_margin_small"
                     android:layout_toEndOf="@id/main_icon"
                     android:layout_toRightOf="@id/main_icon"
                     android:textAppearance="@style/TextAppearance.ListItemTitle"
-                    tools:text="724 m,"/>
+                    tools:text="724 m," />
 
                 <TextView
                     android:id="@+id/measurement_points_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_alignEnd="@id/up_down_button"
                     android:layout_toEndOf="@id/measurement_distance_text_view"
                     android:layout_toRightOf="@id/measurement_distance_text_view"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="@dimen/default_list_text_size"
-                    tools:text="points: 3"/>
+                    android:layout_alignRight="@id/up_down_button"
+                    android:layout_marginTop="@dimen/measurement_tool_button_padding"
+                    android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
+                    tools:text="points: 3" />
 
                 <TextView
                     android:id="@+id/distance_to_center_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/measurement_points_text_view"
-                    android:layout_toLeftOf="@id/up_down_button"
-                    android:layout_toRightOf="@id/measurement_points_text_view"
-                    android:layout_toStartOf="@id/up_down_button"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin"
-                    android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin"
-                    android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                    android:textColor="@color/color_distance"
-                    android:textSize="@dimen/default_list_text_size"
-                    tools:text=" – 700 m"/>
+                    android:layout_below="@id/measurement_points_text_view"
+                    android:layout_alignStart="@+id/measurement_distance_text_view"
+                    android:layout_alignLeft="@+id/measurement_distance_text_view"
+                    android:maxLines="1"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_desc_text_size"
+                    tools:text=" – 700 m" />
 
                 <TextView
                     android:id="@+id/move_point_text"
@@ -143,132 +140,107 @@
                 android:layout_height="match_parent"
                 android:background="?attr/dashboard_divider"/>
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/measure_mode_controls"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.55">
+                android:layout_height="@dimen/measurement_tool_controls_height_land"
+                android:layout_weight="0.55"
+                android:padding="@dimen/content_padding_half">
 
-                <FrameLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/options_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="@dimen/measurement_tool_button_padding"
-                        android:layout_marginBottom="@dimen/measurement_tool_button_padding"
-                        android:background="?attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:maxLines="1"
-                        android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                        android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                        android:paddingStart="@dimen/measurement_tool_text_button_padding"
-                        android:paddingLeft="@dimen/measurement_tool_text_button_padding"
-                        android:text="@string/shared_string_options"
-                        android:textColor="?attr/color_dialog_buttons"
-                        osmand:typeface="@string/font_roboto_medium"/>
-                </FrameLayout>
-
-                <ImageButton
-                    android:id="@+id/undo_point_button"
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/options_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackground"
-                    android:padding="@dimen/measurement_tool_undo_redo_padding_small"
-                    tools:src="@drawable/ic_action_undo_dark"/>
+                    android:maxLines="1"
+                    android:padding="@dimen/measurement_tool_text_button_padding_small"
+                    android:text="@string/shared_string_options"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:typeface="@string/font_roboto_medium" />
 
-                <ImageButton
-                    android:id="@+id/redo_point_button"
+                <RelativeLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/measurement_tool_button_padding"
-                    android:layout_marginStart="@dimen/measurement_tool_button_padding"
-                    android:background="?attr/selectableItemBackground"
-                    android:padding="@dimen/measurement_tool_undo_redo_padding_small"
-                    tools:src="@drawable/ic_action_redo_dark"/>
-
-                <FrameLayout
-                    android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_centerInParent="true">
 
-                    <Button
-                        android:id="@+id/add_point_button"
+                    <ImageButton
+                        android:id="@+id/undo_point_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:layout_marginBottom="@dimen/measurement_tool_button_margin"
-                        android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                        android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                        android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                        android:background="?attr/btn_round"
-                        android:maxLines="1"
-                        android:minHeight="@dimen/measurement_tool_button_height"
-                        android:paddingLeft="@dimen/measurement_tool_button_padding"
-                        android:paddingRight="@dimen/measurement_tool_button_padding"
-                        android:text="@string/shared_string_add"
-                        android:textColor="@color/color_white"
-                        android:textAllCaps="false"
-                        android:paddingEnd="@dimen/measurement_tool_button_padding"
-                        android:paddingStart="@dimen/measurement_tool_button_padding" />
-                </FrameLayout>
+                        android:layout_centerVertical="true"
+                        android:background="?attr/selectableItemBackground"
+                        android:contentDescription="@string/shared_string_undo"
+                        android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                        tools:src="@drawable/ic_action_undo_dark" />
 
-            </LinearLayout>
+                    <ImageButton
+                        android:id="@+id/redo_point_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="@dimen/measurement_tool_button_padding"
+                        android:layout_marginLeft="@dimen/measurement_tool_button_padding"
+                        android:layout_toRightOf="@id/undo_point_button"
+                        android:layout_toEndOf="@id/undo_point_button"
+                        android:background="?attr/selectableItemBackground"
+                        android:contentDescription="@string/shared_string_redo"
+                        android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                        tools:src="@drawable/ic_action_redo_dark" />
+                </RelativeLayout>
+
+                <include
+                    android:id="@+id/add_point_button"
+                    layout="@layout/bottom_sheet_dialog_button"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_centerVertical="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true" />
+            </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/move_point_controls"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.6"
+                android:layout_height="@dimen/measurement_tool_controls_height_land"
+                android:layout_weight="0.55"
                 android:visibility="gone">
 
-                <Button
+                <include
                     android:id="@+id/apply_move_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginBottom="@dimen/measurement_tool_button_margin"
-                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                    android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="?attr/btn_round"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
-                    android:text="@string/shared_string_apply"
-                    android:textColor="@color/color_white"
-                    android:textAllCaps="false"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding"
-                    android:paddingStart="@dimen/measurement_tool_button_padding" />
+                    layout="@layout/bottom_sheet_dialog_button" />
+
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/cancel_move_point_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/measurement_tool_button_height"
                     android:background="?attr/selectableItemBackground"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_small"
                     android:gravity="center_vertical"
                     android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingLeft="@dimen/measurement_tool_text_button_padding"
+                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
                     android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingStart="@dimen/measurement_tool_text_button_padding"
+                    android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
                     android:text="@string/shared_string_cancel"
                     android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
-                    osmand:typeface="@string/font_roboto_medium"/>
+                    osmand:typeface="@string/font_roboto_medium" />
             </RelativeLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/add_point_before_after_controls"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.6"
+                android:layout_height="@dimen/measurement_tool_controls_height_land"
+                android:layout_weight="0.55"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:visibility="gone">
@@ -276,59 +248,48 @@
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/cancel_point_before_after_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/measurement_tool_button_height"
                     android:background="?attr/selectableItemBackground"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_small"
                     android:gravity="center_vertical"
                     android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingLeft="@dimen/measurement_tool_text_button_padding"
+                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
                     android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingStart="@dimen/measurement_tool_text_button_padding"
+                    android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
                     android:text="@string/shared_string_cancel"
                     android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
-                    osmand:typeface="@string/font_roboto_medium"/>
+                    osmand:typeface="@string/font_roboto_medium" />
 
                 <View
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"/>
+                    android:layout_height="match_parent" />
 
-                <Button
+                <include
                     android:id="@+id/apply_point_before_after_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_width="@dimen/measurement_tool_button_width"
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="?attr/btn_round_border"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
-                    android:text="@string/shared_string_apply"
-                    android:textColor="?attr/color_dialog_buttons"
-                    android:textAllCaps="false"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding"
-                    android:paddingStart="@dimen/measurement_tool_button_padding" />
+                    android:layout_toStartOf="@id/add_point_before_after_button"
+                    android:layout_toLeftOf="@id/add_point_before_after_button"
+                    android:layout_centerVertical="true"
+                    layout="@layout/bottom_sheet_dialog_button" />
 
-                <Button
+                <include
                     android:id="@+id/add_point_before_after_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_centerVertical="true"
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                    android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="?attr/btn_round"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
-                    android:text="@string/shared_string_add"
-                    android:textColor="@color/color_white"
-                    android:textAllCaps="false"
-                    android:paddingStart="@dimen/measurement_tool_button_padding"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding" />
-            </LinearLayout>
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    layout="@layout/bottom_sheet_dialog_button" />
+
+            </RelativeLayout>
 
         </LinearLayout>
 
diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index d9d17ad27d..7fa9318c92 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -536,11 +536,11 @@
                     <ImageButton
                         android:id="@+id/widget_top_bar_back_button"
                         style="@style/Widget.AppCompat.ActionButton"
-                        android:layout_width="56dp"
-                        android:layout_height="56dp"
+                        android:layout_width="@dimen/toolbar_height"
+                        android:layout_height="@dimen/toolbar_height"
                         android:layout_gravity="top"
                         android:contentDescription="@string/back_to_search"
-                        osmand:srcCompat="@drawable/ic_arrow_back"/>
+                        osmand:srcCompat="@drawable/ic_arrow_back" />
 
                     <LinearLayout
                         android:id="@+id/widget_top_bar_title_layout"
@@ -549,8 +549,8 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:orientation="vertical"
-                        android:paddingBottom="10dp"
-                        android:paddingTop="10dp">
+                        android:paddingBottom="@dimen/toolbar_title_padding_bottom"
+                        android:paddingTop="@dimen/toolbar_title_padding_top">
 
                         <TextView
                             android:id="@+id/widget_top_bar_title"
@@ -598,7 +598,7 @@
                         android:id="@+id/widget_top_bar_refresh_button"
                         style="@style/Widget.AppCompat.ActionButton"
                         android:layout_width="48dp"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:layout_gravity="top"
                         android:contentDescription="@string/shared_string_refresh"
                         osmand:srcCompat="@drawable/ic_action_refresh_dark"
@@ -608,7 +608,7 @@
                         android:id="@+id/widget_top_bar_close_button"
                         style="@style/Widget.AppCompat.ActionButton"
                         android:layout_width="48dp"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:layout_gravity="top"
                         android:contentDescription="@string/shared_string_close"
                         osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -616,7 +616,7 @@
                     <net.osmand.plus.widgets.TextViewEx
                         android:id="@+id/widget_top_bar_save"
                         android:layout_width="wrap_content"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:background="@null"
                         android:ellipsize="end"
                         android:gravity="center_vertical"
@@ -636,7 +636,7 @@
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/widget_top_bar_switch"
                         android:layout_width="wrap_content"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:paddingEnd="16dp"
                         android:paddingRight="16dp"
                         android:visibility="gone"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 50df9e1ee8..425717f98a 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_transparent"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true">
 
     <LinearLayout
         android:id="@+id/main_view"
@@ -14,8 +14,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="@drawable/bg_bottom_menu_dark"
+        android:orientation="vertical"
         android:clickable="true"
-        android:orientation="vertical">
+        android:focusable="true">
 
         <ProgressBar
             android:id="@+id/snap_to_road_progress_bar"
@@ -24,7 +25,7 @@
             android:layout_height="wrap_content"
             android:minHeight="0dp"
             android:visibility="gone"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <RelativeLayout
             android:id="@+id/up_down_row"
@@ -81,8 +82,10 @@
                 android:layout_marginTop="@dimen/measurement_tool_button_padding"
                 android:layout_toEndOf="@id/measurement_distance_text_view"
                 android:layout_toRightOf="@id/measurement_distance_text_view"
+                android:layout_alignEnd="@id/up_down_button"
+                android:layout_alignRight="@id/up_down_button"
                 android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
-                tools:text="points: 3"/>
+                tools:text="points: 3" />
 
             <TextView
                 android:id="@+id/distance_to_center_text_view"
@@ -159,8 +162,8 @@
             android:id="@+id/measure_mode_controls"
             android:layout_width="match_parent"
             android:layout_height="@dimen/measurement_tool_controls_height"
-            android:paddingTop="@dimen/measurement_tool_button_padding_top"
-            android:paddingBottom="@dimen/measurement_tool_button_padding_top"
+            android:paddingTop="@dimen/measurement_tool_button_margin"
+            android:paddingBottom="@dimen/measurement_tool_button_margin"
             android:paddingLeft="@dimen/measurement_tool_button_margin"
             android:paddingRight="@dimen/measurement_tool_button_margin">
 
@@ -189,6 +192,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                android:contentDescription="@string/shared_string_undo"
                 tools:src="@drawable/ic_action_undo_dark"/>
 
             <ImageButton
@@ -199,6 +203,7 @@
                 android:layout_marginStart="@dimen/measurement_tool_button_padding"
                 android:background="?attr/selectableItemBackground"
                 android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                android:contentDescription="@string/shared_string_redo"
                 tools:src="@drawable/ic_action_redo_dark"/>
 
             <FrameLayout
@@ -206,22 +211,12 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1">
 
-                <Button
+                <include
                     android:id="@+id/add_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_width="@dimen/measurement_tool_button_width"
                     android:layout_gravity="end"
-                    android:background="?attr/btn_round"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
-                    android:text="@string/shared_string_add"
-                    android:textColor="@color/color_white"
-                    android:textAllCaps="false"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding"
-                    android:paddingStart="@dimen/measurement_tool_button_padding" />
+                    layout="@layout/bottom_sheet_dialog_button" />
             </FrameLayout>
 
         </LinearLayout>
@@ -232,26 +227,16 @@
             android:layout_height="@dimen/measurement_tool_controls_height"
             android:visibility="gone">
 
-            <Button
+            <include
                 android:id="@+id/apply_move_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/measurement_tool_button_height"
+                android:layout_width="@dimen/measurement_tool_button_width"
+                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                android:layout_marginRight="@dimen/measurement_tool_button_margin"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_marginBottom="@dimen/measurement_tool_button_margin"
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                android:background="?attr/btn_round"
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:paddingLeft="@dimen/measurement_tool_button_padding"
-                android:paddingRight="@dimen/measurement_tool_button_padding"
-                android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"
-                android:textAllCaps="false"
-                android:paddingEnd="@dimen/measurement_tool_button_padding"
-                android:paddingStart="@dimen/measurement_tool_button_padding" />
+                layout="@layout/bottom_sheet_dialog_button" />
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/cancel_move_point_button"
@@ -269,7 +254,7 @@
         <LinearLayout
             android:id="@+id/add_point_before_after_controls"
             android:layout_width="match_parent"
-            android:layout_height="52dp"
+            android:layout_height="@dimen/measurement_tool_controls_height"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:visibility="gone">
@@ -291,41 +276,24 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"/>
 
-            <Button
+            <include
                 android:id="@+id/apply_point_before_after_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                android:layout_height="@dimen/measurement_tool_button_height"
+                android:layout_gravity="center_vertical"
+                android:layout_width="@dimen/measurement_tool_button_width"
                 android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                 android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                android:background="?attr/btn_round_border"
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:paddingLeft="@dimen/measurement_tool_button_padding"
-                android:paddingRight="@dimen/measurement_tool_button_padding"
-                android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"
-                android:textAllCaps="false"
-                android:paddingEnd="@dimen/measurement_tool_button_padding"
-                android:paddingStart="@dimen/measurement_tool_button_padding" />
+                layout="@layout/bottom_sheet_dialog_button" />
 
-            <Button
+            <include
                 android:id="@+id/add_point_before_after_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                android:layout_height="@dimen/measurement_tool_button_height"
+                android:layout_gravity="center_vertical"
+                android:layout_width="@dimen/measurement_tool_button_width"
                 android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                 android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                android:background="?attr/btn_round"
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:paddingLeft="@dimen/measurement_tool_button_padding"
-                android:paddingRight="@dimen/measurement_tool_button_padding"
-                android:text="@string/shared_string_add"
-                android:textColor="@color/color_white"
-                android:textAllCaps="false"
-                android:paddingEnd="@dimen/measurement_tool_button_padding"
-                android:paddingStart="@dimen/measurement_tool_button_padding" />
+                layout="@layout/bottom_sheet_dialog_button" />
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 9cfcab6e16..81dc6fbd28 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -116,12 +116,13 @@
                 tools:src="@drawable/ic_action_remove_dark"
                 android:contentDescription="@string/snap_to_road" />
 
-	        <include
-		        layout="@layout/map_ruler"
-		        android:layout_width="@dimen/map_ruler_width"
-		        android:layout_height="wrap_content"
-		        android:layout_marginStart="@dimen/map_button_margin"
-		        android:layout_marginLeft="@dimen/map_button_margin" />
+            <include
+                layout="@layout/map_ruler"
+                android:layout_width="@dimen/map_ruler_width"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginStart="@dimen/map_button_margin"
+                android:layout_marginLeft="@dimen/map_button_margin" />
 
         </LinearLayout>
 
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index bef39b9539..23eb48df18 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -210,8 +210,8 @@
                     android:layout_marginLeft="@dimen/map_button_margin"
                     android:layout_marginRight="@dimen/map_button_margin"
                     tools:src="@drawable/ic_action_remove_dark"
-	                android:layout_marginStart="@dimen/map_button_margin"
-	                android:layout_marginEnd="@dimen/map_button_margin" />
+                    android:layout_marginStart="@dimen/map_button_margin"
+                    android:layout_marginEnd="@dimen/map_button_margin" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -322,8 +322,8 @@
                 <ImageButton
                     android:id="@+id/widget_top_bar_back_button"
                     style="@style/Widget.AppCompat.ActionButton"
-                    android:layout_width="56dp"
-                    android:layout_height="56dp"
+                    android:layout_width="@dimen/toolbar_height"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_gravity="top"
                     android:contentDescription="@string/back_to_search"
                     osmand:srcCompat="@drawable/ic_arrow_back"/>
@@ -335,8 +335,8 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingBottom="10dp"
-                    android:paddingTop="10dp">
+                    android:paddingBottom="@dimen/toolbar_title_padding_bottom"
+                    android:paddingTop="@dimen/toolbar_title_padding_top">
 
                     <TextView
                         android:id="@+id/widget_top_bar_title"
@@ -370,7 +370,7 @@
                         android:background="?attr/selectableItemBackground"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:layout_marginTop="8dp"
+                        android:layout_marginTop="@dimen/content_padding_half"
                         android:textColor="?attr/wikivoyage_active_color"
                         android:textSize="@dimen/default_list_text_size"
                         android:visibility="gone"
@@ -384,7 +384,7 @@
                     android:id="@+id/widget_top_bar_refresh_button"
                     style="@style/Widget.AppCompat.ActionButton"
                     android:layout_width="48dp"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_gravity="top"
                     android:contentDescription="@string/shared_string_refresh"
                     osmand:srcCompat="@drawable/ic_action_refresh_dark"
@@ -394,7 +394,7 @@
                     android:id="@+id/widget_top_bar_close_button"
                     style="@style/Widget.AppCompat.ActionButton"
                     android:layout_width="48dp"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_gravity="top"
                     android:contentDescription="@string/shared_string_close"
                     osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -402,13 +402,13 @@
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/widget_top_bar_save"
                     android:layout_width="wrap_content"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:background="@null"
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:lines="1"
-                    android:paddingRight="16dp"
-                    android:paddingEnd="16dp"
+                    android:paddingRight="@dimen/content_padding"
+                    android:paddingEnd="@dimen/content_padding"
                     android:textAllCaps="true"
                     android:singleLine="true"
                     android:textColor="?android:textColorPrimary"
@@ -422,9 +422,9 @@
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/widget_top_bar_switch"
                     android:layout_width="wrap_content"
-                    android:layout_height="56dp"
-                    android:paddingEnd="16dp"
-                    android:paddingRight="16dp"
+                    android:layout_height="@dimen/toolbar_height"
+                    android:paddingEnd="@dimen/content_padding"
+                    android:paddingRight="@dimen/content_padding"
                     android:visibility="gone"
                     tools:visibility="visible"/>
 
@@ -435,8 +435,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-				android:animateLayoutChanges="true"
-				android:visibility="gone"/>
+                android:animateLayoutChanges="true"
+                android:visibility="gone"/>
 
             <FrameLayout
                 android:id="@+id/widget_top_bar_shadow"
@@ -594,7 +594,7 @@
                                 android:textColor="@color/marker_top_2nd_line_color"
                                 android:textSize="@dimen/default_list_text_size"
                                 android:textStyle="bold"
-	                            android:layout_toEndOf="@+id/map_marker_dist_2nd" />
+                                android:layout_toEndOf="@+id/map_marker_dist_2nd" />
 
                         </RelativeLayout>
 
@@ -781,8 +781,8 @@
                 android:layout_marginLeft="@dimen/widget_turn_lane_border"
                 android:layout_marginRight="@dimen/widget_turn_lane_border"
                 android:layout_marginTop="@dimen/widget_turn_lane_border"
-	            android:layout_marginStart="@dimen/widget_turn_lane_border"
-	            android:layout_marginEnd="@dimen/widget_turn_lane_border" />
+                android:layout_marginStart="@dimen/widget_turn_lane_border"
+                android:layout_marginEnd="@dimen/widget_turn_lane_border" />
 
             <FrameLayout
                 android:layout_width="wrap_content"
@@ -802,8 +802,8 @@
                     android:textColor="@color/color_black"
                     android:textSize="@dimen/map_button_text_size"
                     tools:text="1048 km"
-	                android:layout_marginEnd="@dimen/widget_turn_lane_border"
-	                android:layout_marginStart="@dimen/widget_turn_lane_border" />
+                    android:layout_marginEnd="@dimen/widget_turn_lane_border"
+                    android:layout_marginStart="@dimen/widget_turn_lane_border" />
 
                 <TextView
                     android:id="@+id/map_lanes_dist_text"
@@ -816,8 +816,8 @@
                     android:textColor="@color/color_black"
                     android:textSize="@dimen/map_button_text_size"
                     tools:text="1048 km"
-	                android:layout_marginEnd="@dimen/widget_turn_lane_border"
-	                android:layout_marginStart="@dimen/widget_turn_lane_border" />
+                    android:layout_marginEnd="@dimen/widget_turn_lane_border"
+                    android:layout_marginStart="@dimen/widget_turn_lane_border" />
 
             </FrameLayout>
 
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 02abe48c01..7bb27b3f90 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -80,7 +80,6 @@
 	<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>
-	<dimen name="measurement_tool_controls_height">84dp</dimen>
 	<dimen name="measurement_tool_text_button_padding_small">18dp</dimen>
 	<dimen name="measurement_tool_text_button_padding">24dp</dimen>
 	<dimen name="measurement_tool_undo_redo_padding_small">18dp</dimen>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 8d403a7133..c1eff51f59 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -256,7 +256,8 @@
 	<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">60dp</dimen>
-	<dimen name="measurement_tool_controls_height">56dp</dimen>
+	<dimen name="measurement_tool_controls_height">52dp</dimen>
+	<dimen name="measurement_tool_controls_height_land">56dp</dimen>
 	<dimen name="measurement_tool_text_button_padding_small">8dp</dimen>
 	<dimen name="measurement_tool_text_button_padding">16dp</dimen>
 	<dimen name="measurement_tool_undo_redo_padding_small">6dp</dimen>
@@ -268,6 +269,7 @@
 	<dimen name="measurement_tool_button_padding">8dp</dimen>
 	<dimen name="measurement_tool_button_padding_top">10dp</dimen>
 	<dimen name="measurement_tool_button_height">36dp</dimen>
+	<dimen name="measurement_tool_button_width">98dp</dimen>
 	<dimen name="measurement_tool_options_divider_margin_start">72dp</dimen>
 	<dimen name="bottom_sheet_title_height">52dp</dimen>
 	<dimen name="bottom_sheet_descr_height">44dp</dimen>
@@ -352,6 +354,8 @@
 	<dimen name="toolbar_height_expanded">96dp</dimen>
 	<dimen name="toolbar_inset_start_with_navigation">72dp</dimen>
 	<dimen name="toolbar_inset_start">54dp</dimen>
+	<dimen name="toolbar_title_padding_top">7dp</dimen>
+	<dimen name="toolbar_title_padding_bottom">6dp</dimen>
 
 	<dimen name="wikivoyage_search_list_header_height">36dp</dimen>
 	<dimen name="wikivoyage_article_card_icon_size">80dp</dimen>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index c64e47ffd3..b639812de7 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,7 @@
 	Thx - Hardy
 
 -->
+    <string name="shared_string_redo">Redo</string>
     <string name="shared_string_is_saved">is saved</string>
     <string name="open_saved_track">Open saved track</string>
     <string name="all_previous_segments_will_be_recalc">All previous segments will be recalculated using the selected profile.</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 55286a0461..6d911cdb75 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -274,21 +274,31 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			}
 		});
 
-		mainView.findViewById(R.id.apply_move_point_button).setOnClickListener(new OnClickListener() {
+		View applyMovePointButton = mainView.findViewById(R.id.apply_move_point_button);
+		UiUtilities.setupDialogButton(nightMode, applyMovePointButton, UiUtilities.DialogButtonType.PRIMARY,
+				R.string.shared_string_apply);
+		applyMovePointButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				applyMovePointMode();
 			}
 		});
 
-		mainView.findViewById(R.id.apply_point_before_after_point_button).setOnClickListener(new OnClickListener() {
+
+		View applyPointBeforeAfterButton = mainView.findViewById(R.id.apply_point_before_after_point_button);
+		UiUtilities.setupDialogButton(nightMode, applyPointBeforeAfterButton, UiUtilities.DialogButtonType.PRIMARY,
+				R.string.shared_string_apply);
+		applyPointBeforeAfterButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				applyAddPointBeforeAfterMode();
 			}
 		});
 
-		mainView.findViewById(R.id.add_point_before_after_button).setOnClickListener(new OnClickListener() {
+		View addPointBeforeAfterButton = mainView.findViewById(R.id.add_point_before_after_button);
+		UiUtilities.setupDialogButton(nightMode, addPointBeforeAfterButton, UiUtilities.DialogButtonType.PRIMARY,
+				R.string.shared_string_add);
+		addPointBeforeAfterButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				addPointBeforeAfter();
@@ -333,7 +343,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			}
 		});
 
-		mainView.findViewById(R.id.add_point_button).setOnClickListener(new OnClickListener() {
+		View addPointButton = mainView.findViewById(R.id.add_point_button);
+		UiUtilities.setupDialogButton(nightMode, addPointButton, UiUtilities.DialogButtonType.PRIMARY,
+				R.string.shared_string_add);
+		addPointButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				addCenterPoint();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 5d2b23cdd4..61545eec0a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -121,7 +121,7 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
 		BaseBottomSheetItem directions = new SimpleBottomSheetItem.Builder()
 				.setIcon(getContentIcon(R.drawable.ic_action_gdirections_dark))
 				.setTitle(getString(R.string.get_directions))
-				.setLayoutId(R.layout.bottom_sheet_item_simple)
+				.setLayoutId(R.layout.bottom_sheet_item_simple_pad_32dp)
 				.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {