diff --git a/WebContent/base/osrm/OSRM.Control.Locations.js b/WebContent/base/osrm/OSRM.Control.Locations.js
index 16ab3442a..8a0733117 100644
--- a/WebContent/base/osrm/OSRM.Control.Locations.js
+++ b/WebContent/base/osrm/OSRM.Control.Locations.js
@@ -34,7 +34,7 @@ OSRM.Control.Locations = L.Control.extend({
 		L.DomEvent.disableClickPropagation(container);
 		
 		// create buttons
-		this._createButton('gui-locations-user', container, OSRM.GUI.zoomOnUser, map, navigator.geolocation );
+		this._createButton('gui-locations-user', container, OSRM.GUI.zoomOnUser, map, !!navigator.geolocation );
 		this._createButton('gui-locations-route', container, OSRM.GUI.zoomOnRoute, map, false);
 
 		return container;
diff --git a/WebContent/images/layers.png b/WebContent/images/layers.png
index 36af8c871..1dfae0e72 100644
Binary files a/WebContent/images/layers.png and b/WebContent/images/layers.png differ
diff --git a/WebContent/images/locations_route.png b/WebContent/images/locations_route.png
index c17829704..a47969067 100644
Binary files a/WebContent/images/locations_route.png and b/WebContent/images/locations_route.png differ
diff --git a/WebContent/images/locations_route_active.png b/WebContent/images/locations_route_active.png
index 44315410c..9936c2f85 100644
Binary files a/WebContent/images/locations_route_active.png and b/WebContent/images/locations_route_active.png differ
diff --git a/WebContent/images/locations_route_hover.png b/WebContent/images/locations_route_hover.png
index a0c6c4fc0..52875e579 100644
Binary files a/WebContent/images/locations_route_hover.png and b/WebContent/images/locations_route_hover.png differ
diff --git a/WebContent/images/locations_route_inactive.png b/WebContent/images/locations_route_inactive.png
new file mode 100644
index 000000000..add92b08f
Binary files /dev/null and b/WebContent/images/locations_route_inactive.png differ
diff --git a/WebContent/images/locations_user.png b/WebContent/images/locations_user.png
index f1977f835..c9f4abc1b 100644
Binary files a/WebContent/images/locations_user.png and b/WebContent/images/locations_user.png differ
diff --git a/WebContent/images/locations_user_active.png b/WebContent/images/locations_user_active.png
index a3c6d5751..735348018 100644
Binary files a/WebContent/images/locations_user_active.png and b/WebContent/images/locations_user_active.png differ
diff --git a/WebContent/images/locations_user_hover.png b/WebContent/images/locations_user_hover.png
index 79f3525c5..81223d07a 100644
Binary files a/WebContent/images/locations_user_hover.png and b/WebContent/images/locations_user_hover.png differ
diff --git a/WebContent/images/locations_user_inactive.png b/WebContent/images/locations_user_inactive.png
new file mode 100644
index 000000000..1dda1b5a6
Binary files /dev/null and b/WebContent/images/locations_user_inactive.png differ
diff --git a/WebContent/images/raw/controls.pdf b/WebContent/images/raw/controls.pdf
index 710f6af06..98544584e 100644
Binary files a/WebContent/images/raw/controls.pdf and b/WebContent/images/raw/controls.pdf differ