diff --git a/OsmAnd/res/drawable-hdpi/map_compass_bearing.png b/OsmAnd/res/drawable-hdpi/map_compass_bearing.png
new file mode 100644
index 0000000000..a32406d2eb
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png
new file mode 100644
index 0000000000..a32406d2eb
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_niu.png b/OsmAnd/res/drawable-hdpi/map_compass_niu.png
new file mode 100644
index 0000000000..f8e94a3501
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_nui_template.png b/OsmAnd/res/drawable-hdpi/map_compass_nui_template.png
new file mode 100644
index 0000000000..1297b4378c
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_compass_nui_template.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_nui_white.png b/OsmAnd/res/drawable-hdpi/map_compass_nui_white.png
new file mode 100644
index 0000000000..1c82ca78c4
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_compass_nui_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_nui_white_template.png b/OsmAnd/res/drawable-hdpi/map_compass_nui_white_template.png
new file mode 100644
index 0000000000..9b0a2cbc3a
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_compass_nui_white_template.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_bearing.png b/OsmAnd/res/drawable-large/map_compass_bearing.png
new file mode 100644
index 0000000000..a32406d2eb
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_bearing_white.png b/OsmAnd/res/drawable-large/map_compass_bearing_white.png
new file mode 100644
index 0000000000..a32406d2eb
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_niu.png b/OsmAnd/res/drawable-large/map_compass_niu.png
new file mode 100644
index 0000000000..f8e94a3501
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_nui_white.png b/OsmAnd/res/drawable-large/map_compass_nui_white.png
new file mode 100644
index 0000000000..1c82ca78c4
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_nui_white.png differ
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 90cd25b332..1e2e6be478 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -8,6 +8,7 @@ import net.osmand.access.AccessibleToast;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.plus.*;
 import net.osmand.plus.OsmAndLocationProvider.GPSInfo;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.routing.RouteDirectionInfo;
@@ -283,6 +284,11 @@ public class MapInfoWidgetsFactory {
 	
 	public ImageViewWidget createCompassView(final MapActivity map){
 		final OsmandMapTileView view = map.getMapView();
+		final OsmandApplication app = map.getMyApplication();
+		final Drawable compassNiu = map.getResources().getDrawable(R.drawable.map_compass_niu);
+		final Drawable compassNiuWhite = map.getResources().getDrawable(R.drawable.map_compass_niu_white);
+		final Drawable compassBearing = map.getResources().getDrawable(R.drawable.map_compass_bearing);
+		final Drawable compassBearingWhite = map.getResources().getDrawable(R.drawable.map_compass_bearing_white);
 		final Drawable compass = map.getResources().getDrawable(R.drawable.map_compass);
 		final Drawable compassWhite = map.getResources().getDrawable(R.drawable.map_compass_white);
 		final int mw = (int) compass.getMinimumWidth() ;
@@ -303,7 +309,13 @@ public class MapInfoWidgetsFactory {
 				boolean nightMode = drawSettings != null && drawSettings.isNightMode();
 				if(nightMode != this.nm) {
 					this.nm = nightMode;
-					setImageDrawable(nightMode ? compassWhite : compass);
+					if (app.getSetings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
+						setImageDrawable(nightMode ? compassNiuWhite : compassNiu);
+					} else if (app.getSetings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
+						setImageDrawable(nightMode ? compassBearingWhite : compassBearing);
+					} else {
+						setImageDrawable(nightMode ? compassWhite : compass);
+					}
 					return true;
 				}
 				if(view.getRotate() != cachedRotate) {