diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 18d1a984b8..3c000d4272 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -14,242 +14,258 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:orientation="vertical"
         tools:background="@drawable/bg_bottom_menu_dark">
 
-        <RelativeLayout
-            android:id="@+id/up_down_row"
-            android:layout_width="0dp"
+        <ProgressBar
+            android:id="@+id/snap_to_road_progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0.45"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="14dp"
-            android:paddingTop="14dp">
-
-            <ImageView
-                android:id="@+id/main_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                tools:src="@drawable/ic_action_ruler"/>
-
-            <ImageView
-                android:id="@+id/up_down_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                tools:src="@drawable/ic_action_arrow_down"/>
-
-            <TextView
-                android:id="@+id/measurement_distance_text_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="4dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="4dp"
-                android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                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_toEndOf="@id/measurement_distance_text_view"
-                android:layout_toLeftOf="@id/up_down_button"
-                android:layout_toRightOf="@id/measurement_distance_text_view"
-                android:layout_toStartOf="@id/up_down_button"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/default_list_text_size"
-                tools:text="points: 3"/>
-
-            <TextView
-                android:id="@+id/move_point_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="4dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="4dp"
-                android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/move_point"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-
-            <TextView
-                android:id="@+id/add_point_after_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="4dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="4dp"
-                android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/add_point_after"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-
-            <TextView
-                android:id="@+id/add_point_before_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="4dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="4dp"
-                android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/add_point_before"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-        </RelativeLayout>
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="?attr/dashboard_divider"/>
+            android:minHeight="0dp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
 
         <LinearLayout
-            android:id="@+id/measure_mode_controls"
-            android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_weight="0.55">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <FrameLayout
+            <RelativeLayout
+                android:id="@+id/up_down_row"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_height="wrap_content"
+                android:layout_weight="0.45"
+                android:background="?attr/selectableItemBackground"
+                android:paddingBottom="14dp"
+                android:paddingTop="14dp">
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/options_button"
+                <ImageView
+                    android:id="@+id/main_icon"
                     android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:background="@null"
+                    tools:src="@drawable/ic_action_ruler"/>
+
+                <ImageView
+                    android:id="@+id/up_down_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
+                    android:background="@null"
+                    tools:src="@drawable/ic_action_arrow_down"/>
+
+                <TextView
+                    android:id="@+id/measurement_distance_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    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_toEndOf="@id/measurement_distance_text_view"
+                    android:layout_toLeftOf="@id/up_down_button"
+                    android:layout_toRightOf="@id/measurement_distance_text_view"
+                    android:layout_toStartOf="@id/up_down_button"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_list_text_size"
+                    tools:text="points: 3"/>
+
+                <TextView
+                    android:id="@+id/move_point_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/move_point"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/add_point_after_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/add_point_after"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/add_point_before_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/add_point_before"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="?attr/dashboard_divider"/>
+
+            <LinearLayout
+                android:id="@+id/measure_mode_controls"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_weight="0.55">
+
+                <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:background="?attr/selectableItemBackground"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:paddingEnd="12dp"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="12dp"
+                        android:paddingStart="16dp"
+                        android:text="@string/shared_string_options"
+                        android:textColor="?attr/color_dialog_buttons"
+                        osmand:textAllCapsCompat="true"
+                        osmand:typeface="@string/font_roboto_medium"/>
+                </FrameLayout>
+
+                <ImageButton
+                    android:id="@+id/undo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
+                    android:paddingBottom="14dp"
                     android:paddingEnd="12dp"
                     android:paddingLeft="16dp"
                     android:paddingRight="12dp"
                     android:paddingStart="16dp"
-                    android:text="@string/shared_string_options"
-                    android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
-                    osmand:typeface="@string/font_roboto_medium"/>
-            </FrameLayout>
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_undo_dark"/>
 
-            <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"/>
-
-            <FrameLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <Button
-                    android:id="@+id/add_point_button"
+                <ImageButton
+                    android:id="@+id/redo_point_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end"
+                    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"/>
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <Button
+                        android:id="@+id/add_point_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginTop="8dp"
+                        android:background="@drawable/btn_round_blue"
+                        android:drawableLeft="@drawable/ic_action_plus"
+                        android:maxLines="1"
+                        android:minHeight="36dp"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:text="@string/shared_string_add"
+                        android:textColor="@color/color_white"/>
+                </FrameLayout>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/selected_point_controls"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_weight="0.6"
+                android:visibility="gone">
+
+                <Button
+                    android:id="@+id/apply_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
                     android:layout_marginBottom="8dp"
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
                     android:layout_marginTop="8dp"
                     android:background="@drawable/btn_round_blue"
-                    android:drawableLeft="@drawable/ic_action_plus"
-                    android:maxLines="1"
                     android:minHeight="36dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
-                    android:text="@string/shared_string_add"
+                    android:text="@string/shared_string_apply"
                     android:textColor="@color/color_white"/>
-            </FrameLayout>
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/cancel_point_button"
+                    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"
+                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium"/>
+            </RelativeLayout>
 
         </LinearLayout>
 
-        <RelativeLayout
-            android:id="@+id/selected_point_controls"
-            android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_weight="0.6"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/apply_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginBottom="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/btn_round_blue"
-                android:minHeight="36dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_point_button"
-                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"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"/>
-        </RelativeLayout>
-
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 469d957f9e..fb49b84a40 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -17,6 +17,15 @@
         android:clickable="true"
         android:orientation="vertical">
 
+        <ProgressBar
+            android:id="@+id/snap_to_road_progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="0dp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
         <RelativeLayout
             android:id="@+id/up_down_row"
             android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e53aaf1cb1..f0ad3ea232 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -26,6 +26,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -91,6 +92,7 @@ public class MeasurementToolFragment extends Fragment {
 	private Drawable downIcon;
 	private View pointsListContainer;
 	private View upDownRow;
+	private View mainView;
 	private ImageView upDownBtn;
 	private ImageView undoBtn;
 	private ImageView redoBtn;
@@ -150,7 +152,7 @@ public class MeasurementToolFragment extends Fragment {
 
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
 
-		final View mainView = view.findViewById(R.id.main_view);
+		mainView = view.findViewById(R.id.main_view);
 		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		pointsListContainer = view.findViewById(R.id.points_list_container);
 		if (portrait && pointsListContainer != null) {
@@ -615,13 +617,19 @@ public class MeasurementToolFragment extends Fragment {
 				ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
 				snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
 				snapToRoadBtn.setImageDrawable(getActiveIcon(snapToRoadAppMode.getSmallIconDark()));
-				snapToRoadBtn.setVisibility(View.VISIBLE);
 				snapToRoadBtn.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
 						showSnapToRoadMenu();
 					}
 				});
+				snapToRoadBtn.setVisibility(View.VISIBLE);
+
+				ProgressBar snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
+				snapToRoadProgressBar.setMinimumHeight(0);
+				snapToRoadProgressBar.setProgress(45);
+				snapToRoadProgressBar.setVisibility(View.VISIBLE);
+
 				mapActivity.refreshMap();
 			}
 		}
@@ -635,6 +643,7 @@ public class MeasurementToolFragment extends Fragment {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE);
+			mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
 			mapActivity.refreshMap();
 		}
 	}