diff --git a/css/app.css b/css/app.css
index 205cafeb7..558d85599 100644
--- a/css/app.css
+++ b/css/app.css
@@ -33,7 +33,8 @@ div, textarea, input, form, span, ul, li, ol, a, button {
 a, button, input, textarea {
     -webkit-tap-highlight-color:rgba(0,0,0,0);
     -webkit-touch-callout:none;
-    cursor:url(../img/cursor-pointer.png) 6 1, auto;
+    cursor: pointer;
+    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
 }
 
 h2 {
@@ -284,7 +285,8 @@ button:hover {
 }
 
 button.active {
-    cursor:url(../img/cursor-pointing.png) 6 1, auto;
+    cursor: pointer;
+    cursor: url(../img/cursor-pointing.png) 6 1, pointer;
 }
 
 button.disabled {
@@ -636,7 +638,8 @@ div.combobox {
     margin-left: -15px;
     margin-right: 5px;
     display:inline-block;
-    cursor:url(../img/cursor-pointer.png) 6 1, auto;
+    cursor: pointer;
+    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
     border-top: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
@@ -1648,7 +1651,8 @@ a.success-action {
 
 .radial-menu-item {
     fill: white;
-    cursor:url(../img/cursor-pointer.png) 6 1, auto;
+    cursor: pointer;
+    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
 }
 
 .radial-menu-item:hover {
diff --git a/css/map.css b/css/map.css
index 3733327c4..ec030ffdf 100644
--- a/css/map.css
+++ b/css/map.css
@@ -682,11 +682,11 @@ text.point {
 /* Cursors */
 
 #map:hover {
-    cursor:url(../img/cursor-grab.png) 9 9, auto;
+    cursor: url(../img/cursor-grab.png) 9 9, auto;
 }
 
 #map:active {
-    cursor:url(../img/cursor-grabbing.png) 9 9, auto;
+    cursor: url(../img/cursor-grabbing.png) 9 9, auto;
 }
 
 .mode-browse .point,
@@ -727,7 +727,8 @@ text.point {
 .mode-draw-area #map:hover,
 .mode-add-line  #map:hover,
 .mode-add-area  #map:hover {
-    cursor:url(../img/cursor-draw.png) 9 9, auto;
+    cursor: crosshair;
+    cursor: url(../img/cursor-draw.png) 9 9, crosshair;
 }
 
 .mode-draw-line .behavior-hover .way,
@@ -735,7 +736,8 @@ text.point {
 .mode-add-line  .behavior-hover .way,
 .mode-add-area  .behavior-hover .way,
 .behavior-drag-node.behavior-hover .way {
-    cursor:url(../img/cursor-draw-connect-line.png) 9 9, auto;
+    cursor: crosshair;
+    cursor: url(../img/cursor-draw-connect-line.png) 9 9, crosshair;
 }
 
 .mode-draw-line .behavior-hover .vertex,
@@ -743,17 +745,20 @@ text.point {
 .mode-add-line  .behavior-hover .vertex,
 .mode-add-area  .behavior-hover .vertex,
 .behavior-drag-node.behavior-hover .vertex {
-    cursor:url(../img/cursor-draw-connect-vertex.png) 9 9, auto;
+    cursor: crosshair;
+    cursor: url(../img/cursor-draw-connect-vertex.png) 9 9, crosshair;
 }
 
 .mode-add-point #map:hover {
-    cursor:url(../img/cursor-draw-point.png) 18 18, auto;
+    cursor: crosshair;
+    cursor: url(../img/cursor-draw-point.png) 18 18, crosshair;
 }
 
 .lasso #map:hover,
 .lasso .way,
 .lasso .vertex {
-    cursor:url(../img/cursor-draw.png) 9 9, auto;
+    cursor: crosshair;
+    cursor: url(../img/cursor-draw.png) 9 9, crosshair;
 }
 
 .lasso #map {