diff --git a/css/app.css b/css/app.css
index 1861987ab..a6b012170 100644
--- a/css/app.css
+++ b/css/app.css
@@ -278,7 +278,6 @@ ul.link-list li:last-child {
     color: #6C6C6C;
 }
 
-
 .fl { float: left;}
 .fr { float: right;}
 
@@ -550,8 +549,6 @@ button[disabled] .icon.nearby     { background-position: -340px -40px;}
 .icon-operation-rotate        { background-position: -180px -140px;}
 .icon-operation-simplify      { background-position: -200px -140px;}
 
-.icon.add-form       { background-position: -85px -180px;}
-
 /* Universal preset icons */
 
 .icon.source     { background-position:   0px -200px;}
@@ -560,6 +557,8 @@ button[disabled] .icon.nearby     { background-position: -340px -40px;}
 .icon.website    { background-position: -60px -200px;}
 .icon.elevation  { background-position: -80px -200px;}
 .icon.wikipedia  { background-position: -100px -200px;}
+.icon.note       { background-position: -120px -200px;}
+
 
 /* Toggle icon is special */
 
@@ -867,18 +866,13 @@ h4 + .preset-input input:first-child {
 
 /* adding additional preset fields */
 
-.icon.add-form {
-    width: 55px;
-}
-
 .more-buttons {
     border-top: 1px solid #ccc;
 }
 
 button.preset-add-field {
-    width: 40px;
+    width: 20%;
     height: 40px;
-    margin-right: 10px;
 }
 
 .preset-add-field .tooltip.top .tooltip-arrow {
diff --git a/data/core.yaml b/data/core.yaml
index 9d247d857..85ded3438 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -144,7 +144,6 @@ en:
     results: "{n} results for {search}"
     reference: View on OpenStreetMap Wiki →
     back_tooltip: Change feature type
-    show_additional: Show additional fields
   background: 
     title: Background
     description: Background settings
diff --git a/data/locales.js b/data/locales.js
index 4a66be224..3f72869d7 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -831,8 +831,7 @@ locale.zh = {
         "choose": "Select feature type",
         "results": "{n} results for {search}",
         "reference": "View on OpenStreetMap Wiki →",
-        "back_tooltip": "Change feature type",
-        "show_additional": "Show additional fields"
+        "back_tooltip": "Change feature type"
     },
     "background": {
         "title": "Background",
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 0cccb0063..7d19a2c54 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -150,6 +150,7 @@
     "note": {
         "key": "note",
         "type": "textarea",
+        "icon": "note",
         "universal": true
     },
     "office": {
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index ef81e4680..ced9f12c5 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -13,7 +13,7 @@
    height="220"
    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="182.3141"
-     inkscape:cy="92.109587"
+     inkscape:cx="133.66085"
+     inkscape:cy="2.5332289"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
      showgrid="false"
@@ -1394,11 +1394,11 @@
        sodipodi:cy="209"
        sodipodi:rx="8"
        sodipodi:ry="8"
-       d="m 18,209 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
+       d="m 18,209 c 0,4.41828 -3.581722,8 -8,8 -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 z"
        transform="translate(25,0.99999655)" />
     <path
        transform="matrix(0.75,0,0,0.75,27.5,53.249997)"
-       d="m 18,209 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
+       d="m 18,209 c 0,4.41828 -3.581722,8 -8,8 -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 z"
        sodipodi:ry="8"
        sodipodi:rx="8"
        sodipodi:cy="209"
@@ -1414,7 +1414,7 @@
        sodipodi:cy="207"
        sodipodi:rx="1"
        sodipodi:ry="1"
-       d="m 11,207 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       d="m 11,207 c 0,0.55228 -0.447715,1 -1,1 -0.5522847,0 -1,-0.44772 -1,-1 0,-0.55228 0.4477153,-1 1,-1 0.552285,0 1,0.44772 1,1 z"
        transform="matrix(2,0,0,2,15,-207)" />
     <path
        transform="translate(25,-3.4453126e-6)"
@@ -1423,5 +1423,42 @@
        id="rect6926"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc" />
+    <path
+       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 149,205 1,-1 10,0 1,1 0,9 -3,3 -8,0 -1,-0.99999 z"
+       id="rect4678"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="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"
+       id="rect4681"
+       width="8"
+       height="1"
+       x="151"
+       y="210" />
+    <rect
+       y="212"
+       x="151"
+       height="0.99999654"
+       width="8"
+       id="rect4683"
+       style="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" />
+    <rect
+       style="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"
+       id="rect4685"
+       width="5"
+       height="0.99999654"
+       x="151"
+       y="214" />
+    <path
+       sodipodi:type="arc"
+       style="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"
+       id="path4691"
+       sodipodi:cx="130"
+       sodipodi:cy="206"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 131,206 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="translate(25,0.99999655)" />
   </g>
 </svg>
diff --git a/img/sprite.png b/img/sprite.png
index ed8428ef6..4b57a8368 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index c46715bbc..b035535e6 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -38,17 +38,8 @@ iD.ui.preset = function(context) {
         var wrap = selection.append('div')
             .attr('class', 'col12 more-buttons inspector-inner');
 
-        var wraplabel = wrap.append('h4');
-
-        wraplabel.append('div')
-            .attr('class', 'icon add-form');
-
-        wraplabel.append('span')
-            .attr('class', 'deemphasize')
-            .text(t('inspector.show_additional'));
-
        formbuttonwrap = wrap.append('div')
-            .attr('class', 'col9 preset-input');
+            .attr('class', 'col12 preset-input');
 
         formbuttonwrap.selectAll('button')
             .data(context.presets().universal())