diff --git a/css/app.css b/css/app.css
index 280e720de..1ba83db97 100644
--- a/css/app.css
+++ b/css/app.css
@@ -555,10 +555,10 @@ button[disabled] .icon.nearby     { background-position: -340px -40px;}
 /* Universal preset icons */
 
 .icon.source     { background-position:   0px -200px;}
-.icon.elevation  { background-position: -20px -200px;}
-.icon.address    { background-position: -40px -200px;}
-.icon.telephone  { background-position: -60px -200px;}
-.icon.website    { background-position: -80px -200px;}
+.icon.address    { background-position: -20px -200px;}
+.icon.telephone  { background-position: -40px -200px;}
+.icon.website    { background-position: -60px -200px;}
+.icon.elevation  { background-position: -80px -200px;}
 .icon.wikipedia  { background-position: -100px -200px;}
 
 /* Toggle icon is special */
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ba944848a..9c7871938 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1 +1 @@
-{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"universal":true},"aeroway":{"key":"aeroway","type":"combo"},"amenity":{"key":"amenity","type":"combo"},"atm":{"key":"atm","type":"check"},"bicycle_parking":{"key":"bicycle_parking","type":"combo"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"collection_times":{"key":"collection_times","type":"text"},"construction":{"key":"construction","type":"combo"},"crossing":{"key":"crossing","type":"combo"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"denotation":{"key":"denotation","type":"combo"},"elevation":{"key":"ele","type":"number","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"highway":{"key":"highway","type":"combo"},"historic":{"key":"historic","type":"combo"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"landuse":{"key":"landuse","type":"combo"},"layer":{"key":"layer","type":"combo"},"leisure":{"key":"leisure","type":"combo"},"levels":{"key":"building:levels","type":"number"},"man_made":{"key":"man_made","type":"combo"},"maxspeed":{"key":"maxspeed","type":"combo"},"natural":{"key":"natural","type":"combo"},"network":{"key":"network","type":"text"},"note":{"key":"note","type":"textarea","universal":true},"office":{"key":"office","type":"combo"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"place":{"key":"place","type":"combo"},"railway":{"key":"railway","type":"combo"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"type":"radio","options":["bridge","tunnel","embankment","cutting"]},"service":{"key":"service","type":"combo","options":["parking_aisle","driveway","alley","drive-through","emergency_access"]},"shelter":{"key":"shelter","type":"check"},"shop":{"key":"shop","type":"combo"},"source":{"key":"source","type":"text","universal":true},"sport":{"key":"sport","type":"combo"},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","universal":true},"tourism":{"key":"tourism","type":"combo"},"water":{"key":"water","type":"combo"},"waterway":{"key":"waterway","type":"combo"},"website":{"key":"website","type":"url","universal":true},"wetland":{"key":"wetland","type":"combo"},"wikipedia":{"key":"wikipedia","type":"text","universal":true},"wood":{"key":"wood","type":"combo"}}
\ No newline at end of file
+{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"icon":"address","universal":true},"aeroway":{"key":"aeroway","type":"combo"},"amenity":{"key":"amenity","type":"combo"},"atm":{"key":"atm","type":"check"},"bicycle_parking":{"key":"bicycle_parking","type":"combo"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"collection_times":{"key":"collection_times","type":"text"},"construction":{"key":"construction","type":"combo"},"crossing":{"key":"crossing","type":"combo"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"denotation":{"key":"denotation","type":"combo"},"elevation":{"key":"ele","type":"number","icon":"elevation","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"highway":{"key":"highway","type":"combo"},"historic":{"key":"historic","type":"combo"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"landuse":{"key":"landuse","type":"combo"},"layer":{"key":"layer","type":"combo"},"leisure":{"key":"leisure","type":"combo"},"levels":{"key":"building:levels","type":"number"},"man_made":{"key":"man_made","type":"combo"},"maxspeed":{"key":"maxspeed","type":"combo"},"natural":{"key":"natural","type":"combo"},"network":{"key":"network","type":"text"},"note":{"key":"note","type":"textarea","universal":true},"office":{"key":"office","type":"combo"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"place":{"key":"place","type":"combo"},"railway":{"key":"railway","type":"combo"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"type":"radio","options":["bridge","tunnel","embankment","cutting"]},"service":{"key":"service","type":"combo","options":["parking_aisle","driveway","alley","drive-through","emergency_access"]},"shelter":{"key":"shelter","type":"check"},"shop":{"key":"shop","type":"combo"},"source":{"key":"source","type":"text","icon":"source","universal":true},"sport":{"key":"sport","type":"combo"},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","icon":"telephone","universal":true},"tourism":{"key":"tourism","type":"combo"},"water":{"key":"water","type":"combo"},"waterway":{"key":"waterway","type":"combo"},"website":{"key":"website","type":"url","icon":"website","universal":true},"wetland":{"key":"wetland","type":"combo"},"wikipedia":{"key":"wikipedia","type":"text","icon":"wikipedia","universal":true},"wood":{"key":"wood","type":"combo"}}
\ No newline at end of file
diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json
index 02d01ebb0..4c7f93cee 100644
--- a/data/presets/fields/address.json
+++ b/data/presets/fields/address.json
@@ -6,5 +6,6 @@
         "addr:street",
         "addr:city"
     ],
+    "icon": "address",
     "universal": true
 }
diff --git a/data/presets/fields/elevation.json b/data/presets/fields/elevation.json
index c4ceed73e..20e13e415 100644
--- a/data/presets/fields/elevation.json
+++ b/data/presets/fields/elevation.json
@@ -1,5 +1,6 @@
 {
     "key": "ele",
     "type": "number",
+    "icon": "elevation",
     "universal": true
 }
diff --git a/data/presets/fields/source.json b/data/presets/fields/source.json
index 64db875fc..6f360b2c4 100644
--- a/data/presets/fields/source.json
+++ b/data/presets/fields/source.json
@@ -1,5 +1,6 @@
 {
     "key": "source",
     "type": "text",
+    "icon": "source",
     "universal": true
 }
diff --git a/data/presets/fields/telephone.json b/data/presets/fields/telephone.json
index 5ac9b3a94..dcd931c05 100644
--- a/data/presets/fields/telephone.json
+++ b/data/presets/fields/telephone.json
@@ -1,5 +1,6 @@
 {
     "key": "phone",
     "type": "tel",
+    "icon": "telephone",
     "universal": true
 }
diff --git a/data/presets/fields/website.json b/data/presets/fields/website.json
index 205eec6ba..28a58084a 100644
--- a/data/presets/fields/website.json
+++ b/data/presets/fields/website.json
@@ -1,5 +1,6 @@
 {
     "key": "website",
     "type": "url",
+    "icon": "website",
     "universal": true
 }
diff --git a/data/presets/fields/wikipedia.json b/data/presets/fields/wikipedia.json
index 34ce5248d..16910d086 100644
--- a/data/presets/fields/wikipedia.json
+++ b/data/presets/fields/wikipedia.json
@@ -1,5 +1,6 @@
 {
     "key": "wikipedia",
     "type": "text",
+    "icon": "wikipedia",
     "universal": true
 }
diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index b3261d753..1755b165b 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -61,6 +61,8 @@ iD.ui.preset = function(context) {
             d3.select(this).remove();
             if (!wrap.selectAll('button').node()) wrap.remove();
         }
+
+        if (!preset.additional || !preset.additional.length) wrap.remove();
     }
 
     function formKey(d) {