diff --git a/css/app.css b/css/app.css
index 493726b1d..a448b212b 100644
--- a/css/app.css
+++ b/css/app.css
@@ -5,7 +5,7 @@ body {
     font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
     margin:0;
     padding:0;
-    color:#444;
+    color:#222;
 }
 
 #iD * {
@@ -63,7 +63,10 @@ input[type=text]:focus {
 
 .fillL { background-color: white;}
 .fillL2 { background: #f7f7f7 url(/img/background-pattern-1.png) repeat;}
-
+.fillD {
+    background-color: #222222;
+    color: white;
+}
 div.hide {
     display:none;
 }
@@ -87,8 +90,8 @@ button {
     font-size:14px;
     display: inline-block;
     height:40px;
-    margin:10px;
 }
+.fillD button { border: 1px solid black; }
 
 button:hover {
     background-color: #ececec;
@@ -104,14 +107,17 @@ button.narrow {
     border-radius:4px;
 }
 
-button.wide,
+button.wide {
+    margin: 10px;
+    width: 100px;
+}
+
 button.add-button {
     width: 80px;
 }
 
-
 button.narrow,
-button.add-button:first-child {
+button.Browse {
     width:40px;
 }
 
@@ -145,12 +151,14 @@ button.save {
     color:#6dc643;
 }
 
-button.cancel {
-    background:#aaa;
+button.delete {
+    color:#ff7070;
 }
 
-button.delete {
-    background:#DD5757;
+button.close {
+    position: absolute;
+    top: 10px;
+    right: 10px;
 }
 
 input[type=text] {
@@ -169,6 +177,15 @@ button small {
     vertical-align: top;
 }
 
+button .label {
+    margin-right: 3px;
+    text-shadow: 0 1px 0 white;
+}
+
+.active .label {
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+}
+
 /* Icons */
 
 .icon {
@@ -176,18 +193,208 @@ button small {
   vertical-align:top;
   width:20px;
   height:20px;
-  background:transparent url(/img/background-pattern-1.png) no-repeat 0px 0px;
+  background:transparent url(/img/sprite.png) no-repeat 0px 0px;
   text-indent:-9999px;
   overflow:hidden;
   }
 
-.icon.browse { background-position: 0px 0px;}
-.icon.place  { background-position: -20px 0px;}
-.icon.road   { background-position: -40px 0px;}
-.icon.area   { background-position: -60px 0px;}
-.icon.undo   { background-position: -80px 0px;}
-.icon.redo   { background-position: -100px 0px;}
-.icon.save   { background-position: -120px 0px;}
+.icon.icon-pre-text {
+  margin-right: 3px;
+}
+
+.icon.browse     { background-position:   0px 0px;}
+.icon.add-place  { background-position: -20px 0px;}
+.icon.add-road   { background-position: -40px 0px;}
+.icon.add-area   { background-position: -60px 0px;}
+.icon.undo       { background-position: -80px 0px;}
+.icon.redo       { background-position: -100px 0px;}
+.apply.icon      { background-position: -120px 0px;}
+.save.icon       { background-position: -140px 0px;}
+.close.icon      { background-position: -160px 0px;}
+.delete.icon     { background-position: -180px 0px;}
+
+.active .icon.browse     { background-position:   0px -20px;}
+.active .icon.add-place  { background-position: -20px -20px;}
+.active .icon.add-road   { background-position: -40px -20px;}
+.active .icon.add-area   { background-position: -60px -20px;}
+.active .icon.undo       { background-position: -80px -20px;}
+.active .icon.redo       { background-position: -100px -20px;}
+.active .apply.icon      { background-position: -120px -20px;}
+.active .save.icon       { background-position: -140px -20px;}
+.active .close.icon      { background-position: -160px -20px;}
+.active .delete.icon     { background-position: -180px -20px;}
+
+
+button[disabled] .icon.browse     { background-position:   0px -40px;}
+button[disabled] .icon.add-place  { background-position: -20px -40px;}
+button[disabled] .icon.add-road   { background-position: -40px -40px;}
+button[disabled] .icon.add-area   { background-position: -60px -40px;}
+button[disabled] .icon.undo       { background-position: -80px -40px;}
+button[disabled] .icon.redo       { background-position: -100px -40px;}
+button[disabled] .apply.icon      { background-position: -120px -40px;}
+button[disabled] .save.icon       { background-position: -140px -40px;}
+button[disabled] .close.icon      { background-position: -160px -40px;}
+button[disabled] .delete.icon     { background-position: -180px -40px;}
+
+/* ToolBar / Persistent UI Elements
+------------------------------------------------------- */
+
+#bar {
+    border-bottom:1px solid #ccc;
+    position:absolute;
+    left:0px;
+    top:0px;
+    right:0;
+    height:60px;
+}
+
+/* Special rules for toolbar icons */
+
+button.Browse .label {
+    display: none;
+ }
+
+/* Status box */
+
+.messages {
+    display:none;
+}
+
+/* Inspector */
+
+.inspector-wrap {
+    border:1px solid #ccc;
+    position:absolute;
+    right: 0;
+    left: 530px;
+    min-height: 60px;
+    opacity:0;
+    display:none;
+}
+
+.inspector-inner {
+    padding: 10px;
+}
+
+.inspector-wrap a.permalink {
+    text-decoration:none;
+    margin-right:1em;
+}
+
+.inspector tbody td {
+    border: 1px solid #ccc;
+    width:150px;
+}
+
+.inspector input {
+    margin:0;
+    padding:4px;
+    border:0;
+    background:#fff;
+    width:150px;
+}
+
+.inspector-wrap table {
+    border-collapse: collapse;
+    width:100%;
+    border-spacing:0;
+}
+
+.inspector-wrap .tag-table-wrap {
+    max-height:350px;
+    overflow:auto;
+}
+
+.inspector-wrap table td {
+    padding:0;
+    border-spacing:0;
+}
+
+.inspector-wrap .buttons {
+    margin-top: 10px;
+    border-top: 1px solid #ccc;
+}
+
+/* Map Controls */
+
+.map-control {
+    left:10px;
+    position:absolute;
+}
+
+.map-control button {
+    text-indent: -9999px;
+    overflow: hidden;
+    background-image: url(/img/sprite.png);
+}
+
+/* Zoomer */
+
+.zoombuttons {
+    top:70px;
+    width: 40px;
+}
+
+.zoombuttons button.zoom-in {
+    background-position: 10px -90px;
+    border-bottom:0;
+    border-radius:4px 4px 0 0;
+}
+
+.zoombuttons button.zoom-out {
+    background-position: -30px -90px;
+    border-radius:0 0 4px 4px;
+}
+
+/* Layer Switcher */
+
+.layerswitcher-control {
+    top:210px;
+}
+
+.layerswitcher-control button {
+    background-position: -110px -90px;
+}
+
+.layerswitcher-control .content {
+    background:#fff;
+    padding:5px;
+    position:absolute;
+    left:40px;
+    width:100px;
+    top:0;
+}
+
+.layerswitcher-control .opacity-options {
+    border:1px solid #000;
+    height:15px;
+    width:45px;
+}
+
+.layerswitcher-control a.layer {
+    display:block;
+}
+
+.layerswitcher-control a.opacity {
+    background:#000;
+    display:inline-block;
+    width:15px;
+    height:15px;
+}
+
+/* Geocoder */
+
+.geocode-control {
+    top:160px;
+}
+
+.geocode-control button {
+    background-position: -70px -90px;
+}
+
+.geocode-control input {
+    display:none;
+}
 
 /* Map
 ------------------------------------------------------- */
@@ -228,155 +435,6 @@ img.tile {
     padding:2px 5px;
 }
 
-/* ToolBar / Persistent UI Elements
-------------------------------------------------------- */
-
-#bar {
-    border-bottom:1px solid #ccc;
-    position:absolute;
-    left:0px;
-    top:0px;
-    right:0;
-    height:60px;
-}
-
-/* Status box */
-
-.messages {
-    display:none;
-}
-
-/* Inspector */
-
-.inspector-wrap {
-    border:1px solid #ccc;
-    position:absolute;
-    right: 0;
-    left: 510px;
-    padding:10px;
-    height: 60px;
-    opacity:0;
-    display:none;
-}
-
-.inspector-wrap a.permalink {
-    text-decoration:none;
-    margin-right:1em;
-}
-
-.inspector tbody td {
-    border: 1px solid #ccc;
-    width:150px;
-}
-
-.inspector input {
-    margin:0;
-    padding:4px;
-    border:0;
-    background:#fff;
-    width:150px;
-}
-
-.inspector-wrap table {
-    border-collapse: collapse;
-    width:347px;
-    border-spacing:0;
-}
-
-.inspector-wrap .tag-table-wrap {
-    max-height:350px;
-    overflow:auto;
-}
-
-.inspector-wrap table td {
-    padding:0;
-    border-spacing:0;
-}
-
-.inspector-wrap .close {
-    border: 0;
-    position: absolute;
-    top: 0;
-    right: 0;
-    cursor: pointer;
-}
-
-/* Map Controls */
-
-#bar .zoombuttons {
-    position:absolute;
-    left:10px;
-    top:50px;
-    width:40px;
-}
-
-#bar .zoombuttons button {
-    width:40px;
-    border:1px solid #ccc;
-}
-
-#bar .zoombuttons button.zoom-in {
-    border-bottom:0;
-    border-radius:5px 5px 0 0;
-}
-
-#bar .zoombuttons button.zoom-out {
-    border-radius:0 0 5px 5px;
-}
-
-/* Layer Switcher */
-
-div.layerswitcher-control {
-    position:absolute;
-    top:170px;
-    left:10px;
-    color:#222;
-}
-
-div.layerswitcher-control .content {
-    background:#fff;
-    padding:5px;
-    position:absolute;
-    left:40px;
-    width:100px;
-    top:0;
-}
-
-div.layerswitcher-control div.opacity-options {
-    border:1px solid #000;
-    height:15px;
-    width:45px;
-}
-
-div.layerswitcher-control a.layer {
-    display:block;
-}
-
-div.layerswitcher-control a.opacity {
-    background:#000;
-    display:inline-block;
-    width:15px;
-    height:15px;
-}
-
-/* Geocoder */
-
-div.geocode-control {
-    position:absolute;
-    top:130px;
-    left:10px;
-    color:#222;
-}
-
-#bar div.geocode-control button,
-div.layerswitcher-control button {
-    width:40px;
-}
-
-div.geocode-control input {
-    display:none;
-}
-
 /* Account Information
 ------------------------------------------------------- */
 
@@ -476,15 +534,16 @@ div.typeahead a {
 .tooltip {
     position: absolute;
     z-index: 1030;
-    display: block;
     padding: 5px;
     font-size: 11px;
     opacity: 0;
+    display: none;
     filter: alpha(opacity=0);
     visibility: visible;
 }
 
 .tooltip.in {
+    display: block;
     opacity: 0.8;
     filter: alpha(opacity=80);
 }
diff --git a/css/reset.css b/css/reset.css
index 7f9084c6f..6e0beba61 100644
--- a/css/reset.css
+++ b/css/reset.css
@@ -60,6 +60,7 @@ textarea {
     font-family: inherit; /* 1 */
     font-size: 100%; /* 2 */
     margin: 0; /* 3 */
+    padding: 0;
 }
 
 /*
@@ -139,4 +140,18 @@ button::-moz-focus-inner,
 input::-moz-focus-inner {
     border: 0;
     padding: 0;
-}
\ No newline at end of file
+}
+
+/*
+** Markup free clearing
+** Details: http://www.positioniseverything.net/easyclearing.html
+*/
+.cf:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+  }
+
+.cf { display: inline-block; }
\ No newline at end of file
diff --git a/img/source/design.svg b/img/source/design.svg
index e682c225c..c9f80174f 100644
--- a/img/source/design.svg
+++ b/img/source/design.svg
@@ -21,6 +21,11 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <pattern
+       inkscape:collect="always"
+       xlink:href="#pattern9180-3"
+       id="pattern17383"
+       patternTransform="translate(441,38.362183)" />
     <pattern
        inkscape:collect="always"
        xlink:href="#pattern9180-3-7"
@@ -324,11 +329,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="244.42717"
-     inkscape:cy="1062.0803"
+     inkscape:zoom="1"
+     inkscape:cx="551.67736"
+     inkscape:cy="614.51516"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer8"
      showgrid="false"
      inkscape:window-width="1660"
      inkscape:window-height="971"
@@ -514,8 +519,7 @@
        width="48.5"
        height="36"
        x="398"
-       y="-144"
-       transform="translate(0,52.362183)" />
+       y="-131.63782" />
     <rect
        style="color:#000000;fill:#9ed485;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="rect9403"
@@ -645,7 +649,7 @@
     <rect
        ry="4"
        rx="4"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b0b0b0;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaaa;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect9201"
        width="59"
        height="39"
@@ -654,14 +658,14 @@
     <text
        xml:space="preserve"
        style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
-       x="490.40121"
+       x="480.40121"
        y="117.36218"
        id="text7345"
        sodipodi:linespacing="167%"><tspan
          sodipodi:role="line"
          id="tspan7347"
-         x="490.40121"
-         y="117.36218">Save</tspan></text>
+         x="480.40121"
+         y="117.36218">Commit</tspan></text>
     <path
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
@@ -737,7 +741,7 @@
        width="3"
        height="3"
        x="421"
-       y="-71.637817"
+       y="-111.63782"
        id="rect9109" />
     <g
        style="opacity:0.25;fill:#000000;fill-opacity:1"
@@ -775,7 +779,7 @@
     </g>
     <g
        id="g5774"
-       style="fill:#7092ff;fill-opacity:1">
+       style="fill:#cccccc;fill-opacity:1">
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
@@ -784,9 +788,9 @@
          inkscape:connector-curvature="0"
          id="path2997"
          d="m 385,104.36219 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -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"
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="m 414,104.36219 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 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"
          id="path9203"
          inkscape:connector-curvature="0"
@@ -1061,7 +1065,7 @@
        ry="3.5" />
     <g
        id="g5460"
-       transform="translate(3,0)"
+       transform="translate(3,-40)"
        style="fill:#6bc641;fill-opacity:1">
       <path
          sodipodi:nodetypes="ccccccccc"
@@ -1350,7 +1354,7 @@
    style="fill:#7092ff;fill-opacity:1">areas</flowSpan>.</flowPara></flowRoot>    <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 486.5,-66.637817 c -4.69442,0 -8.5,3.80558 -8.5,8.499997 0,4.69442 3.80558,8.5 8.5,8.5 4.69442,0 8.5,-3.80558 8.5,-8.5 0,-4.694417 -3.80558,-8.499997 -8.5,-8.499997 z m -0.5,3 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 1,-1 z m 0,3.999997 1,0 1,1 0,5 -1,1 -1,0 -1,-1 0,-5 1,-1 z"
+       d="m 486.5,-106.63782 c -4.69442,0 -8.5,3.80558 -8.5,8.5 0,4.69442 3.80558,8.5 8.5,8.5 4.69442,0 8.5,-3.80558 8.5,-8.5 0,-4.69442 -3.80558,-8.5 -8.5,-8.5 z m -0.5,3 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 1,-1 z m 0,4 1,0 1,1 0,5 -1,1 -1,0 -1,-1 0,-5 1,-1 z"
        id="path8218-2-9" />
     <text
        xml:space="preserve"
@@ -1655,6 +1659,439 @@
            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" />
       </g>
     </g>
+    <image
+       y="44.362183"
+       x="1296"
+       id="image15587"
+       xlink:href="file:///Users/saman/Desktop/Screen%20Shot%202012-12-07%20at%2011.39.17%20AM.png"
+       height="518"
+       width="734" />
+    <image
+       style="display:inline"
+       width="100"
+       height="100"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAABHNCSVQICAgIfAhkiAAAAYtJREFU eJzt3MGqwjAQRuHMxfd/5XFzA7FYURR6/nC+jaXdlB4mqQut7h7i+Lv6BvTIIDAGgTEIjEFgDAJj EBiDwBgExiAwBoExCIxBYAwCYxAYg8AYBMYgMAaBMQiMQWAMAmMQGIPAGATGIDAGgTEIjEFgDAJj EBiDwBgExiAwBoExCIxBYAwCYxCY2CBV1VW13Y/sI4NUVXf36O6xW5TIIDszCMzt6hv4heOy1d11 1b18a4sJmfvJPE7e8GOCfPqQUzf8iCVrvlXN4/Xa+vdS65SkipmQKflhvyMiSHdX1fN9ep4/fqaK CDLGY5SdpyQmyKeqKvL1NyrIq6VrF5U4/utb18n1yOkYI2xCprNJ2WF6Ir6HnDkG+A+VN/KLyCVr Z5FL1s4MAmMQGIPAGATGIDAGgTEIjEFgDAJjEBiDwBgExiAwBoExCIxBYAwCYxAYg8AYBMYgMAaB MQiMQWAMAmMQGIPAGATGIDAGgTEIjEFgDAJjEBiDwBgExiAwBoExCIxBYAwCYxCYO7RpVslvIxxD AAAAAElFTkSuQmCC "
+       id="image35972-8"
+       x="1567"
+       y="332.36218"
+       inkscape:export-filename="/Users/saman/work_repos/iD/img/source/renders/operations-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       id="g16027"
+       inkscape:export-filename="/Users/saman/work_repos/iD/img/source/renders/operations-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         id="g16002">
+        <path
+           sodipodi:nodetypes="csssssscc"
+           inkscape:connector-curvature="0"
+           id="rect6027-8-3-1"
+           d="m 1764,303.86218 c -2.216,0 -4,1.784 -4,4 l 0,52 c 0,2.216 1.784,4 4,4 l 52,0 c 2.216,0 4,-1.784 4,-4 l 0,-52 c 0,-2.216 -1.784,-4 -4,-4 z"
+           style="opacity:0.9;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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6290-7-7"
+           d="m 1760,346.36218 -10,-10 10,-10 z"
+           style="opacity:0.9;color:#000000;fill:#222222;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
+         id="g16006">
+        <rect
+           ry="4"
+           rx="4"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#222222;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9201-8-0"
+           width="39"
+           height="39"
+           x="1770.5"
+           y="314.86218" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:none;stroke:#222222;stroke-width:0.92307693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path15734"
+           sodipodi:cx="1570"
+           sodipodi:cy="283"
+           sodipodi:rx="3"
+           sodipodi:ry="3"
+           d="m 1573,283 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+           transform="matrix(2.1666667,0,0,2.1666667,-1611.6667,-277.80448)" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5288-3"
+           d="m 1794,338.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           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"
+           sodipodi:nodetypes="cccccccccsssss" />
+        <path
+           sodipodi:nodetypes="cccccccccsssss"
+           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 1794,328.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           id="path5311-1"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccccccccsssss"
+           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 1784,338.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           id="path5315-5"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5317-0"
+           d="m 1784,328.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           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"
+           sodipodi:nodetypes="cccccccccsssss" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path15726"
+           d="m 1789,326.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           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"
+           sodipodi:nodetypes="cccccccccsssss" />
+        <path
+           sodipodi:nodetypes="cccccccccsssss"
+           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 1789,340.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           id="path15728"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path15730"
+           d="m 1796,333.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           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"
+           sodipodi:nodetypes="cccccccccsssss" />
+        <path
+           sodipodi:nodetypes="cccccccccsssss"
+           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 1782,333.36218 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m 1,1 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+           id="path15732"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path15736"
+           sodipodi:cx="1570.25"
+           sodipodi:cy="276.25"
+           sodipodi:rx="1.2499993"
+           sodipodi:ry="1.2499993"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           transform="matrix(0.79999994,0,0,0.80000183,533.8001,107.36168)" />
+        <path
+           transform="matrix(0.79999994,0,0,0.80000183,533.80009,107.36168)"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           sodipodi:ry="1.2499993"
+           sodipodi:rx="1.2499993"
+           sodipodi:cy="276.25"
+           sodipodi:cx="1570.25"
+           id="path15738"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path15752"
+           sodipodi:cx="1570.25"
+           sodipodi:cy="276.25"
+           sodipodi:rx="1.2499993"
+           sodipodi:ry="1.2499993"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           transform="matrix(0.79999994,0,0,0.80000183,533.80009,121.36168)" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path15754"
+           sodipodi:cx="1570.25"
+           sodipodi:cy="276.25"
+           sodipodi:rx="1.2499993"
+           sodipodi:ry="1.2499993"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           transform="matrix(0.56568538,0.56568538,-0.56568672,0.56568672,1063.0035,-714.17624)" />
+        <path
+           transform="matrix(0.56568538,0.56568538,-0.56568672,0.56568672,1053.0035,-704.17624)"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           sodipodi:ry="1.2499993"
+           sodipodi:rx="1.2499993"
+           sodipodi:cy="276.25"
+           sodipodi:cx="1570.25"
+           id="path15756"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(0,0.79999994,-0.80000183,0,2018.0005,-920.83771)"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           sodipodi:ry="1.2499993"
+           sodipodi:rx="1.2499993"
+           sodipodi:cy="276.25"
+           sodipodi:cx="1570.25"
+           id="path15758"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path15760"
+           sodipodi:cx="1570.25"
+           sodipodi:cy="276.25"
+           sodipodi:rx="1.2499993"
+           sodipodi:ry="1.2499993"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           transform="matrix(0,0.79999994,-0.80000183,0,2004.0005,-920.83772)" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path15762"
+           sodipodi:cx="1570.25"
+           sodipodi:cy="276.25"
+           sodipodi:rx="1.2499993"
+           sodipodi:ry="1.2499993"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           transform="matrix(-0.56568538,0.56568538,-0.56568672,-0.56568672,2839.5384,-391.63433)" />
+        <path
+           transform="matrix(-0.56568538,0.56568538,-0.56568672,-0.56568672,2829.5384,-401.63433)"
+           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           sodipodi:ry="1.2499993"
+           sodipodi:rx="1.2499993"
+           sodipodi:cy="276.25"
+           sodipodi:cx="1570.25"
+           id="path15764"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <rect
+       ry="0"
+       rx="0"
+       y="267.36218"
+       x="-100"
+       height="20"
+       width="19.99999"
+       id="rect15766"
+       style="color:#000000;fill:#ffe070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect16191"
+       width="340"
+       height="90"
+       x="1690"
+       y="420"
+       transform="translate(0,52.362183)"
+       inkscape:export-filename="/Users/saman/work_repos/iD/img/source/renders/operations-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
+       x="1701"
+       y="499.36218"
+       id="text15785"
+       sodipodi:linespacing="167%"
+       inkscape:export-filename="/Users/saman/work_repos/iD/img/source/renders/operations-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"><tspan
+         sodipodi:role="line"
+         id="tspan15787"
+         x="1701"
+         y="499.36218">Show a menu for doing operations, positioned relative</tspan><tspan
+         sodipodi:role="line"
+         x="1701"
+         y="519.40216"
+         id="tspan15812">to selected feature.</tspan></text>
+    <image
+       y="23.362183"
+       x="2060"
+       id="image15876"
+       xlink:href="file:///Users/saman/Desktop/Screen%20Shot%202012-12-07%20at%2011.45.16%20AM.png"
+       height="539"
+       width="621" />
+    <image
+       style="display:inline"
+       width="100"
+       height="100"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAABHNCSVQICAgIfAhkiAAAAYtJREFU eJzt3MGqwjAQRuHMxfd/5XFzA7FYURR6/nC+jaXdlB4mqQut7h7i+Lv6BvTIIDAGgTEIjEFgDAJj EBiDwBgExiAwBoExCIxBYAwCYxAYg8AYBMYgMAaBMQiMQWAMAmMQGIPAGATGIDAGgTEIjEFgDAJj EBiDwBgExiAwBoExCIxBYAwCYxCY2CBV1VW13Y/sI4NUVXf36O6xW5TIIDszCMzt6hv4heOy1d11 1b18a4sJmfvJPE7e8GOCfPqQUzf8iCVrvlXN4/Xa+vdS65SkipmQKflhvyMiSHdX1fN9ep4/fqaK CDLGY5SdpyQmyKeqKvL1NyrIq6VrF5U4/utb18n1yOkYI2xCprNJ2WF6Ir6HnDkG+A+VN/KLyCVr Z5FL1s4MAmMQGIPAGATGIDAGgTEIjEFgDAJjEBiDwBgExiAwBoExCIxBYAwCYxAYg8AYBMYgMAaB MQiMQWAMAmMQGIPAGATGIDAGgTEIjEFgDAJjEBiDwBgExiAwBoExCIxBYAwCYxCYO7RpVslvIxxD AAAAAElFTkSuQmCC "
+       id="image35972-8-4"
+       x="2294"
+       y="484.36218" />
+    <g
+       transform="translate(720,178.5)"
+       style="display:inline"
+       id="g16027-4">
+      <g
+         id="g16002-4">
+        <path
+           sodipodi:nodetypes="csssssscc"
+           inkscape:connector-curvature="0"
+           id="rect6027-8-3-1-2"
+           d="m 1764,303.86218 c -2.216,0 -4,1.784 -4,4 l 0,52 c 0,2.216 1.784,4 4,4 l 102,0 c 2.216,0 4,-1.784 4,-4 l 0,-52 c 0,-2.216 -1.784,-4 -4,-4 z"
+           style="opacity:0.9;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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6290-7-7-8"
+           d="m 1760,346.36218 -10,-10 10,-10 z"
+           style="opacity:0.9;color:#000000;fill:#222222;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
+         id="g16006-7">
+        <rect
+           ry="4"
+           rx="4"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#222222;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9201-8-0-6"
+           width="39"
+           height="39"
+           x="1770.5"
+           y="314.86218" />
+        <rect
+           y="314.86218"
+           x="1820.5"
+           height="39"
+           width="39"
+           id="rect16139"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#222222;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           rx="4"
+           ry="4" />
+      </g>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path5173-8-1-0"
+       d="m 2509,510.36218 -2,2 0,2 2,2 2,0 2,-2 0,-2 -2,-2 -2,0 z m 1,2 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+       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" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5185-2-4-4"
+       d="m 2500,510.36218 -2,2 0,2 2,2 2,0 2,-2 0,-2 -2,-2 -2,0 z m 1,2 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+       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" />
+    <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 2518,510.36218 -2,2 0,2 2,2 2,0 2,-2 0,-2 -2,-2 -2,0 z m 1,2 c 0.5523,0 1,0.44772 1,1 0,0.55229 -0.4477,1 -1,1 -0.5523,0 -1,-0.44771 -1,-1 0,-0.55228 0.4477,-1 1,-1 z"
+       id="path16167"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect16169"
+       width="6"
+       height="2.0000005"
+       x="2502"
+       y="512.36218"
+       rx="0"
+       ry="0" />
+    <rect
+       ry="0"
+       rx="0"
+       y="512.36218"
+       x="2512"
+       height="2.0000005"
+       width="6"
+       id="rect16171"
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2559,509.36218 -5,4.5 5,4.5 0,-3 6,0 1,-1 0,-1 -1,-1.00002 -6,0 z"
+       id="path2997-2-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect16203"
+       width="480"
+       height="520"
+       x="1550"
+       y="42.362183"
+       inkscape:export-filename="/Users/saman/work_repos/iD/img/source/renders/operations-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       style="display:inline"
+       id="g9588-1"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,286.85643,-700.19815)">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path9584-1"
+         d="m 924.68629,-65.466241 11.31371,0 0.70711,0.707107 0,1.414213 -0.70711,0.707107 -11.31371,0 -0.7071,-0.707107 0,-1.414213 z"
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1693.1436,-700.19815)"
+       id="g16306"
+       style="display:inline">
+      <path
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 924.68629,-65.466241 11.31371,0 0.70711,0.707107 0,1.414213 -0.70711,0.707107 -11.31371,0 -0.7071,-0.707107 0,-1.414213 z"
+         id="path16308"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+    </g>
+    <g
+       style="display:inline"
+       id="g9588-1-8"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,306.85643,-700.19815)">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path9584-1-9"
+         d="m 923.27208,-66.880455 14.14213,0 0.70711,0.707107 0,1.414213 -0.70711,0.707107 -14.14213,0 -0.7071,-0.707107 0,-1.414213 z"
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1713.1436,-700.19815)"
+       id="g16306-5"
+       style="display:inline">
+      <path
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 921.85787,-65.466241 14.14213,0 0.70711,0.707107 0,1.414213 -0.70711,0.707107 -14.14213,0 -0.7071,-0.707107 0,-1.414213 z"
+         id="path16308-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+    </g>
+    <path
+       style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 464.00002,111.36218 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 10e-6,-6.00002 z"
+       id="path9203-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="2.9063768"
+       x="442.67679"
+       height="39"
+       width="104"
+       id="rect16652"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b0b0b0;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       rx="3.9999998"
+       ry="4" />
+    <text
+       sodipodi:linespacing="167%"
+       id="text16654"
+       y="27.362183"
+       x="477.40121"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
+       xml:space="preserve"><tspan
+         y="27.362183"
+         x="477.40121"
+         id="tspan16656"
+         sodipodi:role="line">Delete</tspan></text>
+    <path
+       style="color:#000000;fill:#ff7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 454 -35 L 453 -34 L 453 -33 L 454 -32 L 466 -32 L 467 -33 L 467 -34 L 466 -35 L 454 -35 z M 454 -31 L 454 -21 L 455 -20 L 465 -20 L 466 -21 L 466 -31 L 454 -31 z M 456 -29 L 458 -29 L 458 -23 L 457 -22 L 456 -23 L 456 -29 z M 459 -29 L 461 -29 L 461 -23 L 460 -22 L 459 -23 L 459 -29 z M 462 -29 L 464 -29 L 464 -23 L 463 -22 L 462 -23 L 462 -29 z "
+       transform="translate(0,52.362183)"
+       id="path16662" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -1755,7 +2192,7 @@
        xml:space="preserve"
        id="flowRoot4913-5-1"
        style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Italic"
-       transform="translate(280.5,121.34304)"><flowRegion
+       transform="translate(280.5,81.34304)"><flowRegion
          id="flowRegion4915-9-7"><rect
            id="rect4917-9-6"
            width="373"
@@ -1767,13 +2204,13 @@
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        x="480"
-       y="-75"
+       y="-115"
        id="text5098-4-5"
        sodipodi:linespacing="167%"><tspan
          sodipodi:role="line"
          id="tspan5100-0-4"
          x="480"
-         y="-75">Did you know?</tspan></text>
+         y="-115">Did you know?</tspan></text>
     <path
        style="opacity:0.75;color:#000000;fill:#222222;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 -218,152 44,84 -141,26 -26,-109"
@@ -1804,7 +2241,7 @@
          y="55">Add a point of interest to the map. </tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571000000742%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        x="220"
        y="-90"
        id="text5098-4-5-0"
@@ -1818,9 +2255,9 @@
      inkscape:groupmode="layer"
      id="layer8"
      inkscape:label="layer-switcher"
-     style="display:none">
+     style="display:inline">
     <rect
-       y="240.50002"
+       y="220.50002"
        x="10.500001"
        height="278.99997"
        width="149"
@@ -1834,22 +2271,22 @@
     <rect
        ry="3.9999998"
        rx="4"
-       style="color:#000000;fill:url(#pattern9180-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:url(#pattern17383);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect7661"
        width="149"
        height="278.99997"
        x="10.500001"
-       y="240.50002"
+       y="220.50002"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
        style="display:inline"
        id="g5301"
-       transform="matrix(3.8187791,0,0,4.7029385,-2129.8919,368.44168)" />
+       transform="matrix(3.8187791,0,0,4.7029385,-2129.8919,348.44168)" />
     <path
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999988;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 10.5,280.5 0,58.75625 0,44.625 0,15.61875 149,0 0,-15.61875 0,-44.625 0,-58.75625 z"
+       d="m 10.5,260.5 0,58.75625 0,44.625 0,15.61875 149,0 0,-15.61875 0,-44.625 0,-58.75625 z"
        id="rect6307"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccc"
@@ -1859,26 +2296,26 @@
     <text
        sodipodi:linespacing="167%"
        id="text5392"
-       y="265"
+       y="245"
        x="20"
        style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Italic"
        xml:space="preserve"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"><tspan
-         y="265"
+         y="245"
          x="20"
          id="tspan5394"
          sodipodi:role="line">Baselayers</tspan></text>
     <g
-       transform="matrix(3.8187791,0,0,3.6908716,-2129.8919,380.5546)"
+       transform="matrix(3.8187791,0,0,3.6908716,-2129.8919,360.5546)"
        id="g6305"
        style="fill:#f7f7f7;fill-opacity:1;display:inline" />
     <path
        sodipodi:nodetypes="ccccccccc"
        inkscape:connector-curvature="0"
        id="path7360"
-       d="m 10.5,440.5 0,-0.5 0,116 4,3.5 141,0 4,-4.5 0,-115 0,0.5 z"
+       d="m 10.5,420.5 0,-0.5 0,116 4,3.5 141,0 4,-4.5 0,-115 0,0.5 z"
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999988;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
@@ -1891,14 +2328,14 @@
        width="149"
        height="318.99997"
        x="10.500001"
-       y="240.5"
+       y="220.5"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path7144"
-       d="m 11,280 0,1 149,0 0,-1 -149,0 z"
+       d="m 11,260 0,1 149,0 0,-1 -149,0 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:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
@@ -1906,20 +2343,20 @@
     <text
        sodipodi:linespacing="167%"
        id="text6292"
-       y="343"
+       y="323"
        x="50"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        xml:space="preserve"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"><tspan
-         y="343"
+         y="323"
          x="50"
          id="tspan6294"
          sodipodi:role="line">OpenStreetMap</tspan></text>
     <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:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 12,320 0,1 146,0 0,-1 -146,0 z"
+       d="m 12,300 0,1 146,0 0,-1 -146,0 z"
        id="path7225"
        inkscape:connector-curvature="0"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -1928,7 +2365,7 @@
     <path
        inkscape:connector-curvature="0"
        id="path7227"
-       d="m 11,400 0,1 148,0 0,-1 -148,0 z"
+       d="m 11,380 0,1 148,0 0,-1 -148,0 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:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
@@ -1937,7 +2374,7 @@
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        x="50"
-       y="303"
+       y="283"
        id="text6288"
        sodipodi:linespacing="167%"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -1946,26 +2383,27 @@
          sodipodi:role="line"
          id="tspan6290"
          x="50"
-         y="303">Bing Satellite</tspan></text>
+         y="283">Bing Satellite</tspan></text>
     <rect
        style="color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:#222222;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect7320"
        width="19"
        height="19"
        x="20.5"
-       y="290.5"
+       y="270.5"
        rx="9.5"
        ry="9.5"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       id="g7330" />
+       id="g7330"
+       transform="translate(0,-20)" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Italic"
        x="20"
-       y="425"
+       y="405"
        id="text7352"
        sodipodi:linespacing="167%"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -1974,10 +2412,10 @@
          sodipodi:role="line"
          id="tspan7354"
          x="20"
-         y="425">Overlays</tspan></text>
+         y="405">Overlays</tspan></text>
     <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:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 11,440 0,1 149,0 0,-1 -149,0 z"
+       d="m 11,420 0,1 149,0 0,-1 -149,0 z"
        id="path7356"
        inkscape:connector-curvature="0"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -1986,7 +2424,7 @@
     <path
        inkscape:connector-curvature="0"
        id="path7366"
-       d="m 13,480 0,1 145,0 0,-1 -145,0 z"
+       d="m 13,460 0,1 145,0 0,-1 -145,0 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:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
@@ -1994,14 +2432,14 @@
     <text
        sodipodi:linespacing="167%"
        id="text7372"
-       y="503"
+       y="483"
        x="50"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        xml:space="preserve"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"><tspan
-         y="503"
+         y="483"
          x="50"
          id="tspan7374"
          sodipodi:role="line">TIGER roads</tspan></text>
@@ -2011,7 +2449,7 @@
        width="19"
        height="19"
        x="20.5"
-       y="330.5"
+       y="310.5"
        rx="9.5"
        ry="9.5"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2020,7 +2458,7 @@
     <rect
        ry="3.9999995"
        rx="4"
-       y="490.5"
+       y="470.5"
        x="20.5"
        height="19"
        width="19"
@@ -2032,21 +2470,21 @@
     <text
        sodipodi:linespacing="167%"
        id="text7368"
-       y="463"
+       y="443"
        x="50"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        xml:space="preserve"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"><tspan
-         y="463"
+         y="443"
          x="50"
          id="tspan7370"
          sodipodi:role="line">Standard</tspan></text>
     <rect
        ry="3.9999995"
        rx="4"
-       y="450.5"
+       y="430.5"
        x="20.5"
        height="19"
        width="19"
@@ -2058,7 +2496,7 @@
     <rect
        ry="9.5"
        rx="9.5"
-       y="291"
+       y="271"
        x="21"
        height="18"
        width="18"
@@ -2073,7 +2511,7 @@
        width="16"
        height="16"
        x="22"
-       y="452"
+       y="432"
        rx="3"
        ry="3"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2081,7 +2519,7 @@
        inkscape:export-ydpi="90" />
     <path
        style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 25,459 -1,1 0,1 4,4 1,0 1,-1 0,-1 -4,-4 z"
+       d="m 25,439 -1,1 0,1 4,4 1,0 1,-1 0,-1 -4,-4 z"
        id="path4961-2-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccc"
@@ -2092,7 +2530,7 @@
        sodipodi:nodetypes="ccccccccc"
        inkscape:connector-curvature="0"
        id="path7538"
-       d="m 35,456 1,1 0,1 -7,7 -1,0 -1,-1 0,-1 7,-7 z"
+       d="m 35,436 1,1 0,1 -7,7 -1,0 -1,-1 0,-1 7,-7 z"
        style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
@@ -2103,7 +2541,7 @@
        width="13"
        height="13"
        x="23.5"
-       y="333.5"
+       y="313.5"
        rx="9.5"
        ry="9.5"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2115,7 +2553,7 @@
        width="10"
        height="10"
        x="25"
-       y="295"
+       y="275"
        rx="9.5"
        ry="9.5"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2123,7 +2561,7 @@
        inkscape:export-ydpi="90" />
     <g
        id="g7952"
-       transform="translate(0,160)"
+       transform="translate(0,140)"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
@@ -2146,7 +2584,7 @@
     <path
        inkscape:connector-curvature="0"
        id="path8024"
-       d="m 12,360 0,1 146,0 0,-1 -146,0 z"
+       d="m 12,340 0,1 146,0 0,-1 -146,0 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:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
@@ -2155,7 +2593,7 @@
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        x="50"
-       y="383"
+       y="363"
        id="text8026"
        sodipodi:linespacing="167%"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2164,11 +2602,11 @@
          sodipodi:role="line"
          id="tspan8028"
          x="50"
-         y="383">Cycle Map</tspan></text>
+         y="363">Cycle Map</tspan></text>
     <rect
        ry="9.5"
        rx="9.5"
-       y="370.5"
+       y="350.5"
        x="20.5"
        height="19"
        width="19"
@@ -2180,7 +2618,7 @@
     <rect
        ry="9.5"
        rx="9.5"
-       y="373.5"
+       y="353.5"
        x="23.5"
        height="13"
        width="13"
@@ -2193,7 +2631,7 @@
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
        x="50"
-       y="543"
+       y="523"
        id="text8329"
        sodipodi:linespacing="167%"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2202,14 +2640,14 @@
          sodipodi:role="line"
          id="tspan8331"
          x="50"
-         y="543">GPS Tracks</tspan></text>
+         y="523">GPS Tracks</tspan></text>
     <rect
        style="color:#000000;fill:none;stroke:#b0b0b0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect8333"
        width="19"
        height="19"
        x="20.5"
-       y="530.5"
+       y="510.5"
        rx="4"
        ry="3.9999995"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2217,7 +2655,7 @@
        inkscape:export-ydpi="90" />
     <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:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 13,520 0,1 145,0 0,-1 -145,0 z"
+       d="m 13,500 0,1 145,0 0,-1 -145,0 z"
        id="path8337"
        inkscape:connector-curvature="0"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2227,7 +2665,8 @@
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
-       id="g8339">
+       id="g8339"
+       transform="translate(0,-20)">
       <rect
          y="250.5"
          x="130.5"
@@ -4501,14 +4940,14 @@
      inkscape:label="top">
     <path
        style="color:#000000;fill:#7092ff;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 1058,66 -34,-34 34,0 z"
+       d="m 1058,-44 -34,-34 34,0 z"
        id="path9722"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
     <path
        inkscape:connector-curvature="0"
        id="path9585-7"
-       d="m 1046.7812,36 -1,2 -1.3125,0.75 -1.9062,-0.125 -1,1.75 1.2187,1.84375 0,1.5625 -1.2187,1.84375 1,1.75 1.9062,-0.125 1.3125,0.75 1,2 2,0 1,-2 1.3125,-0.75 1.9063,0.125 1,-1.75 -1.2188,-1.84375 0,-1.5625 1.2188,-1.84375 -1,-1.75 -1.9063,0.125 -1.3125,-0.75 -1,-2 -2,0 z m 0,5 2,0 1,1 0,2 -1,1 -2,0 -1,-1 0,-2 1,-1 z"
+       d="m 1046.7812,-74 -1,2 -1.3125,0.75 -1.9062,-0.125 -1,1.75 1.2187,1.84375 0,1.5625 -1.2187,1.84375 1,1.75 1.9062,-0.125 1.3125,0.75 1,2 2,0 1,-2 1.3125,-0.75 1.9063,0.125 1,-1.75 -1.2188,-1.84375 0,-1.5625 1.2188,-1.84375 -1,-1.75 -1.9063,0.125 -1.3125,-0.75 -1,-2 -2,0 z m 0,5 2,0 1,1 0,2 -1,1 -2,0 -1,-1 0,-2 1,-1 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>
 </svg>
diff --git a/img/source/sprite.png b/img/source/sprite.png
index efc5f6781..ff071a8d7 100644
Binary files a/img/source/sprite.png and b/img/source/sprite.png differ
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index c000ca96d..3a092d2d8 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -10,14 +10,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="220"
-   height="100"
+   height="160"
    id="svg12393"
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="sprite.svg"
-   inkscape:export-filename="/Users/saman/work_repos/iD/img/source/sprite@2x.png"
-   inkscape:export-xdpi="180"
-   inkscape:export-ydpi="180">
+   inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
      id="defs12395" />
   <sodipodi:namedview
@@ -27,16 +27,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="105.32047"
-     inkscape:cy="43.887671"
+     inkscape:zoom="1"
+     inkscape:cx="90.845809"
+     inkscape:cy="47.967567"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
-     showgrid="true"
-     inkscape:window-width="1187"
-     inkscape:window-height="607"
+     showgrid="false"
+     inkscape:window-width="1612"
+     inkscape:window-height="795"
      inkscape:window-x="76"
-     inkscape:window-y="22"
+     inkscape:window-y="123"
      inkscape:window-maximized="0"
      fit-margin-top="0"
      fit-margin-left="0"
@@ -53,71 +53,71 @@
        snapvisiblegridlinesonly="true" />
     <sodipodi:guide
        orientation="1,0"
-       position="0,100"
+       position="0,160"
        id="guide12508" />
     <sodipodi:guide
        orientation="1,0"
-       position="20,100"
+       position="20,160"
        id="guide12512" />
     <sodipodi:guide
        orientation="1,0"
-       position="40,100"
+       position="40,160"
        id="guide12514" />
     <sodipodi:guide
        orientation="1,0"
-       position="60,100"
+       position="60,160"
        id="guide12516" />
     <sodipodi:guide
        orientation="1,0"
-       position="80,100"
+       position="80,160"
        id="guide12518" />
     <sodipodi:guide
        orientation="0,1"
-       position="0,80"
+       position="0,140"
        id="guide12520" />
     <sodipodi:guide
        orientation="1,0"
-       position="100,100"
+       position="100,160"
        id="guide12522" />
     <sodipodi:guide
        orientation="1,0"
-       position="120,100"
+       position="120,160"
        id="guide12590" />
     <sodipodi:guide
        orientation="1,0"
-       position="140,100"
+       position="140,160"
        id="guide12592" />
     <sodipodi:guide
        orientation="1,0"
-       position="160,100"
+       position="160,160"
        id="guide12647" />
     <sodipodi:guide
        orientation="1,0"
-       position="180,100"
+       position="180,160"
        id="guide12649" />
     <sodipodi:guide
        orientation="1,0"
-       position="200,100"
+       position="200,160"
        id="guide12672" />
     <sodipodi:guide
        orientation="1,0"
-       position="220,100"
+       position="220,160"
        id="guide14109" />
     <sodipodi:guide
        orientation="0,1"
-       position="195,60"
+       position="195,120"
        id="guide14199" />
     <sodipodi:guide
        orientation="0,1"
-       position="15,100"
+       position="15,160"
        id="guide14589" />
     <sodipodi:guide
        orientation="0,1"
-       position="145,40"
+       position="145,100"
        id="guide15519" />
     <sodipodi:guide
        orientation="0,1"
-       position="90,20"
+       position="90,80"
        id="guide15521" />
   </sodipodi:namedview>
   <metadata
@@ -136,12 +136,97 @@
      inkscape:label="background"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-25,-62.362183)" />
+     transform="translate(-25,-62.362183)"
+     style="display:none">
+    <rect
+       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect16629"
+       width="250"
+       height="165"
+       x="-15"
+       y="-10"
+       transform="translate(25,62.362183)"
+       rx="3.9999998"
+       ry="4" />
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="sprite"
-     transform="translate(-25,3.8281252e-7)">
+     transform="translate(-25,1.1484375e-6)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="path16650"
+       d="M 169.00002,10.999999 175,3.9999989 l 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="path16627"
+       d="m 169.00002,50.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 190.00001,45.000007 -1,1 -1e-5,0.999995 4.00001,4.000004 -4,4 -1e-5,0.999995 1,1.000005 1,-5e-6 4,-4 4,4.000004 1.00001,2e-6 1,-0.999999 -1e-5,-1.000003 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -0.99999,5e-6 -4,4 L 191,45.000002 l -0.99999,5e-6 z"
+       id="path16506" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 190,4.9999992 -1,1 0,1 4,3.9999998 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-3.9999998 0,-1 -1,-1 -1,0 -4,4 -4,-4 -1,0 z"
+       id="path16468"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path16264"
+       d="m 90,45 -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="color:#000000;fill:#ffffff;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="path16266"
+       d="m 79,44.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,46.480522 79,46.251524 79,46.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,54.519484 72,54.748487 72,55.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="color:#000000;fill:#ffffff;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
+       sodipodi:nodetypes="cccccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path16268"
+       d="m 34,45 0,4 -1,-1 0,-3 -1,0 -1,1 0,6 -2,-2 -1,0 0,1 0,1 2,4 2,2 8,0 2,-2 0,-10 -1,-1 -1,0 0,3 -1,1 0,-4 -1,-1 -1,1 0,3 -1,1 0,-4 -1,-1 z"
+       style="color:#000000;fill:#ffffff;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" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path16270"
+       d="m 54.84375,45 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 55,48 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="color:#000000;fill:#ffffff;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" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 134.5,45 129.5625,53.5625 126,50 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+       transform="translate(25,-3.8281252e-7)"
+       id="path16274"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path16278"
+       d="m 113,43.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -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"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 136,43.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 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"
+       id="path16280"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        style="opacity:0.25;color:#000000;fill:#000000;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"
@@ -163,23 +248,12 @@
        d="m 54.84375,23 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 55,26 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"
        id="path14231"
        inkscape:connector-curvature="0" />
-    <g
-       id="g14233"
-       transform="translate(-321,-82.36218)"
-       style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline">
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path14235"
-         d="m 471,110.36218 -1,1 0,1 5,5 1,0 1,-1 0,-1 -5,-5 z"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 482,105.36218 1,1 0,1 -6,10 0,0 -1,0 -1.19067,-0.7071 -0.25882,-0.96593 5.94949,-10.32697 z"
-         id="path14237" />
-    </g>
+    <path
+       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 134.5,23 129.5625,31.5625 126,28 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+       transform="translate(25,-3.8281252e-7)"
+       id="path14235"
+       inkscape:connector-curvature="0" />
     <path
        style="opacity:0.25;color:#000000;fill:#000000;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,21.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -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"
@@ -199,7 +273,7 @@
        d="m 136,21.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 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"
        style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <g
-       transform="translate(-896,152.63782)"
+       transform="translate(-896,212.63782)"
        id="g14243"
        style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline">
       <path
@@ -211,7 +285,7 @@
     </g>
     <g
        id="g14247"
-       transform="translate(-875,152.63782)"
+       transform="translate(-855,212.63782)"
        style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline">
       <path
          style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -225,7 +299,7 @@
     </g>
     <g
        style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"
-       transform="translate(-470,166.63782)"
+       transform="translate(-430,226.63782)"
        id="g14251">
       <path
          inkscape:connector-curvature="0"
@@ -240,7 +314,7 @@
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"
-       transform="translate(65,-213.36218)">
+       transform="translate(125,-153.36218)">
       <g
          style="fill:#000000;fill-opacity:1"
          id="g14257">
@@ -263,7 +337,7 @@
     <g
        style="fill:#ffffff;fill-opacity:1;display:inline"
        id="g14113"
-       transform="translate(-896,134.63782)">
+       transform="translate(-896,174.63782)">
       <path
          id="path14115"
          transform="translate(756,-73.637817)"
@@ -273,7 +347,7 @@
     </g>
     <g
        style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-875,134.63782)"
+       transform="translate(-855,174.63782)"
        id="g14117">
       <path
          inkscape:export-ydpi="90"
@@ -287,7 +361,7 @@
     </g>
     <g
        id="g14121"
-       transform="translate(-470,148.63782)"
+       transform="translate(-430,188.63782)"
        style="fill:#ffffff;display:inline">
       <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;enable-background:accumulate"
@@ -297,7 +371,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       transform="translate(65,-231.36218)"
+       transform="translate(125,-191.36218)"
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -364,39 +438,22 @@
        d="m 54.84375,4 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 55,7 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"
        id="path8139"
        inkscape:connector-curvature="0" />
-    <g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-321,-100.36218)"
-       id="g12558">
-      <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;enable-background:accumulate"
-         d="m 471,110.36218 -1,1 0,1 5,5 1,0 1,-1 0,-1 -5,-5 z"
-         id="path12560"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         id="path12562"
-         d="m 482,105.36218 1,1 0,1 -6,10 0,0 -1,0 -1.19067,-0.7071 -0.25882,-0.96593 5.94949,-10.32697 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;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-    </g>
+    <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;enable-background:accumulate"
+       d="M 134.5,5 129.5625,13.5625 126,10 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+       transform="translate(25,-3.8281252e-7)"
+       id="path12560"
+       inkscape:connector-curvature="0" />
     <g
        id="g5460"
        transform="translate(-321,-101.36218)"
        style="fill:#6bc641;fill-opacity:1;display:inline">
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4961-2"
-         d="m 471,110.36218 -1,1 0,1 5,5 1,0 1,-1 0,-1 -5,-5 z"
-         style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
          style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 482,105.36218 1,1 0,1 -6,10 0,0 -1,0 -1.19067,-0.7071 -0.25882,-0.96593 5.94949,-10.32697 z"
-         id="path4966-4" />
+         d="M 134.5,4 129.5625,12.5625 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+         transform="translate(346,101.36218)"
+         id="path4961-2"
+         inkscape:connector-curvature="0" />
     </g>
     <g
        id="g12598">
@@ -438,7 +495,7 @@
        d="m 136,2.01282 5,4.5 -5,4.5 0,-3 -3,0 L 132,9 l 0,3.01282 1,0.98718 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"
        style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <g
-       transform="translate(-896,133.63782)"
+       transform="translate(-896,173.63782)"
        id="g9588-4"
        style="fill:#222222;fill-opacity:1;display:inline">
       <path
@@ -450,7 +507,7 @@
     </g>
     <g
        id="g9629"
-       transform="translate(-875,133.63782)"
+       transform="translate(-855,173.63782)"
        style="fill:#222222;fill-opacity:1;display:inline">
       <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"
@@ -464,7 +521,7 @@
     </g>
     <g
        style="display:inline"
-       transform="translate(-470,147.63782)"
+       transform="translate(-431,186.63782)"
        id="g9514-6">
       <path
          inkscape:connector-curvature="0"
@@ -479,7 +536,7 @@
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"
-       transform="translate(65,-232.36218)">
+       transform="translate(125,-192.36218)">
       <g
          id="g5544-9">
         <path
@@ -517,23 +574,12 @@
        id="path14165"
        d="m 54.84375,24 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 55,27 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="color:#000000;fill:#ffffff;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" />
-    <g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-321,-81.36218)"
-       id="g14167">
-      <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;enable-background:accumulate"
-         d="m 471,110.36218 -1,1 0,1 5,5 1,0 1,-1 0,-1 -5,-5 z"
-         id="path14169"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         id="path14171"
-         d="m 482,105.36218 1,1 0,1 -6,10 0,0 -1,0 -1.19067,-0.7071 -0.25882,-0.96593 5.94949,-10.32697 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;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-    </g>
+    <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;enable-background:accumulate"
+       d="M 134.5,24 129.5625,32.5625 126,29 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+       transform="translate(25,-3.8281252e-7)"
+       id="path14169"
+       inkscape:connector-curvature="0" />
     <path
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
@@ -555,7 +601,7 @@
     <g
        style="fill:#ffffff;fill-opacity:1;display:inline"
        id="g14177"
-       transform="translate(-896,153.63782)">
+       transform="translate(-896,213.63782)">
       <path
          id="path14179"
          transform="translate(756,-73.637817)"
@@ -565,7 +611,7 @@
     </g>
     <g
        style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-875,153.63782)"
+       transform="translate(-855,213.63782)"
        id="g14181">
       <path
          inkscape:export-ydpi="90"
@@ -579,7 +625,7 @@
     </g>
     <g
        id="g14185"
-       transform="translate(-470,167.63782)"
+       transform="translate(-430,227.63782)"
        style="fill:#ffffff;fill-opacity:1;display:inline">
       <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;enable-background:accumulate"
@@ -589,7 +635,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       transform="translate(65,-212.36218)"
+       transform="translate(125,-152.36218)"
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
        inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -614,5 +660,176 @@
          id="g14197"
          style="fill:#ffffff;fill-opacity:1" />
     </g>
+    <g
+       style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"
+       transform="translate(-321,-62.36218)"
+       id="g16215" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#cccccc;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"
+       d="m 90,44 -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="path16225" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#cccccc;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"
+       d="m 79,43.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,45.480522 79,45.251524 79,45.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,53.519484 72,53.748487 72,54.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="path16227" />
+    <path
+       style="color:#000000;fill:#cccccc;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"
+       d="m 34,44 0,4 -1,-1 0,-3 -1,0 -1,1 0,6 -2,-2 -1,0 0,1 0,1 2,4 2,2 8,0 2,-2 0,-10 -1,-1 -1,0 0,3 -1,1 0,-4 -1,-1 -1,1 0,3 -1,1 0,-4 -1,-1 z"
+       id="path16229"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
+    <path
+       style="color:#000000;fill:#cccccc;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"
+       d="m 54.84375,44 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 55,47 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"
+       id="path16231"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 134.5,44 129.5625,52.5625 126,49 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+       transform="translate(25,-3.8281252e-7)"
+       id="path16235"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#cccccc;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,42.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -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"
+       id="path16239"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path16241"
+       d="m 136,42.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 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"
+       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path9584-1-9"
+       d="m 190,3.9999992 -1,1 0,1 4,4 -4,3.9999998 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-3.9999998 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 -1,0 z"
+       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" />
+    <path
+       id="path16416"
+       d="m 190,23.000004 -1,0.999999 0,0.999995 4,4.000005 -4,3.999999 0,0.999996 1,1.000004 1,-5e-6 4,-3.999999 4,4.000004 1,2e-6 1,-1 0,-1.000002 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -1,5e-6 -4,4 -4,-4.000004 -1,5e-6 z"
+       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 190,24.000004 -1,0.999999 0,0.999995 4,4.000005 -4,3.999999 0,0.999996 1,1.000004 1,-5e-6 4,-3.999999 4,4.000004 1,2e-6 1,-1 0,-1.000002 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -1,5e-6 -4,4 -4,-4.000004 -1,5e-6 z"
+       id="path16409" />
+    <path
+       id="path16411"
+       d="m 190.00001,44.000007 -1,1 -1e-5,0.999995 4.00001,4.000004 -4,4 -1e-5,0.999995 1,1.000005 1,-5e-6 4,-4 4,4.000004 1.00001,2e-6 1,-0.999999 -1e-5,-1.000003 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -0.99999,5e-6 -4,4 L 191,44.000002 l -0.99999,5e-6 z"
+       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,877.1436,-601.56033)"
+       id="g16306-5"
+       style="display:inline" />
+    <path
+       style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 169.00002,9.9999989 5.99998,-7 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.0000201 z"
+       id="path9203-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 169.00002,28.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+       id="path16631"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="path16623"
+       d="m 169.00002,29.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 169.00002,49.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+       id="path16625"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+       id="path16738"
+       d="m 210,3.9999988 -1,1.0000001 0,1 1,1 9,0 1,-1 0,-1 -1,-1.0000001 z m 0,4.0000001 0,9.0000001 1,1 7,0 1,-1 0,-9.0000001 z m 2,2 1,0 0,6.0000001 -1,0 0,-1 z m 2,0 1,0 0,5.0000001 0,1 -1,0 z m 2,0 1,0 0,5.0000001 0,1 -1,0 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;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ff7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 210,2.9999989 -1,0.9999999 0,1.0000001 1,1 9,0 1,-1 0,-1.0000001 -1,-0.9999999 z m 0,4 0,9.0000001 1,1 7,0 1,-1 0,-9.0000001 z m 2,2 1,0 0,6.0000001 -1,0 0,-1 z m 2,0 1,0 0,5.0000001 0,1 -1,0 z m 2,0 1,0 0,5.0000001 0,1 -1,0 z"
+       id="path16662"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 210,21.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
+       id="path16763"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+       id="path16765"
+       d="m 210,22.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 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;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+       id="path16767"
+       d="m 210,43.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 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;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 210,42.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
+       id="path16769"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
+    <g
+       transform="translate(-776,34.637816)"
+       id="g9588-4-2"
+       style="fill:#6bc641;fill-opacity:1;display:inline">
+      <path
+         style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 174,2 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z"
+         transform="translate(756,-73.637817)"
+         id="path9584-2-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccccccc" />
+    </g>
+    <rect
+       style="opacity:0.2;color:#000000;fill:#7092ff;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" />
+    <rect
+       y="27"
+       x="92"
+       height="5.999999"
+       width="6"
+       id="rect17381"
+       style="opacity:0.2;color:#000000;fill:#7092ff;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" />
   </g>
 </svg>
diff --git a/img/sprite.png b/img/sprite.png
index e0cfac510..53d2e0e3b 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/js/id/id.js b/js/id/id.js
index a0534863a..d75692706 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -31,12 +31,18 @@ window.iD = function(container) {
         var buttons = buttons_joined.selectAll('button.add-button')
             .data([iD.modes.Browse(), iD.modes.AddPlace(), iD.modes.AddRoad(), iD.modes.AddArea()])
             .enter().append('button')
-                .attr('class', 'add-button')
-            .text(function (mode) { return mode.title; })
+                .attr('class', function (mode) { return mode.title + ' add-button'; })
             .attr('data-original-title', function (mode) { return mode.description; })
             .call(bootstrap.tooltip().placement('bottom'))
             .on('click', function (mode) { controller.enter(mode); });
 
+        buttons.append('span')
+            .attr('class', function(d) {
+                return d.id + ' icon icon-pre-text';
+            });
+
+        buttons.append('span').attr('class', 'label').text(function (mode) { return mode.title; });
+
         controller.on('enter', function (entered) {
             buttons.classed('active', function (mode) { return entered.button === mode.button; });
         });
@@ -47,7 +53,7 @@ window.iD = function(container) {
         undo_buttons.append('button')
             .attr({ id: 'undo', 'class': 'narrow' })
             .property('disabled', true)
-            .html('&larr;<small></small>')
+            .html("<span class='undo icon'></span><small></small>")
             .on('click', history.undo)
             .call(bootstrap.tooltip()
                 .placement('bottom'));
@@ -55,7 +61,7 @@ window.iD = function(container) {
         undo_buttons.append('button')
             .attr({ id: 'redo', 'class': 'narrow' })
             .property('disabled', true)
-            .html('&rarr;<small></small>')
+            .html("<span class='redo icon'><small></small>")
             .on('click', history.redo)
             .call(bootstrap.tooltip()
                 .placement('bottom'));
@@ -67,7 +73,7 @@ window.iD = function(container) {
 
         bar.append('button')
             .attr('class', 'save wide')
-            .html("Upload<small id='as-username'></small>")
+            .html("<span class='icon icon-pre-text save'></span><span class='label'>Save</span><small id='as-username'></small>")
             .attr('title', 'Save changes to OpenStreetMap, making them visible to other users')
             .call(bootstrap.tooltip()
                 .placement('bottom'))
@@ -107,16 +113,16 @@ window.iD = function(container) {
         bar.append('div')
             .attr('class', 'messages');
 
-        var zoom = bar.append('div')
-            .attr('class', 'zoombuttons')
+        var zoom = this.append('div')
+            .attr('class', 'zoombuttons map-control')
             .selectAll('button')
                 .data([['zoom-in', '+', map.zoomIn], ['zoom-out', '-', map.zoomOut]])
-                .enter().append('button').attr('class', function(d) { return d[0] + ' wide'; })
+                .enter().append('button').attr('class', function(d) { return d[0] + ' narrow'; })
                 .text(function(d) { return d[1]; })
                 .on('click', function(d) { return d[2](); });
 
-        var gc = bar.append('div').attr('class', 'geocode-control');
-        gc.append('button').text('?').attr('class','wide');
+        var gc = this.append('div').attr('class', 'geocode-control map-control');
+        gc.append('button').text('geocode').attr('class','narrow');
         gc
             .on('mouseover', function() {
                 d3.select('.geocode-control input').style('display', 'inline-block');
@@ -138,7 +144,7 @@ window.iD = function(container) {
                 });
             });
 
-        this.append('div').attr('class', 'layerswitcher-control')
+        this.append('div').attr('class', 'map-control layerswitcher-control')
             .call(iD.layerswitcher(map));
 
         this.append('div')
diff --git a/js/id/modes/add_area.js b/js/id/modes/add_area.js
index 06857ba32..cf5360112 100644
--- a/js/id/modes/add_area.js
+++ b/js/id/modes/add_area.js
@@ -2,7 +2,7 @@ iD.modes.AddArea = function() {
     var mode = {
         id: 'add-area',
         button: 'area',
-        title: '+ Area',
+        title: 'Area',
         description: 'Add parks, buildings, lakes, or other areas to the map.'
     };
 
diff --git a/js/id/modes/add_place.js b/js/id/modes/add_place.js
index 780023e76..576c5fc6f 100644
--- a/js/id/modes/add_place.js
+++ b/js/id/modes/add_place.js
@@ -1,7 +1,7 @@
 iD.modes.AddPlace = function() {
     var mode = {
         id: 'add-place',
-        title: '+ Place',
+        title: 'Place',
         description: 'Restaurants, monuments, and postal boxes are points.'
     };
 
diff --git a/js/id/modes/add_road.js b/js/id/modes/add_road.js
index efb3db113..e1d4b6c59 100644
--- a/js/id/modes/add_road.js
+++ b/js/id/modes/add_road.js
@@ -2,7 +2,7 @@ iD.modes.AddRoad = function() {
     var mode = {
         id: 'add-road',
         button: 'road',
-        title: '+ Road',
+        title: 'Road',
         description: 'Roads can be highways, streets, pedestrian paths, or even canals'
     };
 
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 4e678aefa..11fff6390 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -458,10 +458,14 @@ iD.Map = function() {
                 .style('display', 'none');
         } else {
             d3.select('div.inspector-wrap')
+                .html('')
                 .style('display', 'block')
                 .transition()
-                .style('opacity', 1)
-                .text(_);
+                .style('opacity', 1);
+            d3.select('div.inspector-wrap')
+                .append('div')
+                .attr('class','inspector-inner')
+                .text(_)
         }
     };
 
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 60a84819a..ab3e08433 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -42,16 +42,17 @@ iD.Inspector = function() {
     function inspector(selection) {
         selection.each(function(entity) {
             selection.html("").append('button')
-                .text('x').attr({ title: 'close', 'class': 'close' })
+                .attr('class', 'narrow close')
+                .html("<span class='icon close'></span>")
                 .on('click', function() {
                     event.close(entity);
                 });
 
             selection.append('div')
-                .attr('class', 'head').call(drawhead);
+                .attr('class', 'head inspector-inner').call(drawhead);
 
             var table = selection
-                .append('div').attr('class', 'tag-table-wrap')
+                .append('div').attr('class', 'inspector-inner tag-table-wrap')
                 .append('table').attr('class', 'inspector');
 
             table.append('thead').append('tr').selectAll('th')
@@ -128,16 +129,15 @@ iD.Inspector = function() {
 
             function drawbuttons(selection) {
                 selection.append('button')
-                    .attr('class', 'save').text('Save')
+                    .attr('class', 'save wide')
+                    .html("<span class='icon icon-pre-text apply'></span><span class='label'>Apply</span>")
                     .on('click', function(entity) {
                         event.changeTags(entity, clean(grabtags()));
                         event.close(entity);
                     });
                 selection.append('button')
-                    .attr('class', 'cancel').text('Cancel')
-                    .on('click', function(entity) { event.close(entity); });
-                selection.append('button')
-                    .attr('class', 'delete').text('Delete')
+                    .attr('class', 'delete wide')
+                    .html("<span class='icon icon-pre-text delete'></span><span class='label'>Delete</span>")
                     .on('click', function(entity) { event.remove(entity); });
             }
         });
diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index f91d80e36..942538987 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -15,7 +15,7 @@ iD.layerswitcher = function(map) {
     function layerswitcher(selection) {
         selection
             .append('button')
-            .attr('class', 'wide')
+            .attr('class', 'narrow')
             .text('L')
             .on('click', function() {
                 content.classed('hide', function() {