diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index b31de2a85e..b11908c5a1 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:background="@color/color_transparent"
     android:clickable="true">
 
@@ -51,8 +51,8 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginStart="16dp"
                 android:background="@null"
-                tools:src="@drawable/ic_action_measure_point"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_measure_point"/>
 
             <ImageView
                 android:id="@+id/up_down_button"
@@ -104,8 +104,8 @@
                 android:layout_marginStart="8dp"
                 android:layout_toEndOf="@id/move_point_icon"
                 android:layout_toRightOf="@id/move_point_icon"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:text="@string/move_point"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
         </RelativeLayout>
 
@@ -141,37 +141,53 @@
             android:layout_width="match_parent"
             android:layout_height="52dp">
 
-            <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_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
+                android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:paddingBottom="14dp"
+                android:gravity="center_vertical"
                 android:paddingEnd="12dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="12dp"
                 android:paddingStart="16dp"
-                android:paddingTop="14dp"
-                tools:src="@drawable/ic_action_undo_dark"/>
+                android:text="@string/shared_string_options"
+                android:textColor="?attr/color_dialog_buttons"
+                osmand:textAllCapsCompat="true"
+                osmand:typeface="@string/font_roboto_medium"/>
 
-            <ImageButton
-                android:id="@+id/redo_point_button"
+            <LinearLayout
+                android:id="@+id/redo_undo_container"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/undo_point_button"
-                android:layout_toRightOf="@id/undo_point_button"
-                android:background="?attr/selectableItemBackground"
-                android:paddingBottom="14dp"
-                android:paddingEnd="16dp"
-                android:paddingLeft="12dp"
-                android:paddingRight="16dp"
-                android:paddingStart="12dp"
-                android:paddingTop="14dp"
-                tools:src="@drawable/ic_action_redo_dark"/>
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true">
+
+                <ImageButton
+                    android:id="@+id/undo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_undo_dark"/>
+
+                <ImageButton
+                    android:id="@+id/redo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="16dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="16dp"
+                    android:paddingStart="12dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_redo_dark"/>
+            </LinearLayout>
 
             <Button
                 android:id="@+id/add_point_button"
@@ -213,19 +229,19 @@
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/cancel_point_button"
-                android:gravity="center_vertical"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
+                android:gravity="center_vertical"
                 android:paddingEnd="12dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="12dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_cancel"
                 android:textColor="?attr/color_dialog_buttons"
+                android:visibility="gone"
                 osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:visibility="gone"/>
+                osmand:typeface="@string/font_roboto_medium"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 05da9bd3d5..0211d2cec7 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -197,7 +197,7 @@
             android:layout_gravity="center"
             android:text="@string/shared_string_cancel"
             android:textAllCaps="true"
-            android:textColor="@color/dashboard_general_button_text_light"
+            android:textColor="?attr/color_dialog_buttons"
             android:textSize="14sp"
             android:textStyle="bold"/>
     </FrameLayout>
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 bd769dc4ac..068d513c30 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
@@ -51,13 +51,12 @@
         android:background="?attr/selectableItemBackground">
 
         <TextView
-            android:id="@+id/cancel_row_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/shared_string_cancel"
             android:textAllCaps="true"
-            android:textColor="@color/dashboard_general_button_text_light"
+            android:textColor="?attr/color_dialog_buttons"
             android:textSize="14sp"
             android:textStyle="bold"/>
     </FrameLayout>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9e975f9624..fa2dc57cec 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -23,7 +23,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -56,7 +55,6 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.widgets.IconPopupMenu;
-import net.osmand.plus.widgets.TextViewEx;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -134,7 +132,7 @@ public class MeasurementToolFragment extends Fragment {
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
-		((TextViewEx) mainView.findViewById(R.id.cancel_point_button)).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.cancel_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				cancelMovePointMode();
@@ -152,13 +150,19 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		((Button) mainView.findViewById(R.id.apply_point_button))
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						applyMovePointMode();
-					}
-				});
+		mainView.findViewById(R.id.apply_point_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				applyMovePointMode();
+			}
+		});
+
+		mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Toast.makeText(getActivity(), "options", Toast.LENGTH_SHORT).show();
+			}
+		});
 
 		undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
 		redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
@@ -413,6 +417,7 @@ public class MeasurementToolFragment extends Fragment {
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
+				R.id.options_button,
 				R.id.undo_point_button,
 				R.id.redo_point_button,
 				R.id.add_point_button);
@@ -435,6 +440,7 @@ public class MeasurementToolFragment extends Fragment {
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
+				R.id.options_button,
 				R.id.undo_point_button,
 				R.id.redo_point_button,
 				R.id.add_point_button);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index a61f8839da..b1492ceb0c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -4,7 +4,6 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -36,10 +35,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
-		if (nightMode) {
-			((TextView) view.findViewById(R.id.cancel_row_text))
-					.setTextColor(ContextCompat.getColor(getActivity(), R.color.dashboard_general_button_text_dark));
-		}
+
 		view.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {