diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index a78b9da7f1..573d434307 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -416,7 +416,9 @@ public class MapActivityActions implements DialogProvider {
 		app.getRoutingHelper().setFollowingMode(false);
 		app.getRoutingHelper().setRoutePlanningMode(true);
 		// reset start point
-		targets.setStartPoint(from, false, fromName);
+		if (targets.getPointToStart() == null) {
+			targets.setStartPoint(from, false, fromName);
+		}
 		// then set gpx
 		setGPXRouteParams(gpxFile);
 		// then update start and destination point  
@@ -758,7 +760,7 @@ public class MapActivityActions implements DialogProvider {
 		routingHelper.setRoutePlanningMode(false);
 		settings.LAST_ROUTING_APPLICATION_MODE = settings.APPLICATION_MODE.get();
 		settings.APPLICATION_MODE.set(settings.DEFAULT_APPLICATION_MODE.get());
-		getMyApplication().getTargetPointsHelper().clearStartPoint(false);
+		//getMyApplication().getTargetPointsHelper().clearStartPoint(false);
 		mapActivity.updateApplicationModeSettings();
 		mapActivity.getDashboard().clearDeletedPoints();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 998817d745..4fd3711339 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -419,7 +419,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 	public int getFabIconId() {
 		RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
 		if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) {
-			return R.drawable.map_action_flag_dark;
+			return R.drawable.map_action_waypoint;
 		} else {
 			return R.drawable.map_directions;
 		}