diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 6fdc001d84..31621293c0 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -148,9 +148,9 @@ public class ApplicationMode {
 		@Expose
 		RouteService routeService = RouteService.OSMAND;
 		@Expose
-		LocationIcon locationIcon = LocationIcon.DEFAULT;
+		LocationIcon locationIcon = null;
 		@Expose
-		NavigationIcon navigationIcon = NavigationIcon.DEFAULT;
+		NavigationIcon navigationIcon = null;
 		@Expose
 		int order;
 	}
@@ -675,8 +675,12 @@ public class ApplicationMode {
 					applicationMode.iconColor = modeBean.iconColor;
 					applicationMode.routingProfile = modeBean.routingProfile;
 					applicationMode.routeService = modeBean.routeService;
-					applicationMode.locationIcon = modeBean.locationIcon;
-					applicationMode.navigationIcon = modeBean.navigationIcon;
+					if (modeBean.locationIcon != null) {
+						applicationMode.locationIcon = modeBean.locationIcon;
+					}
+					if (modeBean.navigationIcon != null) {
+						applicationMode.navigationIcon = modeBean.navigationIcon;
+					}
 					applicationMode.order = modeBean.order;
 				}
 			}
@@ -875,7 +879,7 @@ public class ApplicationMode {
 		PICKUP_TRUCK(R.drawable.ic_action_pickup_truck, R.string.app_mode_pickup_truck, "ic_action_pickup_truck"),
 		WAGON(R.drawable.ic_action_wagon, R.string.app_mode_wagon, "ic_action_wagon"),
 		UTV(R.drawable.ic_action_utv, R.string.app_mode_utv, "ic_action_utv"),
-		OSM(R.drawable.map_action_openstreetmap_logo, R.string.app_mode_osm, "map_action_openstreetmap_logo");
+		OSM(R.drawable.ic_action_openstreetmap_logo, R.string.app_mode_osm, "ic_action_openstreetmap_logo");
 
 		@DrawableRes
 		private int resId;