consistent use of new intermediate destinations icon

OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java

@@ -369,8 +369,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		if (!MenuItemCompat.isActionViewExpanded(mi)) {
 			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark,
 					R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			createMenuItem(menu, SELECT_DESTINATIONS_ID, R.string.select_destination_and_intermediate_points, R.drawable.ic_action_flage_dark,
+			createMenuItem(menu, SELECT_DESTINATIONS_ID, R.string.select_destination_and_intermediate_points, R.drawable.ic_action_intermediate,
-					R.drawable.ic_action_flage_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+					R.drawable.ic_action_intermediate, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 			createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark,
 					R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 //			createMenuItem(menu, EXPORT_ID, R.string.shared_string_export, R.drawable.ic_action_gsave_light,
@@ -396,7 +396,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 				enableSelectionMode(true);
 				createMenuItem(menu, SELECT_DESTINATIONS_ACTION_MODE_ID, R.string.select_destination_and_intermediate_points,
-						R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_dark,
+						R.drawable.ic_action_intermediate, R.drawable.ic_action_intermediate,
 						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				favoritesSelected.clear();
 				groupsToDelete.clear();

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -280,7 +280,7 @@ public class MapActivityActions implements DialogProvider {
 		if (getMyApplication().getTargetPointsHelper().getPointToNavigate() != null && 
 				(mapActivity.getRoutingHelper().isFollowingMode() || mapActivity.getRoutingHelper().isRoutePlanningMode())) {
 			adapter.item(R.string.context_menu_item_last_intermediate_point).iconColor(
-					R.drawable.ic_action_flage_dark).reg();
+					R.drawable.ic_action_waypoint).reg();
 		}
 		OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj);
 
@@ -565,7 +565,7 @@ public class MapActivityActions implements DialogProvider {
 						return true;
 					}
 				}).reg();
-		optionsMenuHelper.item(R.string.waypoints).iconColor(R.drawable.ic_action_waypoint)
+		optionsMenuHelper.item(R.string.waypoints).iconColor(R.drawable.ic_action_intermediate)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {

OsmAnd/src/net/osmand/plus/osmo/OsMoMenuController.java

@@ -1,4 +1,4 @@
-package net.osmand.plus.osmo;
+package net.osmand.plus.osmo;
 
 import android.graphics.drawable.Drawable;
 
@@ -74,7 +74,7 @@ public class OsMoMenuController extends MenuController {
 			leftTitleButtonController.leftIconId = R.drawable.ic_action_remove_dark;
 		} else {
 			leftTitleButtonController.caption = getMapActivity().getString(R.string.mark_point);
-			leftTitleButtonController.leftIconId = R.drawable.ic_action_flag_dark;
+			leftTitleButtonController.leftIconId = R.drawable.ic_action_intermediate;
 		}
 	}