diff --git a/OsmAnd/res/drawable-hdpi/compass.png b/OsmAnd/res/drawable-hdpi/compass.png
deleted file mode 100644
index acd39b690e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_activities_config.png b/OsmAnd/res/drawable-hdpi/list_activities_config.png
index 6ab9ec80ce..db591fbe82 100644
Binary files a/OsmAnd/res/drawable-hdpi/list_activities_config.png and b/OsmAnd/res/drawable-hdpi/list_activities_config.png differ
diff --git a/OsmAnd/res/drawable-hdpi/monitoring.png b/OsmAnd/res/drawable-hdpi/list_activities_monitoring.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/monitoring.png
rename to OsmAnd/res/drawable-hdpi/list_activities_monitoring.png
diff --git a/OsmAnd/res/drawable-hdpi/widget_compass.png b/OsmAnd/res/drawable-hdpi/widget_compass.png
new file mode 100644
index 0000000000..63442f8975
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_compass.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_config.png b/OsmAnd/res/drawable-hdpi/widget_config.png
index 63442f8975..15cb76247b 100644
Binary files a/OsmAnd/res/drawable-hdpi/widget_config.png and b/OsmAnd/res/drawable-hdpi/widget_config.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_globus.png b/OsmAnd/res/drawable-hdpi/widget_globus.png
new file mode 100644
index 0000000000..63442f8975
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_globus.png differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring.png b/OsmAnd/res/drawable-hdpi/widget_monitoring.png
new file mode 100644
index 0000000000..b0d4d2bb7b
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_monitoring.png differ
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 729e211414..3d4641e6e8 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -228,18 +228,18 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 		// Top widgets
 		ImageViewWidget compassView = mic.createCompassView(map);
-		mapInfoControls.registerTopWidget(compassView, R.drawable.compass, R.string.map_widget_compass, "compass", MapWidgetRegistry.LEFT_CONTROL, all, 5);
+		mapInfoControls.registerTopWidget(compassView, R.drawable.widget_compass, R.string.map_widget_compass, "compass", MapWidgetRegistry.LEFT_CONTROL, all, 5);
 		View config = createConfiguration();
 		mapInfoControls.registerTopWidget(config, R.drawable.widget_config, R.string.map_widget_config, "config", MapWidgetRegistry.RIGHT_CONTROL, all, 10).required(ApplicationMode.DEFAULT);
-		mapInfoControls.registerTopWidget(monitoringServices.createMonitoringWidget(view, map), R.drawable.monitoring, R.string.map_widget_monitoring_services,
+		mapInfoControls.registerTopWidget(monitoringServices.createMonitoringWidget(view, map), R.drawable.widget_monitoring, R.string.map_widget_monitoring_services,
 				"monitoring_services", MapWidgetRegistry.LEFT_CONTROL, exceptCar, 12);
-		mapInfoControls.registerTopWidget(mic.createLockInfo(map), R.drawable.lock_enabled, R.string.bg_service_screen_lock, "bgService", 
+		mapInfoControls.registerTopWidget(mic.createLockInfo(map), R.drawable.widget_lock_screen, R.string.bg_service_screen_lock, "bgService", 
 				MapWidgetRegistry.LEFT_CONTROL, none, 15);
 		backToLocation = mic.createBackToLocation(map);
 		mapInfoControls.registerTopWidget(backToLocation, R.drawable.widget_backtolocation, R.string.map_widget_back_to_loc, "back_to_location", MapWidgetRegistry.RIGHT_CONTROL, all, 5);
 		
 		View globus = createGlobus();
-		mapInfoControls.registerTopWidget(globus, R.drawable.globus, R.string.map_widget_map_select, "progress", MapWidgetRegistry.RIGHT_CONTROL, none, 15);
+		mapInfoControls.registerTopWidget(globus, R.drawable.widget_globus, R.string.map_widget_map_select, "progress", MapWidgetRegistry.RIGHT_CONTROL, none, 15);
 		
 		topText = mic.createStreetView(app, map, paintText);
 		mapInfoControls.registerTopWidget(topText, R.drawable.street_name, R.string.map_widget_top_text,
@@ -731,7 +731,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		FrameLayout.LayoutParams fparams = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 
 		ImageView configuration = new ImageView(map);
-		Drawable drawable = view.getResources().getDrawable(R.drawable.widget_config);
+		Drawable drawable = view.getResources().getDrawable(R.drawable.list_activities_config);
 		configuration.setBackgroundDrawable(drawable);
 		fl.addView(configuration, fparams);
 		fparams = new FrameLayout.LayoutParams(drawable.getMinimumWidth(), drawable.getMinimumHeight());
diff --git a/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java b/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java
index 8f89f2eb95..c015937545 100644
--- a/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java
@@ -39,7 +39,7 @@ public class MonitoringInfoControl {
 	
 	public ImageView createMonitoringWidget(final OsmandMapTileView view, final MapActivity map) {
 		final ImageView monitoringServices = new ImageView(view.getContext());
-		monitoringServices.setImageDrawable(view.getResources().getDrawable(R.drawable.monitoring));
+		monitoringServices.setImageDrawable(view.getResources().getDrawable(R.drawable.list_activities_monitoring));
 		monitoringServices.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {