diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 42de3cc5a9..cf1137dbfd 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -32,7 +32,9 @@
 	<color name="gpx_track_fluorescent">#B400FFFF</color>
 	<!-- magenta is alternate track color for cyan but less contrast in many situations: color name="gpx_track_fluorescent">#B4FF00FF</color -->
 	<color name="pos_heading">#320000FF</color>
+	<color name="pos_heading_night">#880000FF</color>
 	<color name="pos_area">#280000FF</color>
+	<color name="pos_area_night">#660000FF</color>
 	<color name="pos_around">#707CDC</color>  <!-- family blue similar to above -->
 
 	<!-- <color name="nav_track">#960000FF</color>  Old blue colors - not bright enough especially in night mode -->
diff --git a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
index f329d15cfe..4485e63bde 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
@@ -32,6 +32,7 @@ public class PointLocationLayer extends OsmandMapLayer {
 	private Bitmap bearingIcon;
 	private Bitmap locationIcon;
 	private OsmAndLocationProvider locationProvider;
+	private boolean nm;
 
 	private void initUI() {
 		locationPaint = new Paint();
@@ -78,6 +79,12 @@ public class PointLocationLayer extends OsmandMapLayer {
 	@Override
 	public void onDraw(Canvas canvas, RectF latLonBounds, RectF tilesRect, DrawSettings nightMode) {
 		// draw
+		boolean nm = nightMode != null && nightMode.isNightMode();
+		if(nm != this.nm) {
+			this.nm = nm;
+			area.setColor(view.getResources().getColor(!nm?R.color.pos_area : R.color.pos_area_night));
+			headingPaint.setColor(view.getResources().getColor(!nm?R.color.pos_heading :R.color.pos_heading_night));
+		}
 		Location lastKnownLocation = locationProvider.getLastKnownLocation();
 		if(lastKnownLocation == null || view == null){
 			return;