diff --git a/css/map.css b/css/map.css
index 05c0658e3..bcb8f4dbe 100644
--- a/css/map.css
+++ b/css/map.css
@@ -893,7 +893,7 @@ text.point {
 
 .mode-add-point #map:hover {
     cursor: crosshair;
-    cursor: url(../img/cursor-draw-point.png) 18 18, crosshair;
+    cursor: url(../img/cursor-draw.png) 9 9, crosshair;
 }
 
 .lasso #map:hover,
diff --git a/img/cursor-draw-point.png b/img/cursor-draw-point.png
deleted file mode 100644
index fc1448d0c..000000000
Binary files a/img/cursor-draw-point.png and /dev/null differ
diff --git a/img/source/cursors.svg b/img/source/cursors.svg
index 4620cb123..0fc5057ba 100644
--- a/img/source/cursors.svg
+++ b/img/source/cursors.svg
@@ -14,7 +14,7 @@
    height="1052.3622047"
    id="svg54747"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.1 r9760"
    sodipodi:docname="cursors.svg">
   <defs
      id="defs54749">
@@ -52,19 +52,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-560.43364"
-     inkscape:cy="977.54892"
+     inkscape:zoom="7.858048"
+     inkscape:cx="-403.08423"
+     inkscape:cy="1001.5088"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1337"
      inkscape:window-height="840"
      inkscape:window-x="337"
      inkscape:window-y="105"
      inkscape:window-maximized="0"
      inkscape:snap-bbox="true"
-     showguides="false"
+     showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-nodes="true"
      inkscape:object-paths="true"
@@ -416,91 +416,6 @@
     <g
        id="g58022-1"
        transform="translate(-557,9.9871826)" />
-    <g
-       id="cursor-draw-point"
-       inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-draw-marker.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       transform="translate(-296,-55)"
-       inkscape:label="cursor-draw-point">
-      <rect
-         ry="0"
-         rx="0"
-         y="90.362183"
-         x="-117"
-         height="33"
-         width="33"
-         id="rect59174"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-         id="path59176"
-         sodipodi:cx="-105.40311"
-         sodipodi:cy="72.04702"
-         sodipodi:rx="1.6793786"
-         sodipodi:ry="1.6793786"
-         d="m -103.72373,72.04702 c 0,0.927495 -0.75188,1.679379 -1.67938,1.679379 -0.92749,0 -1.67938,-0.751884 -1.67938,-1.679379 0,-0.927495 0.75189,-1.679379 1.67938,-1.679379 0.9275,0 1.67938,0.751884 1.67938,1.679379 z"
-         transform="matrix(5.6568564,0,0,5.6568507,495.75024,-300.69704)" />
-      <path
-         transform="matrix(3.2750189,0,0,3.2750156,244.69716,-129.09292)"
-         d="m -103.72373,72.04702 c 0,0.927495 -0.75188,1.679379 -1.67938,1.679379 -0.92749,0 -1.67938,-0.751884 -1.67938,-1.679379 0,-0.927495 0.75189,-1.679379 1.67938,-1.679379 0.9275,0 1.67938,0.751884 1.67938,1.679379 z"
-         sodipodi:ry="1.6793786"
-         sodipodi:rx="1.6793786"
-         sodipodi:cy="72.04702"
-         sodipodi:cx="-105.40311"
-         id="path59186"
-         style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="sccccs"
-         inkscape:connector-curvature="0"
-         id="path59206"
-         d="m -100.5,90.362183 c -0.8137,0 -1.5,0.686297 -1.5,1.5 0,0.489583 0,4.010417 0,4.5 l 3,0 c 0,-0.489583 0,-4.010417 0,-4.5 0,-0.813703 -0.6863,-1.5 -1.5,-1.5 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-      <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path59210"
-         d="m -100.5,91.362183 c -0.277,7e-6 -0.5,0.222996 -0.5,0.5 0,0.5 0,4.25 0,4.5 l 1,0 c 0,-0.5 0,-4.000001 0,-4.500001 0,-0.277001 -0.22299,-0.499999 -0.5,-0.499999 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m -100.5,123.36218 c -0.8137,0 -1.5,-0.68629 -1.5,-1.5 0,-0.48958 0,-4.01041 0,-4.5 l 3,0 c 0,0.48959 0,4.01042 0,4.5 0,0.81371 -0.6863,1.5 -1.5,1.5 z"
-         id="path59244"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sccccs" />
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-         d="m -100.5,122.36218 c -0.277,0 -0.5,-0.22299 -0.5,-0.5 0,-0.5 0,-4.25 0,-4.5 l 1,0 c 0,0.5 0,4 0,4.5 0,0.277 -0.22299,0.5 -0.5,0.5 z"
-         id="path59246"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m -84,106.86219 c 3e-6,-0.8137 -0.686293,-1.5 -1.499998,-1.5 -0.489582,0 -4.010423,-1e-5 -4.500002,0 l -1e-5,2.99999 c 0.489597,1e-5 4.010427,1e-5 4.500011,1e-5 0.813702,0 1.500001,-0.6863 1.499999,-1.5 z"
-         id="path59248"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sccccs" />
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-         d="m -85,106.86218 c -7e-6,-0.277 -0.222997,-0.5 -0.499997,-0.49999 -0.500008,-1e-5 -4.249998,0 -4.499997,0 l -6e-6,0.99999 c 0.499998,0 4,1e-5 4.500005,1e-5 0.277002,0 0.50001,-0.22297 0.499995,-0.50001 z"
-         id="path59250"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="sccccs"
-         inkscape:connector-curvature="0"
-         id="path59252"
-         d="m -117,106.86218 c -1e-5,-0.8137 0.6863,-1.50001 1.5,-1.5 0.48958,0 4.01041,0 4.50001,2e-5 l -1e-5,2.99999 c -0.48959,-1e-5 -4.01042,-1e-5 -4.5,-1e-5 -0.8137,1e-5 -1.5,-0.68631 -1.5,-1.5 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-      <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path59254"
-         d="m -115.99999,106.86218 c -1e-5,-0.277 0.22301,-0.50001 0.49999,-0.50001 0.5,10e-6 4.25,10e-6 4.5,2e-5 l 1e-5,1 c -0.49999,0 -4,1e-5 -4.50001,-2e-5 -0.27699,10e-6 -0.49998,-0.223 -0.49999,-0.49999 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-    </g>
     <g
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
@@ -1132,5 +1047,12 @@
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          inkscape:connector-curvature="0" />
     </g>
+    <image
+       y="94.362183"
+       x="-398"
+       id="image5951"
+       xlink:href="file:///Users/saman/Desktop/Screen%20Shot%202013-03-15%20at%2012.37.02%20AM.png"
+       height="88"
+       width="85" />
   </g>
 </svg>
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index ced9f12c5..2dd511277 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -39,8 +39,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="133.66085"
-     inkscape:cy="2.5332289"
+     inkscape:cx="47.821102"
+     inkscape:cy="190.09564"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
      showgrid="false"
@@ -197,7 +197,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -352,21 +352,6 @@
        d="m 255,3.9999969 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5.0000001 1,1 1,0 1,-1 0,-5.0000001 -1,-1 -1,0 z"
        id="path10936"
        inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 90,4 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path5288-4" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 79,3.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,5.480522 79,5.251524 79,5.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,13.519484 72,13.748487 72,14.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
-       id="path5387" />
-    <path
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 57,3.9999981 c -2.76142,0 -5,2.23858 -5,5 0,2.7614299 5,6.9999999 5,6.9999999 0,0 5,-4.23857 5,-6.9999999 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.1045699 -0.89543,1.9999999 -2,1.9999999 -1.104569,0 -2,-0.89543 -2,-1.9999999 0,-1.10457 0.895431,-2 2,-2 z"
-       id="path8139"
-       inkscape:connector-curvature="0" />
     <path
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 113,2.01282 -5,4.5 5,4.5 0,-3 3,0 L 117,9 117,12.01282 116,13 l -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
@@ -399,13 +384,6 @@
        inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:0.2;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       id="rect5406"
-       width="6"
-       height="5.999999"
-       x="92"
-       y="6.999999" />
     <path
        inkscape:connector-curvature="0"
        id="path22362"
@@ -1460,5 +1438,20 @@
        sodipodi:ry="1"
        d="m 131,206 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
        transform="translate(25,0.99999655)" />
+    <path
+       id="path5205"
+       d="m 90,4 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+       style="opacity:1;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path5207"
+       d="m 79,3.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,5.480522 79,5.251524 79,5.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,13.519484 72,13.748487 72,14.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+       style="opacity:1;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5209"
+       d="m 57,3.999998 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
+       style="opacity:1;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
   </g>
 </svg>
diff --git a/img/sprite.png b/img/sprite.png
index 4b57a8368..ac55ccd34 100644
Binary files a/img/sprite.png and b/img/sprite.png differ