diff --git a/css/app.css b/css/app.css
index 81f5e211f..dea10c3c0 100644
--- a/css/app.css
+++ b/css/app.css
@@ -290,7 +290,6 @@ form.hide {
 .content {
     border-radius: 4px;
     box-shadow: 0 0 30px 0px rgba(0, 0, 0, 0.7);
-    overflow: hidden;
 }
 
 .pad1    {padding: 10px;}
@@ -500,6 +499,7 @@ button[disabled] .label {
 .icon.nearby     { background-position: -340px 0px;}
 .icon.geolocate  { background-position: -360px 0px;}
 .icon.warning    { background-position: -380px 0px;}
+.icon.back       { background-position: -420px 0px;}
 
 .icon.search  { background-position: -280px 0px;}
 
@@ -575,7 +575,6 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     max-width: 500px;
     position: relative;
     border-radius: 0 0 0 4px;
-    overflow: hidden;
 }
 
 .inspector-body {
@@ -589,14 +588,21 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     position: relative;
 }
 
-.inspector-inner.message {
+.inspector-wrap .message button.preset-reset {
+    height: 100%;
+    border-radius: 0;
+    border-right: 1px solid #CCC;
+    width: 12.5%;
+}
+
+.inspector-wrap .message {
     height: 60px;
-    padding: 10px;
     border-bottom: 1px solid #ccc;
 }
 
-.inspector-inner.message h3 {
-    line-height: 40px;
+.inspector-wrap .message h3 {
+    display: block;
+    line-height: 20px;
 }
 
 .inspector-toggle {
@@ -1065,6 +1071,7 @@ div.combobox {
 }
 
 .grid-entry .label {
+    font-weight: bold;
     text-align: center;
     display: block;
     position: absolute;
@@ -1825,7 +1832,7 @@ a.success-action {
 
 .tooltip.left .tooltip-arrow {
     top: 50%;
-    right: 5px;
+    right: -5px;
     margin-top: -5px;
     border-left-color: white;
     border-width: 5px 0 5px 5px;
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index 280b55590..fe9b9a27f 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="420"
+   width="440"
    height="200"
    id="svg12393"
    version="1.1"
@@ -39,8 +39,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="307.92385"
-     inkscape:cy="182.74459"
+     inkscape:cx="318.18348"
+     inkscape:cy="175.47623"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
      showgrid="false"
@@ -53,7 +53,7 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     showguides="false"
+     showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="true">
@@ -98,7 +98,7 @@
        id="guide12590" />
     <sodipodi:guide
        orientation="1,0"
-       position="140,200"
+       position="140,290"
        id="guide12592" />
     <sodipodi:guide
        orientation="1,0"
@@ -176,6 +176,10 @@
        orientation="1,0"
        position="420,191"
        id="guide10219" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="440,215"
+       id="guide26209" />
   </sodipodi:namedview>
   <metadata
      id="metadata12398">
@@ -185,7 +189,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -198,16 +202,16 @@
     <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="22.888145"
-       y="65.70871" />
+       width="440"
+       height="200"
+       x="25"
+       y="62.362183" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="sprite"
-     transform="translate(-25,3.0625001e-6)"
+     transform="translate(-25,3.4453126e-6)"
      style="display:inline">
     <g
        transform="translate(105.03464,-25.104239)"
@@ -380,10 +384,10 @@
        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
        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 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"
+       d="m 169.00002,8.9999989 5.99998,-6 6.00002,6.0000201 L 180,9.9999969 l -2.99998,1.21e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.0000201 -3.00001,-2e-6 z"
        id="path9203-8"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
+       sodipodi:nodetypes="cccccccccccc"
        inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -744,10 +748,10 @@
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.5;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 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"
+       d="m 169.00002,48.999999 5.99998,-6 6.00002,6.00002 -1.00002,0.999978 -2.99998,1.2e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 -3.00001,-2e-6 z"
        id="path16625"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
+       sodipodi:nodetypes="cccccccccccc"
        inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -931,10 +935,10 @@
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
        inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       sodipodi:nodetypes="cccccccccc"
+       sodipodi:nodetypes="cccccccccccc"
        inkscape:connector-curvature="0"
        id="path33331"
-       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"
+       d="m 169.00002,28.999999 5.99998,-6 6.00002,6.00002 -1.00002,0.999978 -2.99998,1.2e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 -3.00001,-2e-6 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" />
     <g
        id="g33337"
@@ -1091,7 +1095,7 @@
          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="opacity:1;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="m 42,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
@@ -1103,14 +1107,16 @@
        transform="translate(-110,-762.36218)"
        id="g9967">
       <path
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;opacity:1"
-         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 128 155 L 127 156 L 130 159 L 133 156 L 132 155 L 128 155 z "
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+         d="m 130,141 -3,3 1,1 4,0 1,-1 -3,-3 z m -6,6 -3,3 3,3 1,-1 0,-4 -1,-1 z m 12,0 -1,1 0,4 1,1 3,-3 -3,-3 z m -8,8 -1,1 3,3 3,-3 -1,-1 -4,0 z"
          transform="translate(135,762.36218)"
-         id="path6677" />
+         id="path6677"
+         inkscape:connector-curvature="0" />
       <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 265,910.36218 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-         id="path6671" />
+         id="path6671"
+         inkscape:connector-curvature="0" />
     </g>
     <g
        transform="translate(-35,-762.36218)"
@@ -1119,7 +1125,7 @@
          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;opacity:1;color:#000000;fill:#7092ff;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" />
+         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:#7092ff;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" />
       <g
          id="g9894"
          transform="translate(40,180)">
@@ -1138,7 +1144,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="opacity:1;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:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <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"
@@ -1176,7 +1182,7 @@
        id="g9864-9">
       <path
          inkscape:connector-curvature="0"
-         style="opacity:1;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter8013-4)"
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
          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" />
@@ -1246,10 +1252,11 @@
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="opacity:1;color:#000000;fill:#7092ff;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 190 140 L 189 141 L 189 142.0625 C 185.05556 142.55631 182 145.92172 182 150 C 182 154.41827 185.58173 158 190 158 C 194.41827 158 198 154.41827 198 150 C 198 147.53269 196.88148 145.34144 195.125 143.875 L 193.71875 145.28125 C 195.11409 146.37996 196 148.08592 196 150 C 196 153.3137 193.3137 156 190 156 C 186.6863 156 184 153.3137 184 150 C 184 147.02439 186.15859 144.56673 189 144.09375 L 189 145 L 190 146 L 193 143 L 190 140 z "
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 190,140 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,146.37996 196,148.08592 196,150 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z"
        transform="translate(25,-3.0625001e-6)"
-       id="path6502" />
+       id="path6502"
+       inkscape:connector-curvature="0" />
     <path
        id="path6507"
        d="m 215,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
@@ -1274,7 +1281,13 @@
          id="path6677-3"
          transform="translate(25,-3.0625001e-6)"
          d="m 209,147.25 0,3.75 -1.0625,0 -1,1 3,3 3,-3 -1,-1 -0.9375,0 0,-1.25 c -0.38916,-0.19064 -0.73079,-0.46444 -0.96875,-0.75 -0.42444,-0.50933 -0.6875,-1.0625 -0.9375,-1.5625 -0.0334,-0.0669 -0.0608,-0.12289 -0.0937,-0.1875 z"
-         style="opacity:1;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
     </g>
+    <path
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 450,9.999997 8,7 1,-1 0,-12.0000001 -1,-1 z"
+       id="path25361-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
   </g>
 </svg>
diff --git a/img/sprite.png b/img/sprite.png
index 85205ccd0..300c5dfe6 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index 3e7f5482b..48db95117 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -32,10 +32,21 @@ iD.ui.TagEditor = function(context) {
         selection.html('');
 
         var messagewrap = selection.append('div')
-            .attr('class', 'message inspector-inner fillL');
+            .attr('class', 'message fillL');
 
-        var message = messagewrap.append('h3')
-            .text(t('inspector.choose'));
+        messagewrap.append('button')
+            .attr('class', 'tooltip-bottom preset-reset fl')
+            .call(bootstrap.tooltip()
+                .title(t('inspector.back_tooltip'))
+                .placement('left'))
+            .on('click', function() {
+                event.choose();
+            })
+            .append('span').attr('class','icon back');
+
+        messagewrap.append('h3')
+            .attr('class', 'inspector-inner fl')
+            .text(t('inspector.editing'));
 
         var editorwrap = selection.append('div')
             .attr('class', 'tag-wrap inspector-body fillL2 inspector-body-' + entity.geometry(context.graph()));
@@ -45,11 +56,8 @@ iD.ui.TagEditor = function(context) {
         var typewrap = headerwrap.append('div')
             .attr('class','col3 type');
 
-        var typebutton = typewrap.append('button')
-            .attr('class','col12 grid-entry')
-            .on('click', function() {
-                event.choose();
-            });
+        var typebutton = typewrap.append('div')
+            .attr('class','col12 grid-entry fillL');
 
         typebutton.append('div')
             .attr('class', 'icon icon-pre-text' + (preset ?  ' preset-' + preset.icon : ''));
@@ -91,8 +99,6 @@ iD.ui.TagEditor = function(context) {
                 .preset(preset));
         }
 
-        message.text(t('inspector.editing', { type: preset.name }));
-
         editorwrap.append('div')
             .attr('class','inspector-inner col12 fillL2').call(tagList, preset.name === 'other');
 
diff --git a/locale/en.js b/locale/en.js
index 3143a13db..a41fecf3a 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -186,7 +186,8 @@ locale.en = {
         additional: "Additional tags",
         choose: "Select feature type",
         results: "{n} results for {search}",
-        reference: "View on OpenStreetMap Wiki →"
+        reference: "View on OpenStreetMap Wiki →",
+        back_tooltip: "Change feature type"
     },
 
     background: {