diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index bca2118590..164f4ac500 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -682,8 +682,8 @@ public class WaypointHelper {
 			} else if (type == TARGETS) {
 				IconsCache iconsCache = app.getIconsCache();
 				if (((TargetPoint) point).start) {
-					ApplicationMode appMode = app.getSettings().getApplicationMode();
 					if (app.getTargetPointsHelper().getPointToStart() == null) {
+						ApplicationMode appMode = app.getSettings().getApplicationMode();
 						return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay());
 					} else {
 						return iconsCache.getContentIcon(R.drawable.ic_action_marker_dark, !nightMode);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index c2bf44a868..0d77d460e7 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -291,8 +291,8 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 		});
 
 		ImageView fromIcon = (ImageView) parentView.findViewById(R.id.fromIcon);
-		ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
 		if (targets.getPointToStart() == null) {
+			ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
 			fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
 		} else {
 			fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_marker_dark, isLight()));