diff --git a/css/app.css b/css/app.css
index cbec945d5..11fc71964 100644
--- a/css/app.css
+++ b/css/app.css
@@ -345,11 +345,6 @@ button:hover {
     background-color: #ececec;
 }
 
-button.active {
-    cursor: pointer;
-    cursor: url(../img/cursor-pointing.png) 6 1, pointer;
-}
-
 button[disabled],
 button.disabled {
     background-color: rgba(255,255,255,.25);
@@ -1101,7 +1096,6 @@ input[type=number] {
 
 /* Preset form radio button */
 
-
 .radio-wrap {
     display: block;
     overflow: hidden;
@@ -1220,7 +1214,6 @@ div.combobox {
 }
 
 .combobox a {
-    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
     display: block;
     padding: 5px 10px;
     border-top:1px solid #ccc;
@@ -1242,33 +1235,11 @@ div.combobox {
     margin-left: -20px;
     margin-right: 10px;
     display:inline-block;
-    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
     border-top: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
 
-.rowselect .item {
-    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
-}
-
-.rowselect .item label:hover{
-    background-color: #ececec;
-}
-
-.rowselect .item label {
-    padding: 5px;
-    width: 100%;
-    cursor: pointer;
-    cursor: url(../img/cursor-pointer.png) 6 1, pointer;
-    display: block;
-    text-align: center;
-}
-
-.rowselect .item div {
-    text-align: center;
-}
-
 /* tag editor */
 
 .inspector-inner.additional-tags {
@@ -2315,8 +2286,16 @@ img.wiki-image {
     background-image: url(../img/sprite2x.png);
     background-size: 600px 560px;
   }
+    a,
+    button,
+    .checkselect label:hover,
+    .opacity-options li,
+    .radial-menu-item {
+        cursor: url(../img/cursor-pointer2x.png) 6 1, pointer;
+    }
 }
 
+
 /* Scrollbars
  ----------------------------------------------------- */
 
diff --git a/css/map.css b/css/map.css
index d7ff34002..273d9b8a8 100644
--- a/css/map.css
+++ b/css/map.css
@@ -925,25 +925,17 @@ text.point {
 .mode-draw-area .behavior-hover .way,
 .mode-add-line  .behavior-hover .way,
 .mode-add-area  .behavior-hover .way,
-.mode-drag-node .behavior-hover .way {
-    cursor: crosshair;
-    cursor: url(../img/cursor-draw-connect-line.png) 9 9, crosshair;
-}
-
+.mode-drag-node .behavior-hover .way,
 .mode-draw-line .behavior-hover .vertex,
 .mode-draw-area .behavior-hover .vertex,
 .mode-add-line  .behavior-hover .vertex,
 .mode-add-area  .behavior-hover .vertex,
-.mode-drag-node .behavior-hover .vertex {
+.mode-drag-node .behavior-hover .vertex, {
     cursor: crosshair;
     cursor: url(../img/cursor-draw-connect-vertex.png) 9 9, crosshair;
 }
 
-.mode-add-point #map:hover {
-    cursor: crosshair;
-    cursor: url(../img/cursor-draw.png) 9 9, crosshair;
-}
-
+.mode-add-point #map:hover,
 .lasso #map:hover,
 .lasso .way,
 .lasso .vertex {
@@ -986,3 +978,94 @@ path.gpx {
 .mode-drag-node .area.fill {
     pointer-events: none;
 }
+
+/* Retina cursors. */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
+  only screen and (-o-min-device-pixel-ratio: 3/2),
+  only screen and (min--moz-device-pixel-ratio: 1.5),
+  only screen and (min-device-pixel-ratio: 1.5) {
+
+    #map:hover {
+        cursor: url(../img/cursor-grab2x.png) 9 9, auto;
+    }
+
+    #map:active {
+        cursor: url(../img/cursor-grabbing2x.png) 9 9, auto;
+    }
+
+    .mode-browse #surface .point,
+    .mode-select #surface .point {
+        cursor: url(../img/cursor-select-point2x.png), pointer;
+    }
+
+    .mode-select #surface .vertex,
+    .mode-browse #surface .vertex {
+        cursor: url(../img/cursor-select-vertex2x.png), pointer;
+    }
+
+    .mode-browse #surface .line,
+    .mode-select #surface .line {
+        cursor: url(../img/cursor-select-line2x.png), pointer;
+    }
+
+    .mode-select #surface .area,
+    .mode-browse #surface .area {
+        cursor: url(../img/cursor-select-area2x.png), pointer;
+    }
+
+    .mode-select #surface .midpoint,
+    .mode-browse #surface .midpoint {
+        cursor: url(../img/cursor-select-split2x.png), pointer;
+    }
+
+    .mode-select .behavior-multiselect .point,
+    .mode-select .behavior-multiselect .vertex,
+    .mode-select .behavior-multiselect .line,
+    .mode-select .behavior-multiselect .area {
+        cursor: url(../img/cursor-select-add2x.png), pointer;
+    }
+
+    .mode-select .behavior-multiselect .selected {
+        cursor: url(../img/cursor-select-remove2x.png), pointer;
+    }
+
+    #map .point:active,
+    #map .vertex:active,
+    #map .line:active,
+    #map .area:active,
+    #map .midpoint:active,
+    #map .mode-select .selected {
+        cursor: url(../img/cursor-select-acting2x.png), pointer;
+    }
+
+    .mode-draw-line #map:hover,
+    .mode-draw-area #map:hover,
+    .mode-add-line  #map:hover,
+    .mode-add-area  #map:hover,
+    .mode-drag-node #map:hover {
+        cursor: crosshair;
+        cursor: url(../img/cursor-draw2x.png) 9 9, crosshair;
+    }
+
+    .mode-draw-line .behavior-hover .way,
+    .mode-draw-area .behavior-hover .way,
+    .mode-add-line  .behavior-hover .way,
+    .mode-add-area  .behavior-hover .way,
+    .mode-drag-node .behavior-hover .way,
+    .mode-draw-line .behavior-hover .vertex,
+    .mode-draw-area .behavior-hover .vertex,
+    .mode-add-line  .behavior-hover .vertex,
+    .mode-add-area  .behavior-hover .vertex,
+    .mode-drag-node .behavior-hover .vertex, {
+        cursor: crosshair;
+        cursor: url(../img/cursor-draw-connect-vertex2x.png) 9 9, crosshair;
+    }
+
+    .mode-add-point #map:hover,
+    .lasso #map:hover,
+    .lasso .way,
+    .lasso .vertex {
+        cursor: crosshair;
+        cursor: url(../img/cursor-draw2x.png) 9 9, crosshair;
+    }
+}