diff --git a/css/app.css b/css/app.css
index 7af38d1d3..b490ed04c 100644
--- a/css/app.css
+++ b/css/app.css
@@ -500,6 +500,7 @@ button[disabled] .icon.nearby     { background-position: -340px -40px;}
 
 
 /* Toggle icon is special */
+
 .toggle.icon                   { background-position: 0px -180px;}
 a:hover .toggle.icon           { background-position: -20px -180px;}
 .selected .toggle.icon,
@@ -566,6 +567,95 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 
 .preset-input { padding-left: 10px;}
 
+.preset-search-input {
+    width:100%;
+}
+
+.preset-search-input input {
+    width: 100%;
+    padding: 5px;
+}
+
+.preset-search-result {
+    padding: 0px 10px;
+    height:30px;
+    margin: 5px;
+}
+
+.preset-label {
+    padding: 5px;
+}
+
+.preset-fav button.fav {
+    height: 30px;
+    margin: 5px;
+    padding: 0 10px;
+}
+
+.preset-input input {
+    width: 100%;
+}
+
+div.combobox {
+    width:155px;
+    z-index: 9999;
+    display: none;
+    box-shadow: 0 5px 10px 0 rgba(0,0,0,.2);
+    margin-top: -1px;
+    background: white;
+    max-height: 180px;
+    overflow: auto;
+    border: 1px solid #ccc;
+}
+
+.combobox a {
+    height: 25px;
+    line-height: 25px;
+    cursor: pointer;
+    display: block;
+    border-top:1px solid #ccc;
+    background-color: #fff;
+    padding:1px 4px;
+    white-space: nowrap;
+    height: 30px;
+}
+
+.combobox a:hover,
+.combobox a.selected  {
+    background: #e1e8ff;
+    color: #154dff;
+}
+
+.combobox a:first-child {
+    border-top: 0;
+}
+
+.combobox-carat {
+    margin-left: -15px;
+    margin-right: 5px;
+    display:inline-block;
+    cursor:url(../img/cursor-pointer.png) 6 1, auto;
+    border-top: 5px solid #ccc;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+}
+
+/* Address input */
+
+.preset-input .addr-housename {
+    border-bottom: none;
+    width:100%;
+}
+
+.preset-input .addr-number {
+    width: 20%;
+    border-right: none;
+}
+
+.preset-input .addr-streetname {
+    width: 80%;
+}
+
 /* tag editor */
 
 .tag-list {
@@ -1021,7 +1111,9 @@ img.tile {
     border-radius: 0;
 }
 
-#about { text-align: right;}
+#about { 
+    text-align: right;
+}
 
 .source-switch a {
     padding: 2px 5px;
@@ -1098,7 +1190,9 @@ div.typeahead a:first-child {
     z-index: 3;
 }
 
-.modal .loader { margin-bottom: 10px;}
+.modal .loader { 
+    margin-bottom: 10px;
+}
 
 .modal .content {
     margin-bottom: 40px;
@@ -1118,6 +1212,7 @@ div.typeahead a:first-child {
     -moz-transition: opacity 100ms;
     transition: opacity 100ms;
 }
+
 .modal button.close-modal:hover {
     background-color: transparent;
     opacity: 1;
@@ -1360,17 +1455,36 @@ a.success-action {
 }
 
 .tooltip-inner {
-    color: #333;
     display: inline-block;
     padding: 5px 10px;
     font-size: 11px;
     font-weight: bold;
-    line-height: 20px;
     background-color: white;
     -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
             border-radius: 4px;
+}
 
+.tail {
+    width: 200px;
+    pointer-events: none;
+    opacity: .8;
+    margin-top: -15px;
+    position: absolute;
+}
+
+.tail::after {
+    content: "";
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+    top: 50%;
+    right: -5px;
+    margin-top: -5px;
+    border-left-color: white;
+    border-width: 5px 0 5px 5px;
 }
 
 .tooltip-arrow {
@@ -1438,7 +1552,7 @@ a.success-action {
     clear: both;
 }
 
-.tooltip .keyhint .keyhint-label{
+.tooltip .keyhint .keyhint-label {
     display: inline-block;
 }
 
@@ -1455,34 +1569,27 @@ a.success-action {
     border-top: 0;
 }
 
-.tail {
-    pointer-events:none;
-    position: absolute;
-    background: rgba(255, 255, 255, 0.7);
-    max-width: 250px;
-    margin-top: -15px;
-    padding: 5px;
-    -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+.radial-menu-tooltip {
+/* for some reason this breaks layout
+    opacity: .8; */
 }
 
 .radial-menu-background {
-    stroke: #aaa;
-    stroke-opacity: 0.4;
+    stroke: black;
+    stroke-opacity: 0.5;
 }
 
 .radial-menu-item {
-    fill: black;
+    fill: white;
     cursor:url(../img/cursor-pointer.png) 6 1, auto;
 }
 
 .radial-menu-item:hover {
-    fill: #bde5aa;
+    fill: #ececec;
 }
 
 .radial-menu-item:active {
-    fill: #6bc641;
+    fill: #ececec;
 }
 
 .radial-menu-item.disabled {
@@ -1495,14 +1602,6 @@ a.success-action {
     pointer-events: none;
 }
 
-.radial-menu-tooltip {
-    background: rgba(255, 255, 255, 0.8);
-    padding: 5px;
-    -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-            border-radius: 4px;
-}
-
 .lasso-box {
     fill-opacity:0.1;
     stroke: #fff;
@@ -1511,79 +1610,6 @@ a.success-action {
     stroke-dasharray: 5, 5;
 }
 
-.preset-search-input {
-    width:100%;
-}
-
-.preset-search-input input {
-    width: 100%;
-    padding: 5px;
-}
-
-.preset-search-result {
-    padding: 0px 10px;
-    height:30px;
-    margin: 5px;
-}
-
-.preset-label {
-    padding: 5px;
-}
-
-.preset-fav button.fav {
-    height: 30px;
-    margin: 5px;
-    padding: 0 10px;
-}
-
-.preset-input input {
-    width: 100%;
-}
-
-div.combobox {
-    width:155px;
-    z-index: 9999;
-    display: none;
-    box-shadow: 0 5px 10px 0 rgba(0,0,0,.2);
-    margin-top: -1px;
-    background: white;
-    max-height: 180px;
-    overflow: auto;
-    border: 1px solid #ccc;
-}
-
-.combobox a {
-    height: 25px;
-    line-height: 25px;
-    cursor: pointer;
-    display: block;
-    border-top:1px solid #ccc;
-    background-color: #fff;
-    padding:1px 4px;
-    white-space: nowrap;
-    height: 30px;
-}
-
-.combobox a:hover,
-.combobox a.selected  {
-    background: #e1e8ff;
-    color: #154dff;
-}
-
-.combobox a:first-child {
-    border-top: 0;
-}
-
-.combobox-carat {
-    margin-left: -15px;
-    margin-right: 5px;
-    display:inline-block;
-    cursor:url(../img/cursor-pointer.png) 6 1, auto;
-    border-top: 5px solid #ccc;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-}
-
 /* Media Queries
 ------------------------------------------------------- */
 
@@ -1596,19 +1622,3 @@ div.combobox {
 
 @media only screen and (max-height: 840px) {
 }
-
-/* Address input */
-
-.preset-input .addr-housename {
-    border-bottom: none;
-    width:100%;
-}
-
-.preset-input .addr-number {
-    width: 20%;
-    border-right: none;
-}
-
-.preset-input .addr-streetname {
-    width: 80%;
-}
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index a8c29982b..b9c2a7435 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -13,7 +13,7 @@
    height="200"
    id="svg12393"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.1 r9760"
    sodipodi:docname="sprite.svg"
    inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png"
    inkscape:export-xdpi="90"
@@ -39,8 +39,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="304.46947"
-     inkscape:cy="116.03146"
+     inkscape:cx="116.05141"
+     inkscape:cy="54.058916"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
      showgrid="false"
@@ -194,14 +194,14 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-25,-62.362183)"
-     style="display:none">
+     style="display:inline">
     <rect
        style="color:#000000;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect4478"
        width="420"
        height="201"
-       x="25"
-       y="61.362183" />
+       x="22.888145"
+       y="65.70871" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -1068,7 +1068,7 @@
        sodipodi:type="arc" />
     <path
        inkscape:connector-curvature="0"
-       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"
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 31,144 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z"
        id="path9820"
        sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
@@ -1081,7 +1081,7 @@
          id="path9826"
          transform="translate(0.9999996,1.4591601e-6)"
          d="m 114,727.375 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 l -7.03125,3.90625 L 118,729.375 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 L 126,737.375 c 2,0 2,-1 2,-1 z M 113,734.375 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
     <g
        transform="translate(-50,-762.36218)"
@@ -1090,75 +1090,21 @@
          inkscape:connector-curvature="0"
          id="rect9822"
          d="m 119.8125,911.375 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z m 8,0 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z"
-         style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5" />
       <path
-         transform="translate(67,173)"
-         sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path9830"
-         sodipodi:cx="50"
-         sodipodi:cy="739.36218"
-         sodipodi:rx="2"
-         sodipodi:ry="2"
-         d="m 52,739.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z" />
-      <path
-         d="m 52,739.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z"
-         sodipodi:ry="2"
-         sodipodi:rx="2"
-         sodipodi:cy="739.36218"
-         sodipodi:cx="50"
-         id="path9834"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="translate(75,173)" />
-      <path
-         transform="translate(83,173)"
-         sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path9838"
-         sodipodi:cx="50"
-         sodipodi:cy="739.36218"
-         sodipodi:rx="2"
-         sodipodi:ry="2"
-         d="m 52,739.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z" />
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M 42 148 C 40.895431 148 40 148.89543 40 150 C 40 151.10457 40.895431 152 42 152 C 43.104569 152 44 151.10457 44 150 C 44 148.89543 43.104569 148 42 148 z M 50 148 C 48.895431 148 48 148.89543 48 150 C 48 151.10457 48.895431 152 50 152 C 51.104569 152 52 151.10457 52 150 C 52 148.89543 51.104569 148 50 148 z M 58 148 C 56.895431 148 56 148.89543 56 150 C 56 151.10457 56.895431 152 58 152 C 59.104569 152 60 151.10457 60 150 C 60 148.89543 59.104569 148 58 148 z "
+         transform="translate(75,762.36218)"
+         id="path9830" />
     </g>
     <g
        transform="translate(-110,-762.36218)"
        id="g9967">
       <path
-         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"
-         d="m 268,906.36218 -3,-3 -3,3 1,1 4,0 z"
-         id="path9844"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path9846"
-         d="m 268,918.36218 -3,3 -3,-3 1,-1 4,0 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"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path9848"
-         d="m 271,915.36219 3,-3.00001 -3,-2.99999 -1,0.99999 0,4 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" />
-      <path
-         sodipodi:nodetypes="cccccc"
-         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"
-         d="m 259,915.36217 -3,-2.99999 3,-3.00001 1,1.00001 0,4 z"
-         id="path9850"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path9852"
-         sodipodi:cx="225"
-         sodipodi:cy="732.36218"
-         sodipodi:rx="1"
-         sodipodi:ry="1"
-         d="m 226,732.36218 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 0.55228,0 1,0.44772 1,1 z"
-         transform="matrix(2,0,0,2,-185,-552.36218)" />
+         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 130 141 L 127 144 L 128 145 L 132 145 L 133 144 L 130 141 z M 124 147 L 121 150 L 124 153 L 125 152 L 125 148 L 124 147 z M 136 147 L 135 148 L 135 152 L 136 153 L 139 150 L 136 147 z M 130 148 C 128.89543 148 128 148.89543 128 150 C 128 151.10457 128.89543 152 130 152 C 131.10457 152 132 151.10457 132 150 C 132 148.89543 131.10457 148 130 148 z M 128 155 L 127 156 L 130 159 L 133 156 L 132 155 L 128 155 z "
+         transform="translate(135,762.36218)"
+         id="path9844" />
     </g>
     <g
        transform="translate(-35,-762.36218)"
@@ -1167,59 +1113,15 @@
          inkscape:connector-curvature="0"
          id="path9840"
          d="m 87.03125,904.96875 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 C 87.146997,906.35926 87,905.88411 87,905.375 c 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 92.987796,905.10415 93,905.23472 93,905.375 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 89,918.53125 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 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:#6bc641;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+         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:#222222;fill-opacity:1;stroke:none;stroke-width:0.50000124999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:0.5" />
       <g
          id="g9894"
          transform="translate(40,180)">
         <path
-           d="m 52,725.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z"
-           sodipodi:ry="2"
-           sodipodi:rx="2"
-           sodipodi:cy="725.36218"
-           sodipodi:cx="50"
-           id="path9896"
-           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.30901699,-0.95105652,0.95105652,0.30901699,-662.31182,553.76523)"
-           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="path9898"
-           sodipodi:cx="50"
-           sodipodi:cy="725.36218"
-           sodipodi:rx="2"
-           sodipodi:ry="2"
-           d="m 52,725.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z" />
-        <path
-           d="m 52,725.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z"
-           sodipodi:ry="2"
-           sodipodi:rx="2"
-           sodipodi:cy="725.36218"
-           sodipodi:cx="50"
-           id="path9900"
-           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"
-           transform="matrix(-0.809017,-0.58778525,0.58778525,-0.809017,-339.90648,1354.5819)" />
-        <path
-           transform="matrix(-0.80901699,0.58778526,-0.58778526,-0.80901699,520.80791,1295.8034)"
-           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="path9902"
-           sodipodi:cx="50"
-           sodipodi:cy="725.36218"
-           sodipodi:rx="2"
-           sodipodi:ry="2"
-           d="m 52,725.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z" />
-        <path
-           d="m 52,725.36218 c 0,1.10457 -0.895431,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 1.104569,0 2,0.89543 2,2 z"
-           sodipodi:ry="2"
-           sodipodi:rx="2"
-           sodipodi:cy="725.36218"
-           sodipodi:cx="50"
-           id="path9904"
-           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"
-           transform="matrix(0.309017,0.95105651,-0.95105651,0.309017,731.41012,458.66065)" />
+           style="color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 30 141 C 28.895431 141 28 141.89543 28 143 C 28 144.10457 28.895431 145 30 145 C 31.104569 145 32 144.10457 32 143 C 32 141.89543 31.104569 141 30 141 z M 22.84375 146 C 22.06723 146.06693 21.349748 146.58712 21.09375 147.375 C 20.752419 148.42551 21.324492 149.56492 22.375 149.90625 C 23.425508 150.24758 24.564919 149.67551 24.90625 148.625 C 25.247581 147.57449 24.675508 146.43508 23.625 146.09375 C 23.362373 146.00842 23.10259 145.97769 22.84375 146 z M 36.78125 146 C 36.649194 146.01489 36.506314 146.05108 36.375 146.09375 C 35.324492 146.43508 34.752419 147.57449 35.09375 148.625 C 35.435081 149.67551 36.574492 150.24758 37.625 149.90625 C 38.675508 149.56492 39.247581 148.42551 38.90625 147.375 C 38.607586 146.45581 37.70564 145.89574 36.78125 146 z M 26.0625 154 C 25.420842 153.97807 24.780781 154.25399 24.375 154.8125 C 23.72575 155.70612 23.918884 156.97575 24.8125 157.625 C 25.706116 158.27425 26.97575 158.08112 27.625 157.1875 C 28.27425 156.29388 28.081116 155.02425 27.1875 154.375 C 26.852394 154.13153 26.447495 154.01316 26.0625 154 z M 33.9375 154 C 33.552505 154.01316 33.147606 154.13153 32.8125 154.375 C 31.918885 155.02425 31.72575 156.29388 32.375 157.1875 C 33.02425 158.08112 34.293885 158.27425 35.1875 157.625 C 36.081115 156.97575 36.27425 155.70612 35.625 154.8125 C 35.219219 154.25399 34.579158 153.97807 33.9375 154 z "
+           transform="translate(20,582.36218)"
+           id="path9896" />
       </g>
     </g>
     <g
@@ -1229,7 +1131,7 @@
          inkscape:connector-curvature="0"
          id="path9854"
          d="m 189,908.375 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z"
-         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" />
+         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;opacity:0.5" />
       <path
          transform="matrix(2.0000003,0,0,2.0000003,-255.00007,-552.36238)"
          d="m 226,732.36218 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 0.55228,0 1,0.44772 1,1 z"
@@ -1238,14 +1140,14 @@
          sodipodi:cy="732.36218"
          sodipodi:cx="225"
          id="path9908"
-         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"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          sodipodi:type="arc" />
     </g>
     <g
        transform="translate(-94,-762.36218)"
        id="g9974">
       <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"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="m 227,917.36218 -4,-5 4,-5 2,0 0,1 -3.5,4 3.5,4 0,1 z"
          id="path9842"
          inkscape:connector-curvature="0"
@@ -1255,14 +1157,14 @@
          inkscape:connector-curvature="0"
          id="path9910"
          d="m 233,917.36218 -4,-5 4,-5 2,0 0,1 -3.5,4 3.5,4 0,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;enable-background:accumulate" />
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
     <g
        id="g9683"
        transform="translate(-109.40337,-628.51757)"
        style="fill:#6bc641;fill-opacity:1">
       <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"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="m 283.40337,771.51757 -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"
          id="path5624-8"
          inkscape:connector-curvature="0"
@@ -1273,7 +1175,7 @@
        id="g9864-9">
       <path
          inkscape:connector-curvature="0"
-         style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
          d="m 331,910.1875 0,2.375 c 0.31647,-0.11352 0.64447,-0.1875 1,-0.1875 0.35553,0 0.68353,0.074 1,0.1875 l 0,-2.375 c -0.31647,0.11352 -0.64447,0.1875 -1,0.1875 -0.35553,0 -0.68353,-0.074 -1,-0.1875 z m 3.8125,4.1875 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z"
          transform="translate(-41,-179.00001)"
          id="rect9866-2" />
@@ -1284,13 +1186,13 @@
          sodipodi:cy="739.36218"
          sodipodi:cx="50"
          id="path9870-1"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          sodipodi:type="arc"
          transform="translate(249,-3)" />
       <path
          transform="translate(241,-3)"
          sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path9878-4"
          sodipodi:cx="50"
          sodipodi:cy="739.36218"
@@ -1300,7 +1202,7 @@
       <path
          transform="translate(241,-11)"
          sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path9880-9"
          sodipodi:cx="50"
          sodipodi:cy="739.36218"
diff --git a/img/sprite.png b/img/sprite.png
index 02aadf2a3..03fd8320c 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/js/id/ui/radial_menu.js b/js/id/ui/radial_menu.js
index e718cfe51..7e893b754 100644
--- a/js/id/ui/radial_menu.js
+++ b/js/id/ui/radial_menu.js
@@ -17,7 +17,7 @@ iD.ui.RadialMenu = function(operations) {
             .attr('opacity', 0);
 
         menu.transition()
-            .attr('opacity', 0.8);
+            .attr('opacity', 1);
 
         var r = 50,
             a = Math.PI / 4,
@@ -67,7 +67,7 @@ iD.ui.RadialMenu = function(operations) {
             .attr('height', 400);
 
         tooltip.append('xhtml:div')
-            .attr('class', 'radial-menu-tooltip');
+            .attr('class', 'radial-menu-tooltip tooltip-inner');
 
         function mouseover(d, i) {
             var angle = a0 + i * a,
@@ -75,8 +75,8 @@ iD.ui.RadialMenu = function(operations) {
                 dy = 0;
 
             tooltip
-                .attr('x', (r + 30) * Math.sin(angle) + dx)
-                .attr('y', (r + 30) * Math.cos(angle) + dy)
+                .attr('x', (r + 25) * Math.sin(angle) + dx)
+                .attr('y', (r + 25) * Math.cos(angle) + dy)
                 .style('display', 'block')
                 .select('div')
                 .text(d.description);
diff --git a/js/lib/d3.tail.js b/js/lib/d3.tail.js
index 4afaf97ff..b97f0d0f6 100644
--- a/js/lib/d3.tail.js
+++ b/js/lib/d3.tail.js
@@ -1,7 +1,7 @@
 d3.tail = function() {
     var text = false,
         container,
-        xmargin = 20,
+        xmargin = 25,
         tooltip_size = [0, 0],
         selection_size = [0, 0],
         transformProp = iD.util.prefixCSSProperty('Transform');
@@ -15,7 +15,7 @@ d3.tail = function() {
         function setup() {
 
             container = d3.select(document.body)
-                .append('div').attr('class', 'tail');
+                .append('div').attr('class', 'tail tooltip-inner');
 
             selection
                 .on('mousemove.tail', mousemove)