diff --git a/css/30_highways.css b/css/30_highways.css
index d1f2e90c4..4da6d1030 100644
--- a/css/30_highways.css
+++ b/css/30_highways.css
@@ -32,8 +32,8 @@ path.line.stroke.tag-highway {
     stroke-width: 5;
 }
 
-.preset-icon .icon.iD-highway-motorway,
-.preset-icon .icon.iD-highway-motorway-link {
+.preset-icon .icon.tag-highway-motorway,
+.preset-icon .icon.tag-highway-motorway-link {
     color: #CF2081;
     fill: #70372f;
 }
@@ -48,8 +48,8 @@ path.line.casing.tag-motorway {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-trunk,
-.preset-icon .icon.iD-highway-trunk-link {
+.preset-icon .icon.tag-highway-trunk,
+.preset-icon .icon.tag-highway-trunk-link {
     color: #DD2F22;
     fill: #70372f;
 }
@@ -64,8 +64,8 @@ path.line.casing.tag-trunk {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-primary,
-.preset-icon .icon.iD-highway-primary-link {
+.preset-icon .icon.tag-highway-primary,
+.preset-icon .icon.tag-highway-primary-link {
     color: #F99806;
     fill: #70372f;
 }
@@ -80,8 +80,8 @@ path.line.casing.tag-primary {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-secondary,
-.preset-icon .icon.iD-highway-secondary-link {
+.preset-icon .icon.tag-highway-secondary,
+.preset-icon .icon.tag-highway-secondary-link {
     color: #F3F312;
     fill: #70372f;
 }
@@ -96,8 +96,8 @@ path.line.casing.tag-secondary {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-tertiary,
-.preset-icon .icon.iD-highway-tertiary-link {
+.preset-icon .icon.tag-highway-tertiary,
+.preset-icon .icon.tag-highway-tertiary-link {
     color: #FFF9B3;
     fill: #70372f;
 }
@@ -112,8 +112,8 @@ path.line.casing.tag-tertiary {
     stroke: #70372f;
 }
 
-.legacy-carto .preset-icon .icon.iD-highway-motorway,
-.legacy-carto .preset-icon .icon.iD-highway-motorway-link {
+.legacy-carto .preset-icon .icon.tag-highway-motorway,
+.legacy-carto .preset-icon .icon.tag-highway-motorway-link {
     color: #58a9ed;
     fill: #2c5476;
 }
@@ -128,8 +128,8 @@ path.line.casing.tag-tertiary {
     stroke: #2c5476;
 }
 
-.legacy-carto .preset-icon .icon.iD-highway-trunk,
-.legacy-carto .preset-icon .icon.iD-highway-trunk-link {
+.legacy-carto .preset-icon .icon.tag-highway-trunk,
+.legacy-carto .preset-icon .icon.tag-highway-trunk-link {
     color: #8cd05f;
     fill: #46682f;
 }
@@ -144,8 +144,8 @@ path.line.casing.tag-tertiary {
     stroke: #46682f;
 }
 
-.legacy-carto .preset-icon .icon.iD-highway-primary,
-.legacy-carto .preset-icon .icon.iD-highway-primary-link {
+.legacy-carto .preset-icon .icon.tag-highway-primary,
+.legacy-carto .preset-icon .icon.tag-highway-primary-link {
     color: #e06d5f;
     fill: #70372f;
 }
@@ -160,8 +160,8 @@ path.line.casing.tag-tertiary {
     stroke: #70372f;
 }
 
-.legacy-carto .preset-icon .icon.iD-highway-secondary,
-.legacy-carto .preset-icon .icon.iD-highway-secondary-link {
+.legacy-carto .preset-icon .icon.tag-highway-secondary,
+.legacy-carto .preset-icon .icon.tag-highway-secondary-link {
     color: #eab056;
     fill: #75582b;
 }
@@ -176,8 +176,8 @@ path.line.casing.tag-tertiary {
     stroke: #75582b;
 }
 
-.legacy-carto .preset-icon .icon.iD-highway-tertiary,
-.legacy-carto .preset-icon .icon.iD-highway-tertiary-link {
+.legacy-carto .preset-icon .icon.tag-highway-tertiary,
+.legacy-carto .preset-icon .icon.tag-highway-tertiary-link {
     color: #ffff7e;
     fill: #7f7f3f;
 }
@@ -192,7 +192,7 @@ path.line.casing.tag-tertiary {
     stroke: #7f7f3f;
 }
 
-.preset-icon .icon.iD-highway-residential {
+.preset-icon .icon.tag-highway-residential {
     color: #fff;
     fill: #444;
 }
@@ -205,7 +205,7 @@ path.line.casing.tag-residential {
     stroke: #444;
 }
 
-.preset-icon .icon.iD-highway-unclassified {
+.preset-icon .icon.tag-highway-unclassified {
     color: #dca;
     fill: #444;
 }
@@ -387,7 +387,7 @@ path.line.stroke.tag-steps {
 }
 
 
-.preset-icon .icon.iD-highway-living-street {
+.preset-icon .icon.tag-highway-living-street {
     color: #bbb;
     fill: #ddd;
 }
@@ -400,8 +400,8 @@ path.line.casing.tag-living_street {
     stroke: #fff;
 }
 
-.preset-icon .icon.iD-highway-footway.tag-highway-corridor,
-.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian {
+.preset-icon .icon.tag-highway-corridor,
+.preset-icon .icon.tag-highway-pedestrian {
     color: #8cd05f;
     fill: #fff;
 }
@@ -431,7 +431,7 @@ path.line.casing.tag-pedestrian.tag-unpaved {
     stroke-dasharray: none;
 }
 
-.preset-icon .icon.iD-highway-road {
+.preset-icon .icon.tag-highway-road {
     color: #9e9e9e;
     fill: #666;
 }
@@ -444,7 +444,7 @@ path.line.casing.tag-road {
     stroke: #666;
 }
 
-.preset-icon .icon.iD-highway-service {
+.preset-icon .icon.tag-highway-service {
     color: #fff;
     fill: #666;
 }
@@ -459,8 +459,8 @@ path.line.casing.tag-service {
 
 /* special service roads and bus guideways */
 /* with `service=* tag`  (e.g. parking_aisle, alley, drive-through) */
-.preset-icon .icon.iD-highway-bus_guideway,
-.preset-icon .icon.iD-highway-service.tag-service {
+.preset-icon .icon.tag-highway-bus_guideway,
+.preset-icon .icon.tag-highway-service.tag-service {
     color: #dca;
     fill: #666;
 }
@@ -475,7 +475,7 @@ path.line.casing.tag-service.tag-service {
     stroke: #666;
 }
 
-.preset-icon .icon.iD-highway-track {
+.preset-icon .icon.tag-highway-track {
     color: #eaeaea;
     fill: #c5b59f;
 }
@@ -521,7 +521,7 @@ path.line.casing.tag-highway-bridleway.tag-unpaved {
 }
 
 .preset-icon .icon.iD-category-path,
-.preset-icon .icon.iD-highway-path {
+.preset-icon .icon.tag-highway-path {
     color: #988;
     fill: #dca;
 }
@@ -531,7 +531,7 @@ path.line.stroke.tag-highway-path {
 
 .preset-icon .icon.tag-route-foot,
 .preset-icon .icon.tag-route-hiking,
-.preset-icon .icon.iD-highway-footway {
+.preset-icon .icon.tag-highway-footway {
     color: #988;
     fill: #fff;
 }
@@ -541,7 +541,7 @@ path.line.stroke.tag-highway-footway {
 
 
 .preset-icon .icon.tag-route-bicycle,
-.preset-icon .icon.iD-highway-cycleway {
+.preset-icon .icon.tag-highway-cycleway {
     color: #58a9ed;
     fill: #fff;
 }
@@ -550,7 +550,7 @@ path.line.stroke.tag-highway-cycleway {
 }
 
 .preset-icon .icon.tag-route-horse,
-.preset-icon .icon.iD-highway-bridleway {
+.preset-icon .icon.tag-highway-bridleway {
     color: #e06d5f;
     fill: #fff;
 }
@@ -558,7 +558,7 @@ path.line.stroke.tag-highway-bridleway {
     stroke: #e06d5f;
 }
 
-.preset-icon .icon.iD-highway-steps {
+.preset-icon .icon.tag-highway-steps {
     color: #81d25c;
     fill: #fff;
 }
diff --git a/css/50_misc.css b/css/50_misc.css
index f7ac406be..8c8ad1c3b 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -352,7 +352,7 @@ path.line.casing.tag-status {
 }
 
 /* Road Closed Status */
-.preset-icon .icon.iD-highway-construction {
+.preset-icon .icon.tag-highway-construction {
     color: #fc6c14;
     fill: #fff;
 }
diff --git a/css/80_app.css b/css/80_app.css
index 674b6e9a4..a084a399d 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -948,6 +948,21 @@ a.hide-toggle {
     background: #ececec;
 }
 
+.preset-icon-line {
+    margin: auto;
+    position: absolute;
+    left: 10px;
+    top: 30px;
+}
+
+/* use a consistent stroke width */
+.preset-icon-line path.line.stroke {
+    stroke-width: 2 !important;
+}
+.preset-icon-line path.line.casing {
+    stroke-width: 4 !important;
+}
+
 .preset-icon-fill-area {
     cursor: inherit;
     height: 40px;
@@ -1011,6 +1026,9 @@ a.hide-toggle {
     left: 8px;
     margin: auto;
 }
+.preset-icon-44.line-geom {
+    top: 2px;
+}
 
 .preset-icon-44 .icon {
     width: 44px;
@@ -1035,6 +1053,9 @@ a.hide-toggle {
     left: 18px;
     margin: auto;
 }
+.preset-icon-24.line-geom {
+    top: 12px;
+}
 
 .preset-icon-24 .icon {
     width: 24px;
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0aa3805a3..41f4811a2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -403,25 +403,25 @@
     "healthcare/rehabilitation": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["rehab", "therapist", "therapy"], "tags": {"healthcare": "rehabilitation"}, "name": "Rehabilitation Facility"},
     "healthcare/speech_therapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["speech", "therapist", "therapy", "voice"], "tags": {"healthcare": "speech_therapist"}, "name": "Speech Therapist"},
     "highway/bus_stop": {"icon": "maki-bus", "fields": ["name", "network", "operator", "bench", "shelter"], "geometry": ["point", "vertex"], "tags": {"highway": "bus_stop"}, "name": "Bus Stop / Platform", "searchable": false},
-    "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access", "incline", "horse_scale"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "icon": "iD-highway-bridleway", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"},
-    "highway/bus_guideway": {"icon": "iD-highway-bus-guideway", "fields": ["name", "operator", "oneway", "structure", "covered"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"},
-    "highway/construction": {"icon": "iD-highway-construction", "fields": ["name", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closed", "closure", "construction"], "name": "Road Closed"},
-    "highway/corridor": {"icon": "iD-highway-footway", "fields": ["name", "width", "level", "access_simple", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["line"], "tags": {"highway": "corridor"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"},
+    "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access", "incline", "horse_scale"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "icon": "maki-horse-riding", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"},
+    "highway/bus_guideway": {"icon": "maki-bus", "fields": ["name", "operator", "oneway", "structure", "covered"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"},
+    "highway/construction": {"icon": "maki-barrier", "fields": ["name", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closed", "closure", "construction"], "name": "Road Closed"},
+    "highway/corridor": {"icon": "temaki-pedestrian", "fields": ["name", "width", "level", "access_simple", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["line"], "tags": {"highway": "corridor"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"},
     "highway/crossing/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false},
     "highway/crossing/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false},
     "highway/crossing/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"},
     "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"},
     "highway/crossing/unmarked-raised": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "tags": {"highway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"},
     "highway/crossing/unmarked": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "crossing"}, "reference": {"key": "highway", "value": "crossing"}, "terms": [], "name": "Unmarked Crossing"},
-    "highway/cycleway": {"icon": "iD-highway-cycleway", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered", "dog"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"},
+    "highway/cycleway": {"icon": "maki-bicycle", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered", "dog"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"},
     "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
-    "highway/footway": {"icon": "iD-highway-footway", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"},
-    "highway/footway/zebra-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false},
-    "highway/footway/zebra": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false},
-    "highway/footway/conveying": {"icon": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
-    "highway/footway/marked-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"},
-    "highway/footway/marked": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"},
-    "highway/footway/sidewalk": {"icon": "iD-highway-footway", "geometry": ["line"], "tags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": ["pavement", "sidepath"], "name": "Sidewalk"},
+    "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"},
+    "highway/footway/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false},
+    "highway/footway/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false},
+    "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
+    "highway/footway/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"},
+    "highway/footway/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"},
+    "highway/footway/sidewalk": {"icon": "temaki-pedestrian", "geometry": ["line"], "tags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": ["pavement", "sidepath"], "name": "Sidewalk"},
     "highway/footway/unmarked-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"},
     "highway/footway/unmarked": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Unmarked Crossing"},
     "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"},
@@ -434,7 +434,7 @@
     "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"},
     "highway/path": {"icon": "iD-highway-path", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "trail_visibility", "sac_scale", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered", "ref", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
     "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"},
-    "highway/pedestrian_line": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"},
+    "highway/pedestrian_line": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"},
     "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "destination/symbol_oneway", "junction/ref_oneway", "lit", "maxheight", "maxspeed/advisory", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"},
     "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["covered", "cycleway", "lit", "maxheight", "maxspeed/advisory", "oneway/bicycle", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"},
     "highway/raceway": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["point", "line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Racetrack (Motorsport)"},
@@ -622,7 +622,7 @@
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
-    "man_made/pier": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"},
+    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
@@ -816,20 +816,20 @@
     "railway/disused": {"icon": "iD-railway-disused", "fields": ["structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
     "railway/funicular": {"icon": "iD-railway-rail", "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "fields": ["structure", "gauge", "service_rail"], "tags": {"railway": "funicular"}, "name": "Funicular"},
     "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
-    "railway/light_rail": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
+    "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
     "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"},
     "railway/miniature": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"},
-    "railway/monorail": {"icon": "iD-railway-monorail", "fields": ["name", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
+    "railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
     "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
     "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"},
     "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
     "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
-    "railway/subway": {"icon": "iD-railway-subway", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
+    "railway/subway": {"icon": "temaki-subway", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
     "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
-    "railway/tram": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
+    "railway/tram": {"icon": "temaki-tram", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
-    "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
+    "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
     "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
     "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
     "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json
index fe485a551..61e5baa29 100644
--- a/data/presets/presets/highway/bridleway.json
+++ b/data/presets/presets/highway/bridleway.json
@@ -15,7 +15,7 @@
         "covered",
         "dog"
     ],
-    "icon": "iD-highway-bridleway",
+    "icon": "maki-horse-riding",
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/highway/bus_guideway.json b/data/presets/presets/highway/bus_guideway.json
index 06e07930a..4facf21d1 100644
--- a/data/presets/presets/highway/bus_guideway.json
+++ b/data/presets/presets/highway/bus_guideway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-bus-guideway",
+    "icon": "maki-bus",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/highway/construction.json b/data/presets/presets/highway/construction.json
index 90fb4770c..b09d47185 100644
--- a/data/presets/presets/highway/construction.json
+++ b/data/presets/presets/highway/construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-construction",
+    "icon": "maki-barrier",
     "fields": [
         "name",
         "opening_date",
diff --git a/data/presets/presets/highway/corridor.json b/data/presets/presets/highway/corridor.json
index 7fc79c6f0..9b2fc4e99 100644
--- a/data/presets/presets/highway/corridor.json
+++ b/data/presets/presets/highway/corridor.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "width",
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index dcf6a9a87..273aa6df6 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-cycleway",
+    "icon": "maki-bicycle",
     "fields": [
         "name",
         "oneway",
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 8c235f057..f43435d30 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/presets/highway/footway/_zebra-raised.json b/data/presets/presets/highway/footway/_zebra-raised.json
index f6e173680..d7463d63a 100644
--- a/data/presets/presets/highway/footway/_zebra-raised.json
+++ b/data/presets/presets/highway/footway/_zebra-raised.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
         "access",
diff --git a/data/presets/presets/highway/footway/_zebra.json b/data/presets/presets/highway/footway/_zebra.json
index 646800847..4f9f5d7cb 100644
--- a/data/presets/presets/highway/footway/_zebra.json
+++ b/data/presets/presets/highway/footway/_zebra.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
         "access",
diff --git a/data/presets/presets/highway/footway/conveying.json b/data/presets/presets/highway/footway/conveying.json
index ce15fd89a..01d92297e 100644
--- a/data/presets/presets/highway/footway/conveying.json
+++ b/data/presets/presets/highway/footway/conveying.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "conveying",
diff --git a/data/presets/presets/highway/footway/marked-raised.json b/data/presets/presets/highway/footway/marked-raised.json
index d23d080f7..2ae6b19ff 100644
--- a/data/presets/presets/highway/footway/marked-raised.json
+++ b/data/presets/presets/highway/footway/marked-raised.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
         "access",
diff --git a/data/presets/presets/highway/footway/marked.json b/data/presets/presets/highway/footway/marked.json
index 71e8e499e..fa10ca7a7 100644
--- a/data/presets/presets/highway/footway/marked.json
+++ b/data/presets/presets/highway/footway/marked.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
         "access",
diff --git a/data/presets/presets/highway/footway/sidewalk.json b/data/presets/presets/highway/footway/sidewalk.json
index 384c3f8bf..23d10df59 100644
--- a/data/presets/presets/highway/footway/sidewalk.json
+++ b/data/presets/presets/highway/footway/sidewalk.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/highway/pedestrian_line.json b/data/presets/presets/highway/pedestrian_line.json
index f045a8fc6..e98e03851 100644
--- a/data/presets/presets/highway/pedestrian_line.json
+++ b/data/presets/presets/highway/pedestrian_line.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index 61728228e..6aa46cf2f 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-highway-footway",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json
index 7e0e917c8..0eb3ca157 100644
--- a/data/presets/presets/railway/light_rail.json
+++ b/data/presets/presets/railway/light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-railway-light-rail",
+    "icon": "temaki-light_rail",
     "fields": [
         "name",
         "structure",
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
index 2cb45fdcc..52a06cfef 100644
--- a/data/presets/presets/railway/monorail.json
+++ b/data/presets/presets/railway/monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-railway-monorail",
+    "icon": "temaki-monorail",
     "fields": [
         "name",
         "structure",
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index b97f4da8a..f6325a58b 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-railway-subway",
+    "icon": "temaki-subway",
     "fields": [
         "name",
         "structure",
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
index be0b3939e..94007c00e 100644
--- a/data/presets/presets/railway/tram.json
+++ b/data/presets/presets/railway/tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-railway-light-rail",
+    "icon": "temaki-tram",
     "fields": [
         "name",
         "structure",
diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json
index 8be49a069..15e21157e 100644
--- a/data/presets/presets/route/ferry.json
+++ b/data/presets/presets/route/ferry.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-ferry-line",
+    "icon": "maki-ferry",
     "geometry": [
         "line"
     ],
@@ -7,8 +7,8 @@
         "name",
         "operator",
         "duration",
-        "access", 
-        "to", 
+        "access",
+        "to",
         "from"
     ],
     "tags": {
diff --git a/data/taginfo.json b/data/taginfo.json
index 711676da7..88f5c1ed0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -398,19 +398,19 @@
     {"key": "healthcare", "value": "rehabilitation", "description": "🄿 Rehabilitation Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare", "value": "speech_therapist", "description": "🄿 Speech Therapist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "highway", "value": "bus_stop", "description": "🄿 Bus Stop / Platform (unsearchable)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"},
-    {"key": "highway", "value": "bridleway", "description": "🄿 Bridle Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-bridleway.svg?sanitize=true"},
-    {"key": "highway", "value": "bus_guideway", "description": "🄿 Bus Guideway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-bus-guideway.svg?sanitize=true"},
-    {"key": "access", "value": "no", "description": "🄿 Road Closed, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-construction.svg?sanitize=true"},
-    {"key": "highway", "value": "corridor", "description": "🄿 Indoor Corridor", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"},
+    {"key": "highway", "value": "bridleway", "description": "🄿 Bridle Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
+    {"key": "highway", "value": "bus_guideway", "description": "🄿 Bus Guideway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"},
+    {"key": "access", "value": "no", "description": "🄿 Road Closed, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
+    {"key": "highway", "value": "corridor", "description": "🄿 Indoor Corridor", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "traffic_calming", "value": "table", "description": "🄿 Marked Crosswalk (Raised) (unsearchable), 🄿 Marked Crosswalk (Raised), 🄿 Unmarked Crossing (Raised), 🄿 Speed Table", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "crossing", "value": "zebra", "description": "🄿 Marked Crosswalk (unsearchable)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "crossing", "value": "marked", "description": "🄿 Marked Crosswalk", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "highway", "value": "crossing", "description": "🄿 Unmarked Crossing", "object_types": ["node"]},
-    {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-cycleway.svg?sanitize=true"},
+    {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"},
     {"key": "highway", "value": "elevator", "description": "🄿 Elevator", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/elevator.svg?sanitize=true"},
-    {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"},
-    {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"},
-    {"key": "footway", "value": "sidewalk", "description": "🄿 Sidewalk", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"},
+    {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
+    {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
+    {"key": "footway", "value": "sidewalk", "description": "🄿 Sidewalk", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "footway", "value": "crossing", "description": "🄿 Unmarked Crossing", "object_types": ["way"]},
     {"key": "highway", "value": "give_way", "description": "🄿 Yield Sign", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/yield.svg?sanitize=true"},
     {"key": "highway", "value": "living_street", "description": "🄿 Living Street", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-living-street.svg?sanitize=true"},
@@ -421,7 +421,7 @@
     {"key": "highway", "value": "motorway", "description": "🄿 Motorway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-motorway.svg?sanitize=true"},
     {"key": "highway", "value": "passing_place", "description": "🄿 Passing Place", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/circle-stroked-15.svg?sanitize=true"},
     {"key": "highway", "value": "path", "description": "🄿 Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-path.svg?sanitize=true"},
-    {"key": "highway", "value": "pedestrian", "description": "🄿 Pedestrian Street", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"},
+    {"key": "highway", "value": "pedestrian", "description": "🄿 Pedestrian Street", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "highway", "value": "primary_link", "description": "🄿 Primary Link", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-primary-link.svg?sanitize=true"},
     {"key": "highway", "value": "primary", "description": "🄿 Primary Road", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-primary.svg?sanitize=true"},
     {"key": "highway", "value": "raceway", "description": "🄿 Racetrack (Motorsport)", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-unclassified.svg?sanitize=true"},
@@ -606,7 +606,7 @@
     {"key": "man_made", "value": "monitoring_station", "description": "🄿 Monitoring Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/antenna.svg?sanitize=true"},
     {"key": "man_made", "value": "observatory", "description": "🄿 Observatory", "object_types": ["node", "area"]},
     {"key": "man_made", "value": "petroleum_well", "description": "🄿 Oil Well", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
-    {"key": "man_made", "value": "pier", "description": "🄿 Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"},
+    {"key": "man_made", "value": "pier", "description": "🄿 Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "man_made", "value": "pipeline", "description": "🄿 Pipeline", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"},
     {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
     {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/silo.svg?sanitize=true"},
@@ -777,19 +777,19 @@
     {"key": "railway", "value": "disused", "description": "🄿 Disused Railway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-disused.svg?sanitize=true"},
     {"key": "railway", "value": "funicular", "description": "🄿 Funicular", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"},
     {"key": "railway", "value": "level_crossing", "description": "🄿 Railway Crossing (Road)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/cross-15.svg?sanitize=true"},
-    {"key": "railway", "value": "light_rail", "description": "🄿 Light Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-light-rail.svg?sanitize=true"},
+    {"key": "railway", "value": "light_rail", "description": "🄿 Light Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/light_rail.svg?sanitize=true"},
     {"key": "railway", "value": "milestone", "description": "🄿 Railway Milestone", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true"},
     {"key": "railway", "value": "miniature", "description": "🄿 Miniature Railway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"},
-    {"key": "railway", "value": "monorail", "description": "🄿 Monorail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-monorail.svg?sanitize=true"},
+    {"key": "railway", "value": "monorail", "description": "🄿 Monorail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/monorail.svg?sanitize=true"},
     {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"},
     {"key": "railway", "value": "rail", "description": "🄿 Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"},
     {"key": "railway", "value": "signal", "description": "🄿 Railway Signal", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/railway_signals.svg?sanitize=true"},
     {"key": "railway", "value": "subway_entrance", "description": "🄿 Subway Entrance", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-15.svg?sanitize=true"},
-    {"key": "railway", "value": "subway", "description": "🄿 Subway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-subway.svg?sanitize=true"},
+    {"key": "railway", "value": "subway", "description": "🄿 Subway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/subway.svg?sanitize=true"},
     {"key": "railway", "value": "switch", "description": "🄿 Railway Switch", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/junction.svg?sanitize=true"},
     {"key": "railway", "value": "wash", "description": "🄿 Train Wash", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"},
-    {"key": "railway", "value": "tram", "description": "🄿 Tram", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-light-rail.svg?sanitize=true"},
-    {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/ferry-line.svg?sanitize=true"},
+    {"key": "railway", "value": "tram", "description": "🄿 Tram", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tram.svg?sanitize=true"},
+    {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/ferry-15.svg?sanitize=true"},
     {"key": "seamark:type", "value": "beacon_isolated_danger", "description": "🄿 Danger Beacon", "object_types": ["node"]},
     {"key": "seamark:type", "value": "beacon_lateral", "description": "🄿 Channel Beacon", "object_types": ["node"]},
     {"key": "seamark:type", "value": "buoy_lateral", "description": "🄿 Channel Buoy", "object_types": ["node"]},
diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index a52fc87a3..a241049fc 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -34,11 +34,17 @@ export function uiPresetIcon() {
         var isTemaki = /^temaki-/.test(picon);
         var isFa = /^fa[srb]-/.test(picon);
         var isPOI = isMaki || isTemaki || isFa;
-        var isFramed = (geom === 'area' || geom === 'vertex');
+        var isCategory = !p.setTags;
+        var drawLine = geom === 'line' && !isCategory;
+        var isFramed = (geom === 'area' || drawLine || geom === 'vertex');
 
         var tagClasses = '';
-        for (var k in p.tags) {
-            var v = p.tags[k];
+        var tags = isCategory ? p.tags : p.setTags({}, geom);
+        for (var k in tags) {
+            if (k === 'piste:type') {  // avoid a ':' in the class name
+                k = 'piste';
+            }
+            var v = tags[k];
             tagClasses += ' tag-' + k;
             if (v !== '*') {
                 tagClasses += ' tag-' + k + '-' + v;
@@ -63,6 +69,28 @@ export function uiPresetIcon() {
                 return 'preset-icon-fill preset-icon-fill-' + geom + tagClasses;
             });
 
+        var line = selection.selectAll('.preset-icon-line')
+            .data(drawLine ? [0] : []);
+
+        line.exit()
+            .remove();
+
+        line = line.enter()
+            .append('svg')
+            .attr('class', 'preset-icon-line')
+            .attr('width', 40)
+            .attr('height', 30)
+            .merge(line);
+
+        line.html('');
+
+        line.append('path')
+            .attr('d', 'M0 13.5 L40 13.5')
+            .attr('class', 'line casing' + tagClasses);
+        line.append('path')
+            .attr('d', 'M0 13.5 L40 13.5')
+            .attr('class', 'line stroke' + tagClasses);
+
 
         var areaFrame = selection.selectAll('.preset-icon-frame')
             .data((geom === 'area') ? [0] : []);
@@ -86,13 +114,13 @@ export function uiPresetIcon() {
             .merge(icon);
 
         icon
-            .attr('class', 'preset-icon preset-icon-' +
+            .attr('class', 'preset-icon ' + geom + '-geom ' + 'preset-icon-' +
                 (isPOI ? (isFramed ? '24' : '28') : (isFramed ? '44' : '60'))
             );
 
         icon.selectAll('svg')
             .attr('class', function() {
-                return 'icon ' + picon + (isPOI ? '' : tagClasses);
+                return 'icon ' + picon + (isPOI && geom !== 'line'  ? '' : tagClasses);
             });
 
         icon.selectAll('use')
diff --git a/svg/iD-sprite/presets/ferry-line.svg b/svg/iD-sprite/presets/ferry-line.svg
deleted file mode 100644
index 962c9c240..000000000
--- a/svg/iD-sprite/presets/ferry-line.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M25.666,26.974 C27.013,26.992 28.315,27.464 29.361,28.313 L29.88,28.772 L29.98,28.772 L30.599,28.213 C32.56,26.592 35.351,26.446 37.47,27.853 L41.984,18.985 L38.988,16.988 L38.988,9.898 C38.895,8.3 37.592,7.04 35.992,7.001 L34.993,7.001 C35.062,5.967 34.278,5.073 33.244,5.004 C33.161,4.999 33.078,4.999 32.996,5.004 L27.004,5.004 C25.969,4.936 25.075,5.719 25.007,6.754 C25.001,6.836 25.001,6.919 25.007,7.001 L24.008,7.001 C22.408,7.04 21.105,8.3 21.012,9.898 L21.012,16.988 L18.016,18.985 L22.51,28.033 C23.437,27.382 24.534,27.014 25.666,26.974 z M23.009,9.898 C23.03,9.379 23.467,8.977 23.985,8.998 C23.993,8.998 24,8.998 24.008,8.999 L35.992,8.999 C36.509,8.965 36.956,9.356 36.991,9.873 C36.993,9.915 36.993,9.956 36.991,9.997 L36.991,15.989 L30,11.995 L23.009,15.889 C23.009,15.889 23.009,9.898 23.009,9.898 z M42.982,30.969 L42.982,32.966 C42.458,33.005 41.97,33.249 41.624,33.645 C41.082,34.221 40.39,34.636 39.627,34.844 C38.399,35.206 37.071,34.929 36.092,34.105 L35.313,33.406 C34.705,32.801 33.724,32.801 33.116,33.406 C32.836,33.645 32.576,33.905 32.277,34.145 C30.813,35.314 28.719,35.255 27.324,34.005 L26.545,33.306 C25.973,32.806 25.119,32.806 24.547,33.306 C24.168,33.606 23.828,33.945 23.449,34.245 C22.042,35.286 20.107,35.237 18.755,34.125 L18.136,33.586 C17.847,33.255 17.451,33.035 17.018,32.966 L17.018,30.969 C17.534,30.905 18.057,31.003 18.515,31.249 C19.071,31.593 19.599,31.98 20.093,32.407 C20.503,32.854 21.121,33.044 21.711,32.906 C21.936,32.84 22.146,32.731 22.33,32.587 C22.65,32.347 22.91,32.068 23.229,31.808 C24.648,30.632 26.703,30.632 28.123,31.808 C28.442,32.068 28.742,32.367 29.061,32.627 C29.633,33.127 30.487,33.127 31.059,32.627 C31.378,32.367 31.678,32.068 31.997,31.808 C33.42,30.621 35.488,30.621 36.911,31.808 C37.21,32.068 37.49,32.347 37.789,32.587 C38.361,33.087 39.215,33.087 39.787,32.587 L40.725,31.768 C41.364,31.25 42.161,30.968 42.982,30.969 z" fill="currentColor" id="ferry-line-stroke2"/>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="ferry-line-stroke1"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="ferry-line-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-bridleway.svg b/svg/iD-sprite/presets/highway-bridleway.svg
deleted file mode 100644
index b778cb320..000000000
--- a/svg/iD-sprite/presets/highway-bridleway.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M29.5,6 C28.119,6 27,7.119 27,8.5 C27,9.881 28.119,11 29.5,11 C30.881,11 32,9.881 32,8.5 C32,7.119 30.881,6 29.5,6 z M43,9.156 L40,13 L35.719,18 L35,18 L33,18 L32,17.656 L32,13 C32,12.446 31.554,12 31,12 L28,12 C27.446,12 27,12.446 27,13 L27,17 L25,17 L21,17 L17,21 L16,27 L18,27 L19,25 L20,22 L21,20.656 L21,24.156 L19,28.5 L19,34 C19,35 19,36 20.5,36 C22,36 22,35 22,34 L22,28.5 L23.156,26 L25,26 L25,28.5 L27.5,34.5 C27.751,35.435 28.405,36 29.25,36 C30.059,36 30.346,35.124 30,34 L28,28.5 L28,26.188 L31,27 L35,27 L35,34 C35,34.5 35,36 36.5,36 C38,36 38,34.5 38,34 L38,27 L43,18 L45,18 L47,19 L48,18 L48,16 L44,13 L43,13 z M27,18 L30,18 L33,21 L33,25 L32,26 L31,25 L31,22 L27,19 z" fill="currentColor" id="highway-bridleway-stroke2"/>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="highway-bridleway-stroke1"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="highway-bridleway-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-bus-guideway.svg b/svg/iD-sprite/presets/highway-bus-guideway.svg
deleted file mode 100644
index 16391772f..000000000
--- a/svg/iD-sprite/presets/highway-bus-guideway.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.57,44.002 48.113,43.584 47.5,42.971 L47.5,43 L12.5,43 L12.5,42.971 C11.996,43.663 11.316,43.918 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.43,38.998 11.887,39.416 12.5,40.029 L12.5,40 L47.5,40 L47.5,40.029 C48.004,39.336 48.684,39.082 49.5,39 z" fill="inherit" id="highway-bus_guideway-casing1"/>
-    <path d="M47.05,41 L47,41.5 L47.05,42 L12.95,42 L13,41.5 L12.95,41 L47.05,41 z" fill="currentColor" id="highway-bus_guideway-stroke1"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M24,11 C21.727,11 19,12.239 19,15.577 L19,24.665 L19,31 C19,31 19,32.667 20.667,32.667 L20.667,34.333 C20.667,34.333 20.667,36 22.333,36 C24,36 24,34.333 24,34.333 L24,32.667 L35.667,32.667 L35.667,34.333 C35.667,34.333 35.667,36 37.333,36 C39,36 39,34.333 39,34.333 L39,32.667 C39,32.667 40.667,32.667 40.667,31 L40.667,15.577 C40.667,12.168 38.607,11 36.334,11 L24,11 z M24.417,13.5 L35.25,13.5 C35.481,13.5 35.667,13.686 35.667,13.917 C35.667,14.148 35.481,14.333 35.25,14.333 L24.417,14.333 C24.186,14.333 24,14.148 24,13.917 C24,13.686 24.186,13.5 24.417,13.5 z M22.333,16 L37.333,16 C39,16 39,17.611 39,17.611 L39,22.667 C39,22.667 39,24.333 37.333,24.333 L22.333,24.333 C20.667,24.333 20.667,22.667 20.667,22.667 L20.667,17.667 C20.667,17.667 20.667,16 22.333,16 z M22.333,27.667 C23.254,27.667 24,28.413 24,29.333 C24,30.254 23.254,31 22.333,31 C21.413,31 20.667,30.254 20.667,29.333 C20.667,28.413 21.413,27.667 22.333,27.667 z M37.333,27.667 C38.254,27.667 39,28.413 39,29.333 C39,30.254 38.254,31 37.333,31 C36.413,31 35.667,30.254 35.667,29.333 C35.667,28.413 36.413,27.667 37.333,27.667 z" fill="#989898"/>
-  <path d="M44,33 L44,34.5 L49,36.375 L53,36.375 z" fill="#989898"/>
-  <path d="M16,33 L16,34.5 L11,36.375 L7,36.375 z" fill="#989898"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-construction.svg b/svg/iD-sprite/presets/highway-construction.svg
deleted file mode 100644
index 2aa3d485a..000000000
--- a/svg/iD-sprite/presets/highway-construction.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="currentColor" id="highway-construction-casing1"/>
-  <path d="M16.5,39.5 L16.5,43.5 L13.5,43.5 L13.5,39.5 L16.5,39.5 z M22.5,39.5 L19.5,39.5 L19.5,43.5 L22.5,43.5 L22.5,39.5 z M28.5,39.5 L25.5,39.5 L25.5,43.5 L28.5,43.5 L28.5,39.5 z M34.5,39.5 L31.5,39.5 L31.5,43.5 L34.5,43.5 L34.5,39.5 z M40.5,39.5 L37.5,39.5 L37.5,43.5 L40.5,43.5 L40.5,39.5 z M46.5,39.5 L43.5,39.5 L43.5,43.5 L46.5,43.5 L46.5,39.5 z" fill="inherit"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#fff"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#fff"/>
-  <path d="M42.071,11.858 L17.929,11.858 C16.717,11.858 15.734,12.84 15.734,14.052 L15.734,27.221 C15.734,28.433 16.717,29.416 17.929,29.416 L20.124,29.416 L20.124,34.903 C20.124,35.509 20.615,36 21.221,36 C21.827,36 22.318,35.509 22.318,34.903 L22.318,33.805 L37.682,33.805 L37.682,34.903 C37.682,35.509 38.173,36 38.779,36 C39.385,36 39.876,35.509 39.876,34.903 L39.876,29.416 L42.071,29.416 C43.283,29.416 44.266,28.433 44.266,27.221 L44.266,14.052 C44.266,12.84 43.283,11.858 42.071,11.858 z M42.071,14.052 L42.071,18.442 L37.682,14.052 z M34.39,14.052 L42.071,21.734 L42.071,27.221 L28.903,14.052 z M25.61,27.221 L17.929,19.539 L17.929,14.052 L31.097,27.221 z M17.929,27.221 L17.929,22.831 L22.318,27.221 z M37.682,31.61 L22.318,31.61 L22.318,29.416 L37.682,29.416 z M37.227,27.221 L34.39,27.221 L21.221,14.052 L25.61,14.052 L38.779,27.221 z" fill="currentColor" id="highway-construction-stroke3"/>
-</svg>
diff --git a/svg/iD-sprite/presets/highway-cycleway.svg b/svg/iD-sprite/presets/highway-cycleway.svg
deleted file mode 100644
index 1388dc50e..000000000
--- a/svg/iD-sprite/presets/highway-cycleway.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M23.594,14 L23.594,16 L24.438,16 L25,19 L22.5,19 L17,29 L17,30 L18,31 L29,31 L36.563,21.531 L40.5,30 L41,30 L42,30 L42,29 L36,16 L39,16 L39,15 L38,14 L34,14 L34,16 L35.406,19 L27.063,19 L26.5,16 L28.594,16 L28.594,15 L27.594,14 L23.594,14 z M23.5,21 L25.5,21 L27.5,29 L19,29 L23.5,21 z M27.5,21 L34.5,21 L29,27.5 L27.5,21 z M18.5,23 C14.91,23 12,25.91 12,29.5 C12,33.09 14.91,36 18.5,36 C21.203,36 23.52,34.347 24.5,32 L22.25,32 C21.444,33.216 20.068,34 18.5,34 C16.015,34 14,31.985 14,29.5 C14,27.176 15.77,25.301 18.031,25.062 L19.156,23.031 C18.938,23.009 18.724,23 18.5,23 z M40.344,23 L41.281,25.094 C43.392,25.466 45,27.283 45,29.5 C45,31.985 42.985,34 40.5,34 C38.015,34 36,31.985 36,29.5 C36,28.126 36.623,26.919 37.594,26.094 L36.719,24.219 C35.076,25.398 34,27.324 34,29.5 C34,33.09 36.91,36 40.5,36 C44.09,36 47,33.09 47,29.5 C47,25.91 44.09,23 40.5,23 C40.447,23 40.397,22.999 40.344,23 z M22.687,24.531 L21.687,26.312 C22.154,26.779 22.492,27.366 22.719,28 L24.812,28 C24.488,26.628 23.728,25.413 22.687,24.531 z" fill="currentColor" id="highway-cycleway-stroke2"/>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="highway-cycleway-stroke1"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="highway-cycleway-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-footway.svg b/svg/iD-sprite/presets/highway-footway.svg
deleted file mode 100644
index 8f690d238..000000000
--- a/svg/iD-sprite/presets/highway-footway.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M32,14.5 C32,15.881 30.881,17 29.5,17 C28.119,17 27,15.881 27,14.5 C27,13.119 28.119,12 29.5,12 C30.881,12 32,13.119 32,14.5 z M27,18 L28,18 L28.5,18 L37,24.5 L37,26 L36,26 L31,22.125 L31,26 L33,30 L35,35 L34,36 L33,36 L31,31 L27,25 L27,20.344 L24.5,22.5 L22.5,26 L21,26 L21,25 L22.5,22 L27,18 z M27.844,28.406 L25.531,36 L24.5,36 L23.5,35 L26.313,26.562 z" fill="currentColor" id="highway-footway-stroke2"/>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="highway-footway-stroke1"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="highway-footway-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-living-street.svg b/svg/iD-sprite/presets/highway-living-street.svg
index d653566ae..3daa34530 100644
--- a/svg/iD-sprite/presets/highway-living-street.svg
+++ b/svg/iD-sprite/presets/highway-living-street.svg
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.5,15 L19.625,21 L18,21 L17,22 L17,24 L18.406,24 L18,25 L18,30 L18,31 L18,31 C18,31 18.608,31.608 19,32 L20,32 L24,32 L26,33 L34,33 L36,32 L40,32 L41,32 L42,31 L42,31 L42,30 L42,25 L41.594,24 L43,24 L43,22 L42,21 L40.375,21 L37.5,15 z M23.5,18 L36.5,18 L38,22 L37,23 L23,23 L22,22 z M21,26 L24,26 L25,28 L25,29 L21,29 L20,28 L20,27 z M36,26 L39,26 L40,27 L40,28 L39,29 L35,29 L35,28 z M19,33 L19,35 L20,36 L23,36 L24,35 L24,33 z M36,33 L36,35 L37,36 L40,36 L41,35 L41,33 z" fill="#989898"/>
   <path d="M16,32.625 L16,34.125 L11,36 L7,36 z" fill="#989898"/>
   <path d="M18,12 L14,13.5 L14,31.375 L7,34 L7,21.625 L10,20.5 L10,16.5 L9,16.875 L7,17.625 L7,16.5 L7,7 z" fill="#B5B5B5"/>
   <path d="M50,9 L49,10 L49,12 L50,13 L52,13 L53,12 L53,10 L52,9 z M49,14 L48,15 L43,20 L45.5,20 L48,17.5 L48,22 L48,29 L49,29 L50,28 L50,22 L52.188,22 L53,26 L55,26 L57,26 L58,25 L58,24 L54.594,24 L54,21 L54,15 L53,14 z M44.5,25 C43.672,25 43,25.672 43,26.5 C43,27.328 43.672,28 44.5,28 C45.328,28 46,27.328 46,26.5 C46,25.672 45.328,25 44.5,25 z" fill="#989898"/>
   <path d="M44,32.625 L44,34.125 L49,36 L53,36 z" fill="#989898"/>
-  <g>
-    <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.57,44.002 48.113,43.584 47.5,42.971 L47.5,43 L12.5,43 L12.5,42.971 C11.996,43.663 11.316,43.918 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.43,38.998 11.887,39.417 12.5,40.029 L12.5,40 L47.5,40 L47.5,40.029 C48.004,39.336 48.684,39.082 49.5,39 z" fill="inherit" id="highway-living-street-casing1"/>
-    <path d="M47.05,41 L47,41.5 L47.05,42 L12.95,42 L13,41.5 L12.95,41 L47.05,41 z" fill="currentColor" id="highway-living-street-stroke1"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-motorway-link.svg b/svg/iD-sprite/presets/highway-motorway-link.svg
index f47c5ce1e..2028c39c6 100644
--- a/svg/iD-sprite/presets/highway-motorway-link.svg
+++ b/svg/iD-sprite/presets/highway-motorway-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <defs>
     <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="-660.5" y1="157.987" x2="-662" y2="152.362" gradientTransform="matrix(1, 0, 0, 1, 701, -132.362)">
       <stop offset="0" stop-color="#444444"/>
@@ -13,16 +13,4 @@
     <path d="M19,36 L30.359,14 L25,14 L8,36 z" fill="#B5B5B5"/>
     <path d="M32.5,33 L33.75,29 L30.75,29 L29.5,33 z M22.5,21 L24.5,17.5 L27.5,17.5 L25.5,21 z" fill="currentColor" id="highway-motorway-link-stroke3"/>
   </g>
-  <g>
-    <g>
-      <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 L10.5,39 z M12.5,40 L47.5,40 C47.19,40.416 47,40.941 47,41.5 C47,42.059 47.19,42.584 47.5,43 L12.5,43 C12.81,42.584 13,42.059 13,41.5 C13,40.941 12.81,40.416 12.5,40 z" fill="inherit" id="highway-motorway-link-casing2" opacity="0.5"/>
-      <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-motorway-link-stroke2" opacity="0.5"/>
-      <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-      <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    </g>
-    <path d="M27,39 C25.631,39 24.5,40.131 24.5,41.5 C24.5,42.869 25.631,44 27,44 C28.485,44.542 30.651,46.959 32.344,49.781 L35.344,54.781 C35.347,54.785 35.372,54.777 35.375,54.781 C35.815,55.509 36.597,56 37.5,56 C38.869,56 40,54.869 40,53.5 C40,53.034 39.852,52.594 39.625,52.219 L39.656,52.188 L36.656,47.188 C34.575,43.719 31.766,41.094 28.812,39.813 C28.354,39.32 27.717,39 27,39 z" fill="inherit" id="highway-motorway-link-casing1"/>
-    <path d="M29.469,41.312 C29.474,41.376 29.5,41.436 29.5,41.5 C29.5,42.434 28.97,43.253 28.199,43.681 C29.981,44.753 32.223,47.633 33.219,49.25 L35.187,52.531 C35.57,51.636 36.473,51 37.5,51 C37.596,51 37.688,51.02 37.781,51.031 L35.781,47.719 C34.066,44.86 31.632,42.315 29.469,41.312 z M37.5,53 C37.212,53 37,53.212 37,53.5 C37,53.597 37.02,53.676 37.062,53.75 L37.906,53.25 C37.82,53.112 37.684,53 37.5,53 z" fill="currentColor" id="highway-motorway-link-stroke1"/>
-    <path d="M39,53.5 C39,54.328 38.328,55 37.5,55 C36.672,55 36,54.328 36,53.5 C36,52.672 36.672,52 37.5,52 C38.328,52 39,52.672 39,53.5 z" fill="#FFFFFF"/>
-    <path d="M28.5,41.5 C28.5,42.328 27.828,43 27,43 C26.172,43 25.5,42.328 25.5,41.5 C25.5,40.672 26.172,40 27,40 C27.828,40 28.5,40.672 28.5,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-motorway.svg b/svg/iD-sprite/presets/highway-motorway.svg
index ebd83a1cc..ee7c03858 100644
--- a/svg/iD-sprite/presets/highway-motorway.svg
+++ b/svg/iD-sprite/presets/highway-motorway.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-motorway-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-motorway-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M13,14 L8,36 L16.5,36 L19.5,14 L13,14 z M21,14 L18.5,36 L27,36 L28,14 L21,14 z M32,14 L33,36 L40.5,36 L38,14 L32,14 z M39.5,14 L42.5,36 L52,36 L46.5,14 L39.5,14 z" fill="#444444"/>
   <path d="M42.75,20 L42,16 L44.875,16 L45.625,20 z M38,33 L37.5,29 L34.5,29 L35,33 z M11.5,33 L12,29 L15,29 L14.5,33 z M23.25,20 L23.562,16 L26.438,16 L26.125,20 z" fill="currentColor" id="highway-motorway-stroke2"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-path.svg b/svg/iD-sprite/presets/highway-path.svg
index 3c9fb869a..df21a8604 100644
--- a/svg/iD-sprite/presets/highway-path.svg
+++ b/svg/iD-sprite/presets/highway-path.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="highway-path-stroke1"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="highway-path-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22,36 L25,25 L28,14 L32,14 L35,25 L38,36 z" fill="currentColor" id="highway-path-stroke2"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-primary-link.svg b/svg/iD-sprite/presets/highway-primary-link.svg
index f28f5cbf2..1a460ee81 100644
--- a/svg/iD-sprite/presets/highway-primary-link.svg
+++ b/svg/iD-sprite/presets/highway-primary-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <defs>
     <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="-780.5" y1="157.987" x2="-782" y2="152.362" gradientTransform="matrix(1, 0, 0, 1, 820, -132.362)">
       <stop offset="0" stop-color="#444444"/>
@@ -12,16 +12,4 @@
     <path d="M31.5,33 L32.75,29 L29.75,29 L28.5,33 z M23.5,21 L25.5,17.5 L28.5,17.5 L26.5,21 z" fill="currentColor" id="highway-primary-link-stroke3"/>
     <path d="M41,36 L41,32 C41,27.548 33,26.172 33,22 C33,19 33.375,14 33.375,14 L38.375,14 C38.375,14 38,17.996 38,20 C38,22 46.595,24.072 48,28 L50,36 z" fill="url(#Gradient_1)"/>
   </g>
-  <g>
-    <g>
-      <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 L10.5,39 z M12.5,40 L47.5,40 C47.19,40.416 47,40.941 47,41.5 C47,42.059 47.19,42.584 47.5,43 L12.5,43 C12.81,42.584 13,42.059 13,41.5 C13,40.941 12.81,40.416 12.5,40 z" fill="inherit" id="highway-primary-link-casing2" opacity="0.5"/>
-      <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-primary-link-stroke2" opacity="0.5"/>
-      <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-      <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    </g>
-    <path d="M27,39 C25.631,39 24.5,40.131 24.5,41.5 C24.5,42.869 25.631,44 27,44 C28.485,44.542 30.651,46.959 32.344,49.781 L35.344,54.781 C35.347,54.785 35.372,54.777 35.375,54.781 C35.815,55.509 36.597,56 37.5,56 C38.869,56 40,54.869 40,53.5 C40,53.034 39.852,52.594 39.625,52.219 L39.656,52.188 L36.656,47.188 C34.575,43.719 31.766,41.094 28.812,39.813 C28.354,39.32 27.717,39 27,39 z" fill="inherit" id="highway-primary-link-casing1"/>
-    <path d="M29.469,41.312 C29.474,41.376 29.5,41.436 29.5,41.5 C29.5,42.434 28.97,43.253 28.199,43.681 C29.981,44.753 32.223,47.633 33.219,49.25 L35.187,52.531 C35.57,51.636 36.473,51 37.5,51 C37.596,51 37.688,51.02 37.781,51.031 L35.781,47.719 C34.066,44.86 31.632,42.315 29.469,41.312 z M37.5,53 C37.212,53 37,53.212 37,53.5 C37,53.597 37.02,53.676 37.062,53.75 L37.906,53.25 C37.82,53.112 37.684,53 37.5,53 z" fill="currentColor" id="highway-primary-link-stroke1"/>
-    <path d="M39,53.5 C39,54.328 38.328,55 37.5,55 C36.672,55 36,54.328 36,53.5 C36,52.672 36.672,52 37.5,52 C38.328,52 39,52.672 39,53.5 z" fill="#FFFFFF"/>
-    <path d="M28.5,41.5 C28.5,42.328 27.828,43 27,43 C26.172,43 25.5,42.328 25.5,41.5 C25.5,40.672 26.172,40 27,40 C27.828,40 28.5,40.672 28.5,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-primary.svg b/svg/iD-sprite/presets/highway-primary.svg
index 8c48e1cec..1fcc41796 100644
--- a/svg/iD-sprite/presets/highway-primary.svg
+++ b/svg/iD-sprite/presets/highway-primary.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-primary-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-primary-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M17,14 L13,36 L20,36 L20.281,34 L22.219,34 L22,36 L29,36 L29.5,14 L24.5,14 L24.156,17 L22.594,17 L23,14 L17,14 z M30.5,14 L31,36 L38,36 L37.781,34 L39.719,34 L40,36 L47,36 L42.5,14 L37,14 L37.406,17 L35.844,17 L35.5,14 L30.5,14 z M22.469,18 L24.031,18 L23.719,21 L22.031,21 L22.469,18 z M35.969,18 L37.531,18 L37.969,21 L36.281,21 L35.969,18 z M21.906,22 L23.594,22 L23.25,25 L21.5,25 L21.906,22 z M36.406,22 L38.094,22 L38.5,25 L36.75,25 L36.406,22 z M21.375,26 L23.125,26 L22.781,29 L20.969,29 L21.375,26 z M36.875,26 L38.625,26 L39.031,29 L37.219,29 L36.875,26 z M20.812,30 L22.688,30 L22.344,33 L20.406,33 L20.812,30 z M37.312,30 L39.188,30 L39.594,33 L37.656,33 L37.312,30 z" fill="#444444"/>
   <path d="M19,33 L19.5,29 L16.5,29 L16,33 z M42,20 L41.25,16 L38.375,16 L39.125,20 z M36,33 L35.5,29 L32.5,29 L33,33 z M25.25,20 L25.562,16 L28.438,16 L28.125,20 z" fill="currentColor" id="highway-primary-stroke2"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-residential.svg b/svg/iD-sprite/presets/highway-residential.svg
index 2423fb241..db872ac38 100644
--- a/svg/iD-sprite/presets/highway-residential.svg
+++ b/svg/iD-sprite/presets/highway-residential.svg
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.5,15 L19.625,21 L18,21 L17,22 L17,24 L18.406,24 L18,25 L18,30 L18,31 L18,31 C18,31 18.608,31.608 19,32 L20,32 L24,32 L26,33 L34,33 L36,32 L40,32 L41,32 L42,31 L42,31 L42,30 L42,25 L41.594,24 L43,24 L43,22 L42,21 L40.375,21 L37.5,15 z M23.5,18 L36.5,18 L38,22 L37,23 L23,23 L22,22 z M21,26 L24,26 L25,28 L25,29 L21,29 L20,28 L20,27 z M36,26 L39,26 L40,27 L40,28 L39,29 L35,29 L35,28 z M19,33 L19,35 L20,36 L23,36 L24,35 L24,33 z M36,33 L36,35 L37,36 L40,36 L41,35 L41,33 z" fill="#989898"/>
   <path d="M42,12 L46,13.5 L46,31.375 L53,34 L53,21.625 L50,20.5 L50,16.5 L51,16.875 L53,17.625 L53,16.5 L53,7 z" fill="#B5B5B5"/>
   <path d="M44,32.625 L44,34.125 L49,36 L53,36 z" fill="#B5B5B5"/>
   <path d="M16,32.625 L16,34.125 L11,36 L7,36 z" fill="#B5B5B5"/>
   <path d="M18,12 L14,13.5 L14,31.375 L7,34 L7,21.625 L10,20.5 L10,16.5 L9,16.875 L7,17.625 L7,16.5 L7,7 z" fill="#B5B5B5"/>
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-residential-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-residential-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-road.svg b/svg/iD-sprite/presets/highway-road.svg
index 72eaef359..02e90859e 100644
--- a/svg/iD-sprite/presets/highway-road.svg
+++ b/svg/iD-sprite/presets/highway-road.svg
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.57,44.002 48.113,43.584 47.5,42.971 L47.5,43 L12.5,43 L12.5,42.971 C11.996,43.663 11.316,43.918 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.43,38.998 11.887,39.417 12.5,40.029 L12.5,40 L47.5,40 L47.5,40.029 C48.004,39.336 48.684,39.082 49.5,39 z" fill="inherit" id="highway-road-casing1"/>
-    <path d="M47.05,41 L47,41.5 L47.05,42 L12.95,42 L13,41.5 L12.95,41 L47.05,41 z" fill="currentColor" id="highway-road-stroke1"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.375,36 L25.375,25 L28.375,14 L32.375,14 L35.375,25 L38.375,36 z" fill="#989898"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-secondary-link.svg b/svg/iD-sprite/presets/highway-secondary-link.svg
index 1aa50ac40..7cd82c020 100644
--- a/svg/iD-sprite/presets/highway-secondary-link.svg
+++ b/svg/iD-sprite/presets/highway-secondary-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <defs>
     <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="-840.5" y1="157.987" x2="-842" y2="152.362" gradientTransform="matrix(1, 0, 0, 1, 874, -132.362)">
       <stop offset="0" stop-color="#444444"/>
@@ -12,16 +12,4 @@
     <path d="M25.5,33 L26.75,29 L23.75,29 L22.5,33 z" fill="currentColor" id="highway-secondary-link-stroke3"/>
     <path d="M35,36 L35,32 C35,27.548 27,26.172 27,22 C27,19 27.375,14 27.375,14 L32.375,14 C32.375,14 32,17.996 32,20 C32,22 40.595,24.072 42,28 L44,36 z" fill="url(#Gradient_1)"/>
   </g>
-  <g>
-    <g id="g6164">
-      <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 L10.5,39 z M12.5,40 L47.5,40 C47.19,40.416 47,40.941 47,41.5 C47,42.059 47.19,42.584 47.5,43 L12.5,43 C12.81,42.584 13,42.059 13,41.5 C13,40.941 12.81,40.416 12.5,40 z" fill="inherit" id="highway-secondary-link-casing2" opacity="0.5"/>
-      <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-secondary-link-stroke2" opacity="0.5"/>
-      <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF" id="path6168"/>
-      <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF" id="path6170"/>
-    </g>
-    <path d="M27,39 C25.631,39 24.5,40.131 24.5,41.5 C24.5,42.869 25.631,44 27,44 C28.485,44.542 30.65,46.959 32.344,49.781 L35.344,54.781 C35.347,54.785 35.372,54.777 35.375,54.781 C35.815,55.509 36.597,56 37.5,56 C38.869,56 40,54.869 40,53.5 C40,53.034 39.852,52.594 39.625,52.219 L39.656,52.188 L36.656,47.188 C34.575,43.719 31.766,41.094 28.812,39.813 C28.354,39.32 27.717,39 27,39 z" fill="inherit" id="highway-secondary-link-casing1"/>
-    <path d="M29.469,41.312 C29.474,41.376 29.5,41.436 29.5,41.5 C29.5,42.434 28.97,43.253 28.199,43.681 C29.981,44.753 32.223,47.633 33.219,49.25 L35.187,52.531 C35.57,51.636 36.473,51 37.5,51 C37.596,51 37.688,51.02 37.781,51.031 L35.781,47.719 C34.066,44.86 31.632,42.315 29.469,41.312 z M37.5,53 C37.212,53 37,53.212 37,53.5 C37,53.597 37.02,53.676 37.063,53.75 L37.906,53.25 C37.82,53.112 37.684,53 37.5,53 z" fill="currentColor" id="highway-secondary-link-stroke1"/>
-    <path d="M39,53.5 C39,54.328 38.328,55 37.5,55 C36.672,55 36,54.328 36,53.5 C36,52.672 36.672,52 37.5,52 C38.328,52 39,52.672 39,53.5 z" fill="#FFFFFF"/>
-    <path d="M28.5,41.5 C28.5,42.328 27.828,43 27,43 C26.172,43 25.5,42.328 25.5,41.5 C25.5,40.672 26.172,40 27,40 C27.828,40 28.5,40.672 28.5,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-secondary.svg b/svg/iD-sprite/presets/highway-secondary.svg
index f0e1f2387..8aa0e7d3b 100644
--- a/svg/iD-sprite/presets/highway-secondary.svg
+++ b/svg/iD-sprite/presets/highway-secondary.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-secondary-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-secondary-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22,14 L18,36 L29,36 L29.5,14 L22,14 z M30.5,14 L31,36 L42,36 L37.5,14 L30.5,14 z" fill="#444444"/>
   <path d="M35,33 L34.5,29 L37.5,29 L38,33 z M23.25,20 L23.562,16 L26.438,16 L26.125,20 z" fill="currentColor" id="highway-secondary-stroke2"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-service.svg b/svg/iD-sprite/presets/highway-service.svg
index e2d02d260..ec1e6246f 100644
--- a/svg/iD-sprite/presets/highway-service.svg
+++ b/svg/iD-sprite/presets/highway-service.svg
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.57,44.002 48.113,43.584 47.5,42.971 L47.5,43 L12.5,43 L12.5,42.971 C11.996,43.663 11.316,43.918 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.43,38.998 11.887,39.416 12.5,40.029 L12.5,40 L47.5,40 L47.5,40.029 C48.004,39.336 48.684,39.082 49.5,39 z" fill="inherit" id="highway-service-casing1"/>
-    <path d="M47.05,41 L47,41.5 L47.05,42 L12.95,42 L13,41.5 L12.95,41 L47.05,41 z" fill="currentColor" id="highway-service-stroke1"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.5,15 L19.625,21 L18,21 L17,22 L17,24 L18.406,24 L18,25 L18,30 L18,31 L18,31 C18,31 18.608,31.608 19,32 L20,32 L24,32 L26,33 L34,33 L36,32 L40,32 L41,32 L42,31 L42,31 L42,30 L42,25 L41.594,24 L43,24 L43,22 L42,21 L40.375,21 L37.5,15 z M23.5,18 L36.5,18 L38,22 L37,23 L23,23 L22,22 z M21,26 L24,26 L25,28 L25,29 L21,29 L20,28 L20,27 z M36,26 L39,26 L40,27 L40,28 L39,29 L35,29 L35,28 z M19,33 L19,35 L20,36 L23,36 L24,35 L24,33 z M36,33 L36,35 L37,36 L40,36 L41,35 L41,33 z" fill="#989898"/>
   <path d="M44,32.625 L44,34.125 L49,36 L53,36 z" fill="#989898"/>
   <path d="M16,32.625 L16,34.125 L11,36 L7,36 z" fill="#989898"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-steps.svg b/svg/iD-sprite/presets/highway-steps.svg
index 8ec6f5885..1afe05f6f 100644
--- a/svg/iD-sprite/presets/highway-steps.svg
+++ b/svg/iD-sprite/presets/highway-steps.svg
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M27,14 L27,16 L26,18 L26,20 L25,22 L25,24 L24,26 L24,28 L23,30 L23,32 L22,34 L22,36 L30,36 L38,36 L38,34 L37,32 L37,30 L36,28 L36,26 L35,24 L35,22 L34,20 L34,18 L33,16 L33,14 L30,14 L27,14 z" fill="currentColor" id="highway-steps-stroke3" opacity="0.496"/>
   <path d="M23,32 L23,30 L37,30 L37,32 z M38,36 L38,34 L22,34 L22,36 z M36,28 L36,26 L24,26 L24,28 z M35,24 L35,22 L25,22 L25,24 z M34,20 L34,18 L26,18 L26,20 z M33,16 L33,14 L27,14 L27,16 z" fill="currentColor" id="highway-steps-stroke2"/>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="highway-steps-stroke1"/>
-  <path d="M43,41 L46,41 L46,42 L43,42 z M33,42 L36,42 L36,41 L33,41 z M23,42 L26,42 L26,41 L23,41 z M13,42 L16,42 L16,41 L13,41 z M18,42 L21,42 L21,41 L18,41 z M28,42 L31,42 L31,41 L28,41 z M38,42 L41,42 L41,41 L38,41 z" fill="inherit" id="highway-steps-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-tertiary-link.svg b/svg/iD-sprite/presets/highway-tertiary-link.svg
index b7ccebc18..875390747 100644
--- a/svg/iD-sprite/presets/highway-tertiary-link.svg
+++ b/svg/iD-sprite/presets/highway-tertiary-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <defs>
     <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="-900.5" y1="157.987" x2="-902" y2="152.362" gradientTransform="matrix(1, 0, 0, 1, 934, -132.362)">
       <stop offset="0" stop-color="#444444"/>
@@ -10,16 +10,4 @@
   <path d="M27,14 L25.781,17 L24.062,17 L23.656,18 L25.375,18 L24.125,21 L22.375,21 L21.937,22 L23.719,22 L22.5,25 L20.687,25 L20.25,26 L22.094,26 L20.875,29 L18.969,29 L18.562,30 L20.469,30 L19.219,33 L17.281,33 L16.844,34 L18.812,34 L18,36 L29,36 L30.156,28.375 C28.72,27.032 27,25.193 27,24 L27,22 L30.906,23.5 L32.344,14 L27,14 z" fill="#B5B5B5"/>
   <path d="M25.5,33 L26.75,29 L23.75,29 L22.5,33 z" fill="currentColor" id="highway-tertiary-link-stroke3"/>
   <path d="M35,36 L35,32 C35,27.548 27,26.172 27,22 C27,19 27.375,14 27.375,14 L32.375,14 C32.375,14 32,17.996 32,20 C32,22 40.595,24.072 42,28 L44,36 z" fill="url(#Gradient_1)"/>
-  <g>
-    <g>
-      <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 L10.5,39 z M12.5,40 L47.5,40 C47.19,40.416 47,40.941 47,41.5 C47,42.059 47.19,42.584 47.5,43 L12.5,43 C12.81,42.584 13,42.059 13,41.5 C13,40.941 12.81,40.416 12.5,40 z" fill="inherit" id="highway-tertiary-link-casing2" opacity="0.5"/>
-      <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-tertiary-link-stroke2" opacity="0.5"/>
-      <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-      <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    </g>
-    <path d="M27,39 C25.631,39 24.5,40.131 24.5,41.5 C24.5,42.869 25.631,44 27,44 C28.485,44.542 30.65,46.959 32.344,49.781 L35.344,54.781 C35.347,54.785 35.372,54.777 35.375,54.781 C35.815,55.509 36.597,56 37.5,56 C38.869,56 40,54.869 40,53.5 C40,53.034 39.852,52.594 39.625,52.219 L39.656,52.188 L36.656,47.188 C34.402,43.422 31.368,40.841 28.011,39.225 C27.703,39.082 27.362,39 27,39 z" fill="inherit" id="highway-tertiary-link-casing1"/>
-    <path d="M29.469,41.312 C29.474,41.376 29.5,41.436 29.5,41.5 C29.5,42.434 28.97,43.253 28.199,43.681 C29.981,44.753 32.223,47.633 33.219,49.25 L35.187,52.531 C35.57,51.636 36.473,51 37.5,51 C37.596,51 37.688,51.02 37.781,51.031 L35.781,47.719 C34.066,44.86 31.632,42.315 29.469,41.312 z M37.5,53 C37.212,53 37,53.212 37,53.5 C37,53.597 37.02,53.676 37.063,53.75 L37.906,53.25 C37.82,53.112 37.684,53 37.5,53 z" fill="currentColor" id="highway-tertiary-link-stroke1"/>
-    <path d="M39,53.5 C39,54.328 38.328,55 37.5,55 C36.672,55 36,54.328 36,53.5 C36,52.672 36.672,52 37.5,52 C38.328,52 39,52.672 39,53.5 z" fill="#FFFFFF"/>
-    <path d="M28.5,41.5 C28.5,42.328 27.828,43 27,43 C26.172,43 25.5,42.328 25.5,41.5 C25.5,40.672 26.172,40 27,40 C27.828,40 28.5,40.672 28.5,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-tertiary.svg b/svg/iD-sprite/presets/highway-tertiary.svg
index 63b383b42..c5968d30c 100644
--- a/svg/iD-sprite/presets/highway-tertiary.svg
+++ b/svg/iD-sprite/presets/highway-tertiary.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-tertiary-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-tertiary-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22,14 L18,36 L29,36 L29.031,34 L30.969,34 L31,36 L42,36 L37.5,14 L30.5,14 L30.562,17 L29.437,17 L29.5,14 L22,14 z M29.406,18 L30.594,18 L30.656,21 L29.344,21 L29.406,18 z M29.313,22 L30.688,22 L30.75,25 L29.25,25 L29.313,22 z M29.219,26 L30.781,26 L30.844,29 L29.156,29 L29.219,26 z M29.125,30 L30.875,30 L30.938,33 L29.063,33 L29.125,30 z" fill="#444444"/>
   <path d="M35,33 L34.5,29 L37.5,29 L38,33 z M23.25,20 L23.562,16 L26.438,16 L26.125,20 z" fill="currentColor" id="highway-tertiary-stroke2"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-track.svg b/svg/iD-sprite/presets/highway-track.svg
index 89958082c..eb76c8653 100644
--- a/svg/iD-sprite/presets/highway-track.svg
+++ b/svg/iD-sprite/presets/highway-track.svg
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.57,44.002 48.113,43.584 47.5,42.971 L47.5,43 L12.5,43 L12.5,42.971 C11.996,43.663 11.316,43.918 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.43,38.998 11.887,39.417 12.5,40.029 L12.5,40 L47.5,40 L47.5,40.029 C48.004,39.336 48.684,39.082 49.5,39 z" fill="inherit" id="highway-track-casing1"/>
-    <path d="M47.05,41 L47,41.5 L47.05,42 L12.95,42 L13,41.5 L12.95,41 L47.05,41 z" fill="currentColor" id="highway-track-stroke1"/>
-    <path d="M13.5,40 L13.5,41 L16,41 L16,40 z M18,40 L18,41 L21,41 L21,40 z M23,40 L23,41 L26,41 L26,40 z M28,40 L28,41 L31,41 L31,40 z M33,40 L33,41 L36,41 L36,40 z M38,40 L38,41 L41,41 L41,40 z M43,40 L43,41 L46,41 L46,40 z M13.5,42 L13.5,43 L16,43 L16,42 z M18,42 L18,43 L21,43 L21,42 z M23,42 L23,43 L26,43 L26,42 z M28,42 L28,43 L31,43 L31,42 z M33,42 L33,43 L36,43 L36,42 z M38,42 L38,43 L41,43 L41,42 z M43,42 L43,43 L46,43 L46,42 z" fill="currentColor" id="highway-track-stroke2" opacity="0.503"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M27,14 L21,36 L27.5,36 L29,14 L27,14 z M31,14 L32.5,36 L39,36 L33,14 L31,14 z" fill="#989898"/>
   <path d="M43,29 L43,32.25 L44,32.625 L44,29 L43,29 z M41,30 L41,32.5 L42,32.875 L42,30 L41,30 z M47,30 L47,33.75 L47.656,34 L48,34 L48,30 L47,30 z M45,31 L45,34 L46,34.375 L46,31 L45,31 z M49,32 L49,35.5 L50,35.875 L50,32 L49,32 z" fill="#989898"/>
   <path d="M17,29 L17,32.25 L16,32.625 L16,29 L17,29 z M19,30 L19,32.5 L18,32.875 L18,30 L19,30 z M13,30 L13,33.75 L12.344,34 L12,34 L12,30 L13,30 z M15,31 L15,34 L14,34.375 L14,31 L15,31 z M11,32 L11,35.5 L10,35.875 L10,32 L11,32 z" fill="#989898"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-trunk-link.svg b/svg/iD-sprite/presets/highway-trunk-link.svg
index 0028e07ee..d0ad96567 100644
--- a/svg/iD-sprite/presets/highway-trunk-link.svg
+++ b/svg/iD-sprite/presets/highway-trunk-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <defs>
     <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="-720.5" y1="157.987" x2="-722" y2="152.362" gradientTransform="matrix(1, 0, 0, 1, 760, -132.362)">
       <stop offset="0" stop-color="#444444"/>
@@ -15,16 +15,4 @@
     </g>
     <path d="M41,36 L41,32 C41,27.548 33,26.172 33,22 C33,19 33.375,14 33.375,14 L38.375,14 C38.375,14 38,17.996 38,20 C38,22 46.595,24.072 48,28 L50,36 z" fill="url(#Gradient_1)"/>
   </g>
-  <g>
-    <g>
-      <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 L10.5,39 z M12.5,40 L47.5,40 C47.19,40.416 47,40.941 47,41.5 C47,42.059 47.19,42.584 47.5,43 L12.5,43 C12.81,42.584 13,42.059 13,41.5 C13,40.941 12.81,40.416 12.5,40 z" fill="inherit" id="highway-trunk-link-casing2" opacity="0.5"/>
-      <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-trunk-link-stroke2" opacity="0.5"/>
-      <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-      <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-    </g>
-    <path d="M27,39 C25.631,39 24.5,40.131 24.5,41.5 C24.5,42.869 25.631,44 27,44 C28.485,44.542 30.651,46.959 32.344,49.781 L35.344,54.781 C35.347,54.785 35.372,54.777 35.375,54.781 C35.815,55.509 36.597,56 37.5,56 C38.869,56 40,54.869 40,53.5 C40,53.034 39.852,52.594 39.625,52.219 L39.656,52.188 L36.656,47.188 C34.575,43.719 31.766,41.094 28.812,39.813 C28.354,39.32 27.717,39 27,39 z" fill="inherit" id="highway-trunk-link-casing1"/>
-    <path d="M29.469,41.312 C29.474,41.376 29.5,41.436 29.5,41.5 C29.5,42.434 28.97,43.253 28.199,43.681 C29.981,44.753 32.223,47.633 33.219,49.25 L35.187,52.531 C35.57,51.636 36.473,51 37.5,51 C37.596,51 37.688,51.02 37.781,51.031 L35.781,47.719 C34.066,44.86 31.632,42.315 29.469,41.312 z M37.5,53 C37.212,53 37,53.212 37,53.5 C37,53.597 37.02,53.676 37.062,53.75 L37.906,53.25 C37.82,53.112 37.684,53 37.5,53 z" fill="currentColor" id="highway-trunk-link-stroke1"/>
-    <path d="M39,53.5 C39,54.328 38.328,55 37.5,55 C36.672,55 36,54.328 36,53.5 C36,52.672 36.672,52 37.5,52 C38.328,52 39,52.672 39,53.5 z" fill="#FFFFFF"/>
-    <path d="M28.5,41.5 C28.5,42.328 27.828,43 27,43 C26.172,43 25.5,42.328 25.5,41.5 C25.5,40.672 26.172,40 27,40 C27.828,40 28.5,40.672 28.5,41.5 z" fill="#FFFFFF"/>
-  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-trunk.svg b/svg/iD-sprite/presets/highway-trunk.svg
index dc295bd32..8c55645fb 100644
--- a/svg/iD-sprite/presets/highway-trunk.svg
+++ b/svg/iD-sprite/presets/highway-trunk.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-trunk-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-trunk-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M15,14 L10,36 L17.5,36 L20.5,14 L15,14 z M22,14 L19.5,36 L29,36 L29.5,14 L22,14 z M30.5,14 L31,36 L40,36 L37.5,14 L30.5,14 z M39,14 L42,36 L50,36 L44.5,14 L39,14 z" fill="#444444"/>
   <path d="M41.75,20 L41,16 L43.875,16 L44.625,20 z M37,33 L36.5,29 L33.5,29 L34,33 z M13.5,33 L14,29 L17,29 L16.5,33 z M23.25,20 L23.562,16 L26.438,16 L26.125,20 z" fill="currentColor" id="highway-trunk-stroke2"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/highway-unclassified.svg b/svg/iD-sprite/presets/highway-unclassified.svg
index 2ceff69db..375fc06fe 100644
--- a/svg/iD-sprite/presets/highway-unclassified.svg
+++ b/svg/iD-sprite/presets/highway-unclassified.svg
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <g>
-    <path d="M10.5,39 C9.119,39 8,40.119 8,41.5 C8,42.881 9.119,44 10.5,44 L49.5,44 C50.881,44 52,42.881 52,41.5 C52,40.119 50.881,39 49.5,39 z" fill="inherit" id="highway-unclassified-casing1"/>
-    <path d="M12.5,40 C12.81,40.416 13,40.941 13,41.5 C13,42.059 12.81,42.584 12.5,43 L47.5,43 C47.19,42.584 47,42.059 47,41.5 C47,40.941 47.19,40.416 47.5,40 L12.5,40 z" fill="currentColor" id="highway-unclassified-stroke1"/>
-    <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-    <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  </g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.5,15 L19.625,21 L18,21 L17,22 L17,24 L18.406,24 L18,25 L18,30 L18,31 L18,31 C18,31 18.608,31.608 19,32 L20,32 L24,32 L26,33 L34,33 L36,32 L40,32 L41,32 L42,31 L42,31 L42,30 L42,25 L41.594,24 L43,24 L43,22 L42,21 L40.375,21 L37.5,15 z M23.5,18 L36.5,18 L38,22 L37,23 L23,23 L22,22 z M21,26 L24,26 L25,28 L25,29 L21,29 L20,28 L20,27 z M36,26 L39,26 L40,27 L40,28 L39,29 L35,29 L35,28 z M19,33 L19,35 L20,36 L23,36 L24,35 L24,33 z M36,33 L36,35 L37,36 L40,36 L41,35 L41,33 z" fill="#989898"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/other-line.svg b/svg/iD-sprite/presets/other-line.svg
index 79b401464..02e90859e 100644
--- a/svg/iD-sprite/presets/other-line.svg
+++ b/svg/iD-sprite/presets/other-line.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.57,44.002 48.113,43.584 47.5,42.971 L47.5,43 L12.5,43 L12.5,42.971 C11.996,43.663 11.316,43.918 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.43,38.998 11.887,39.416 12.5,40.029 L12.5,40 L47.5,40 L47.5,40.029 C48.004,39.336 48.684,39.082 49.5,39 z" fill="inherit" id="other-line-casing1"/>
-  <path d="M47.05,41 L47,41.5 L47.05,42 L12.95,42 L13,41.5 L12.95,41 L47.05,41 z" fill="currentColor" id="other-line-stroke1"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.375,36 L25.375,25 L28.375,14 L32.375,14 L35.375,25 L38.375,36 z" fill="#989898"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/pipeline-line.svg b/svg/iD-sprite/presets/pipeline-line.svg
index 7aa41868d..c85597f0f 100644
--- a/svg/iD-sprite/presets/pipeline-line.svg
+++ b/svg/iD-sprite/presets/pipeline-line.svg
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <g>
     <path d="M16.5,15 C15.119,15 14,17.239 14,20 C14,22.761 15.119,25 16.5,25 L27,25 L27,15 L16.5,15 z M31,15 L31,25 L45.5,25 L45.5,15 L31,15 z" fill="#B5B5B5"/>
     <path d="M48,20 C48,22.761 46.881,25 45.5,25 C44.119,25 43,22.761 43,20 C43,17.239 44.119,15 45.5,15 C46.881,15 48,17.239 48,20 z" fill="#989898"/>
     <path d="M28,12 L28,26 L26,36 L28,36 L29.594,28 L34.406,28 L36,36 L38,36 L36,26 L35,26 L30,26 L30,12 L28,12 z M34,12 L34,14 L36,14 L36,12 L34,12 z M22,15 C21,15 19.5,17.239 19.5,20 C19.5,22.761 21,25 22,25 L24,25 C22.619,25 21,22.761 21,20 C21,17.239 22.619,15 24,15 L22,15 z M37,15 C36,15 34.5,17.239 34.5,20 C34.5,22.761 36,25 37,25 L39,25 C37.619,25 36,22.761 36,20 C36,17.239 37.619,15 39,15 L37,15 z M45.5,15 C44.119,15 43,17.239 43,20 C43,22.761 44.119,25 45.5,25 C46.881,25 48,22.761 48,20 C48,17.239 46.881,15 45.5,15 z" fill="#989898"/>
   </g>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.076,43.93 47.556,43.207 47.05,42 L12.95,42 C12.591,43.231 11.753,43.874 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.924,39.069 12.443,39.793 12.95,41 L47.05,41 C47.409,39.768 48.247,39.126 49.5,39 z" fill="currentColor" id="pipeline-line-stroke"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/piste-line.svg b/svg/iD-sprite/presets/piste-line.svg
deleted file mode 100644
index 1b4c703f2..000000000
--- a/svg/iD-sprite/presets/piste-line.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M41.768,20.834 C41.768,22.169 40.686,23.251 39.351,23.251 C38.016,23.251 36.934,22.169 36.934,20.834 C36.934,19.499 38.016,18.417 39.351,18.417 C40.686,18.417 41.768,19.499 41.768,20.834 z M39.705,32.742 C39.605,32.549 39.37,32.47 39.174,32.564 C38.07,33.24 36.723,33.388 35.5,32.967 L25.3,27.859 L29.683,25.668 L29.683,20.834 L32.1,22.042 L32.1,26.876 L34.517,28.085 L36.934,26.876 L34.517,25.668 L34.517,18.417 L29.683,16 L27.266,17.208 L27.266,24.459 L22.883,26.651 L18.581,24.508 C18.381,24.41 18.139,24.493 18.041,24.693 C17.943,24.893 18.026,25.135 18.226,25.233 L35.145,33.692 C35.654,33.91 36.204,34.014 36.757,33.998 C37.723,33.982 38.672,33.739 39.528,33.289 C39.727,33.19 39.808,32.949 39.709,32.749 C39.708,32.747 39.707,32.744 39.705,32.742 z" fill="currentColor" id="piste-line-stroke2"/>
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="piste-line-stroke1"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="piste-line-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/power-line.svg b/svg/iD-sprite/presets/power-line.svg
index eb83c42f6..38f5e3825 100644
--- a/svg/iD-sprite/presets/power-line.svg
+++ b/svg/iD-sprite/presets/power-line.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.075,43.93 47.557,43.207 47.05,42 L12.95,42 C12.591,43.232 11.753,43.874 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.924,39.069 12.443,39.793 12.95,41 L47.05,41 C47.409,39.768 48.247,39.126 49.5,39 z" fill="currentColor" id="power-line-stroke"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M20,10 L20,11 L22,11 L22,10 L20,10 z M24,10 L24,11 L26,11 L26,10 L24,10 z M34,10 L34,11 L36,11 L36,10 L34,10 z M38,10 L38,11 L40,11 L40,10 L38,10 z M20.312,15 C19.647,18.533 17.267,20.5 15,20.5 L14,20.5 L14,21.5 L15,21.5 C16.042,21.5 17.082,21.196 18,20.594 L18,21.5 L19,21.5 C21.879,21.5 24.615,19.022 25.312,15 L24.312,15 C23.647,18.533 21.267,20.5 19,20.5 L18.125,20.5 C19.686,19.42 20.885,17.509 21.312,15 L20.312,15 z M34.688,15 C35.385,19.022 38.121,21.5 41,21.5 L42,21.5 L42,20.594 C42.918,21.196 43.958,21.5 45,21.5 L46,21.5 L46,20.5 L45,20.5 C42.733,20.5 40.353,18.533 39.688,15 L38.688,15 C39.115,17.509 40.314,19.42 41.875,20.5 L41,20.5 C38.733,20.5 36.353,18.533 35.688,15 L34.688,15 z" fill="#989898"/>
   <path d="M28,10 L28,12 L19,12 L19,14 L28,14 L28,36 L32,36 L32,14 L41,14 L41,12 L32,12 L32,10 L28,10 z" fill="#B5B5B5"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/railway-abandoned.svg b/svg/iD-sprite/presets/railway-abandoned.svg
index 571a1e8f9..c0b9f0508 100644
--- a/svg/iD-sprite/presets/railway-abandoned.svg
+++ b/svg/iD-sprite/presets/railway-abandoned.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <g id="railway-abandoned-base">
     <path d="M36.044,23.685 L34.595,23.803 L35.324,25 L42.751,25 C43.305,25 43.885,24.537 43.751,24 L43.501,23 C43.367,22.463 43.055,22 42.501,22 L40.157,22 L39.688,20 L37.188,20 L37.657,22 L34.831,22 L35.01,22.248 L36.044,23.685 z M39.25,23 C39.526,23 39.75,23.224 39.75,23.5 C39.75,23.776 39.526,24 39.25,24 C38.974,24 38.75,23.776 38.75,23.5 C38.75,23.224 38.974,23 39.25,23 z" fill="#989898"/>
     <path d="M33.846,19 L41.75,19 C42.304,19 42.884,18.537 42.75,18 L42.5,17 C42.366,16.463 42.054,16 41.5,16 L38.719,16 L38.25,14 L36.75,13 L35.75,14 L36.219,16 L32.206,16 L33.519,18.403 L33.846,19 z M38.25,17 C38.526,17 38.75,17.224 38.75,17.5 C38.75,17.776 38.526,18 38.25,18 C37.974,18 37.75,17.776 37.75,17.5 C37.75,17.224 37.974,17 38.25,17 z" fill="#989898"/>
@@ -12,8 +12,4 @@
     <path d="M16.75,35 L18.25,36 L19.25,35 L19.969,32 L17.469,32 z" fill="#989898"/>
   </g>
   <path d="M30.803,31.655 L36.446,31.686 L36.083,31 L34.495,28 L33.678,26.457 L34.976,26.351 L34.154,25 L32.898,22.936 L34.198,22.83 L33.6,22 L31.438,19 L31.429,18.988 L32.642,18.881 L31.066,16 L29.959,13.973 L29.933,14.095 L29.933,13.937 L28.806,16 L27.253,18.844 L28.465,18.95 L28.429,19 L26.267,22 L25.696,22.792 L26.993,22.897 L25.716,25 L24.919,26.313 L26.217,26.42 L25.38,28 L23.792,31 L23.448,31.649 L25.721,31.618 L25.718,31.627 L29.188,31.646 L29.188,32.147 L29.188,32.649 L29.188,36.023 L30.813,36.023 L30.805,32.658 L30.804,32.156 z" fill="#555555" id="railway-abandoned-tree"/>
-  <path d="M49.5,38.937 C50.881,38.937 52,40.056 52,41.437 C52,42.818 50.881,43.937 49.5,43.937 C48.593,43.941 48.127,43.535 47.529,42.937 L12.471,42.937 C11.978,43.615 11.297,43.857 10.5,43.937 C9.119,43.937 8,42.818 8,41.437 C8,40.056 9.119,38.937 10.5,38.937 C11.407,38.933 11.873,39.339 12.471,39.937 L47.529,39.937 C48.022,39.259 48.703,39.017 49.5,38.937 z" fill="currentColor" id="railway-abandoned-stroke"/>
-  <path d="M16,40.937 L16,41.937 L12.95,41.937 L13,41.437 L12.95,40.937 L16,40.937 z M27,40.937 L22,40.937 L22,41.937 L27,41.937 L27,40.937 z M38,40.937 L33,40.937 L33,41.937 L38,41.937 L38,40.937 z M47.05,40.937 L44,40.937 L44,41.937 L47.05,41.937 L47,41.437 L47.05,40.937 z" fill="inherit" id="railway-abandoned-dashes"/>
-  <path d="M51,41.437 C51,42.265 50.328,42.937 49.5,42.937 C48.672,42.937 48,42.265 48,41.437 C48,40.609 48.672,39.937 49.5,39.937 C50.328,39.937 51,40.609 51,41.437 z" fill="#FFFFFF"/>
-  <path d="M12,41.437 C12,42.265 11.328,42.937 10.5,42.937 C9.672,42.937 9,42.265 9,41.437 C9,40.609 9.672,39.937 10.5,39.937 C11.328,39.937 12,40.609 12,41.437 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/railway-disused.svg b/svg/iD-sprite/presets/railway-disused.svg
index 08a5cc4ab..e0b43c118 100644
--- a/svg/iD-sprite/presets/railway-disused.svg
+++ b/svg/iD-sprite/presets/railway-disused.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <g id="railway-disused-base">
     <path d="M17.001,35 L18.501,36 L19.501,35 L20.22,32 L17.72,32 z" fill="#989898"/>
     <path d="M40.282,32 L41.001,35 L42.001,36 L43.501,35 L42.782,32 z" fill="#989898"/>
@@ -9,14 +9,10 @@
     <path d="M18.001,19 L42.001,19 C42.555,19 43.135,18.537 43.001,18 L42.751,17 C42.617,16.463 42.305,16 41.751,16 L38.97,16 L38.501,14 L37.001,13 L36.001,14 L36.47,16 L24.032,16 L24.501,14 L23.501,13 L22.001,14 L21.532,16 L18.251,16 C17.697,16 17.385,16.463 17.251,17 L17.001,18 C16.867,18.537 17.447,19 18.001,19 z M38.501,17 C38.777,17 39.001,17.224 39.001,17.5 C39.001,17.776 38.777,18 38.501,18 C38.225,18 38.001,17.776 38.001,17.5 C38.001,17.224 38.225,17 38.501,17 z M21.501,17 C21.777,17 22.001,17.224 22.001,17.5 C22.001,17.776 21.777,18 21.501,18 C21.225,18 21.001,17.776 21.001,17.5 C21.001,17.224 21.225,17 21.501,17 z" fill="#989898"/>
     <path d="M45,30 L44.75,29 C44.616,28.463 44.304,28 43.75,28 L41.812,28 L41.343,26 L38.843,26 L39.312,28 L35.068,28 L34.753,28.285 C33.666,29.267 33.078,30.226 32.743,31 L44.001,31 C44.554,31 45.134,30.537 45,30 z M40.501,30 C40.225,30 40.001,29.776 40.001,29.5 C40.001,29.224 40.225,29 40.501,29 C40.777,29 41.001,29.224 41.001,29.5 C41.001,29.776 40.777,30 40.501,30 z" fill="#989898"/>
   </g>
-  <path d="M49.501,39 C50.882,39 52.001,40.119 52.001,41.5 C52.001,42.881 50.882,44 49.501,44 C48.595,44.004 48.129,43.598 47.53,43 L12.469,43 C11.977,43.678 11.295,43.92 10.498,44 C9.118,44 7.998,42.881 7.998,41.5 C7.998,40.119 9.118,39 10.498,39 C11.406,38.996 11.872,39.402 12.469,40 L47.53,40 C48.022,39.322 48.704,39.08 49.501,39 z" fill="currentColor" id="railway-disused-stroke"/>
-  <path d="M16.001,41 L16.001,42 L12.951,42 L13.001,41.5 L12.951,41 L16.001,41 z M27.001,41 L22.001,41 L22.001,42 L27.001,42 L27.001,41 z M38.001,41 L33.001,41 L33.001,42 L38.001,42 L38.001,41 z M47.051,41 L44.001,41 L44.001,42 L47.051,42 L47.001,41.5 L47.051,41 z" fill="inherit" id="railway-disused-dashes"/>
-  <path d="M51.001,41.5 C51.001,42.328 50.329,43 49.501,43 C48.673,43 48.001,42.328 48.001,41.5 C48.001,40.672 48.673,40 49.501,40 C50.329,40 51.001,40.672 51.001,41.5 z" fill="#FFFFFF"/>
-  <path d="M12.001,41.5 C12.001,42.328 11.329,43 10.501,43 C9.673,43 9.001,42.328 9.001,41.5 C9.001,40.672 9.673,40 10.501,40 C11.329,40 12.001,40.672 12.001,41.5 z" fill="#FFFFFF"/>
   <g id="railway-disused-weed">
     <path d="M24.407,31.625 C27.445,34.703 26.785,36.01 26.785,36.01 C26.785,36.01 26.996,36.049 28.454,36.049 C28.573,32.92 26.161,32.188 24.407,31.625 z" fill="#555555"/>
     <path d="M30.979,36.031 C31.025,34.017 30.715,32.403 30.23,31.109 C29.739,29.8 29.068,28.827 28.397,28.109 C27.121,26.744 25.851,26.309 25.851,26.309 C26.476,26.836 26.979,27.453 27.401,28.109 C28.013,29.061 28.436,30.099 28.722,31.109 C29.454,33.69 29.325,36.044 29.325,36.044 C29.325,36.044 29.897,36.031 30.979,36.031 z" fill="#555555"/>
     <path d="M33.557,28 C31.753,28.807 31.117,30.824 31.117,30.824 L31.164,31 L31.601,32.64 C31.601,32.64 31.6,31.976 31.974,31 C32.295,30.16 32.901,29.088 34.027,28 C34.11,27.92 34.188,27.84 34.277,27.76 C34.017,27.816 33.779,27.9 33.557,28 z" fill="#555555"/>
     <path d="M32.019,36.038 L33.599,36.029 C33.599,36.029 33.369,33.661 35.595,31.703 C33.861,32.201 32.21,33.783 32.019,36.038 z" fill="#555555"/>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/railway-light-rail.svg b/svg/iD-sprite/presets/railway-light-rail.svg
deleted file mode 100644
index ad54846b9..000000000
--- a/svg/iD-sprite/presets/railway-light-rail.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="railway-light-rail-stroke"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="railway-light-rail-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  <g>
-    <path d="M22.5,32 L25.833,32 L25,33.488 L35,33.488 L34.167,32 L37.5,32 L40,36.464 L36.667,36.464 L35.833,34.976 L24.167,34.976 L23.333,36.464 L20,36.464 L22.5,32 z" fill="#989898"/>
-    <path d="M25.111,10 L19,15.727 L19,29.091 L21.444,31 L38.555,31 L41,29.091 L41,15.727 L34.889,10 L25.111,10 z M25.111,10.955 L34.889,10.955 L34.889,12.864 L25.111,12.864 L25.111,10.955 z M22.667,15.727 L25.111,15.727 L34.889,15.727 L37.333,15.727 L38.555,16.682 L38.555,20.5 L34.889,20.5 L25.111,20.5 L21.444,20.5 L21.444,16.682 L22.667,15.727 z M21.444,25.273 L25.111,25.273 L27.555,27.182 L27.555,28.136 L22.667,28.136 L21.444,27.182 L21.444,25.273 z M34.889,25.273 L38.555,25.273 L38.555,27.182 L37.333,28.136 L32.444,28.136 L32.444,27.182 L34.889,25.273 z" fill="#989898"/>
-    <path d="M25,6 L25,7 L29,7 L29,9 L31,9 L31,7 L35,7 L35,6 z" fill="#989898"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-monorail.svg b/svg/iD-sprite/presets/railway-monorail.svg
deleted file mode 100644
index 809f90914..000000000
--- a/svg/iD-sprite/presets/railway-monorail.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.667,39 C51.047,39 52.167,40.119 52.167,41.5 C52.167,42.881 51.047,44 49.667,44 C48.76,44.004 48.294,43.598 47.696,43 L12.637,43 C12.145,43.678 11.464,43.92 10.667,44 C9.286,44 8.167,42.881 8.167,41.5 C8.167,40.119 9.286,39 10.667,39 C11.573,38.996 12.039,39.402 12.637,40 L47.696,40 C48.188,39.322 48.869,39.08 49.667,39 z" fill="currentColor" id="railway-monorail-stroke"/>
-  <path d="M16.167,41 L16.167,42 L13.116,42 L13.167,41.5 L13.116,41 L16.167,41 z M27.167,41 L22.167,41 L22.167,42 L27.167,42 L27.167,41 z M38.167,41 L33.167,41 L33.167,42 L38.167,42 L38.167,41 z M47.217,41 L44.167,41 L44.167,42 L47.217,42 L47.167,41.5 L47.217,41 z" fill="inherit" id="railway-monorail-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  <path d="M23,31 L21,29 L21,16 L26,10 L34,10 L39,16 L39,29 L37,31 L34,31 L34,34 L32,34 L32,32 L31,31 L29,31 L28,32 L28,34 L26,34 L26,31 L23,31 z M37,24 L33,24 L32,26 L32,27 L36,27 L37,26 L37,24 z M27,24 L23,24 L23,26 L24,27 L28,27 L28,26 L27,24 z M36,16 L24,16 L23,17 L23,21 L37,21 L37,17 L36,16 z M34,11 L26,11 L26,13 L34,13 L34,11 z" fill="#989898"/>
-  <path d="M31,32 L31,35 L33,35 L33,36 L27,36 L27,35 L29,35 L29,32 L31,32 z" fill="#B5B5B5"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-rail.svg b/svg/iD-sprite/presets/railway-rail.svg
index afb6864c1..036b7c561 100644
--- a/svg/iD-sprite/presets/railway-rail.svg
+++ b/svg/iD-sprite/presets/railway-rail.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="railway-rail-stroke"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="railway-rail-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M23.5,13 L22,14 L21.531,16 L18.25,16 C17.696,16 17.384,16.463 17.25,17 L17,18 C16.866,18.537 17.446,19 18,19 L42,19 C42.554,19 43.134,18.537 43,18 L42.75,17 C42.616,16.463 42.304,16 41.75,16 L38.969,16 L38.5,14 L37,13 L36,14 L36.469,16 L24.031,16 L24.5,14 L23.5,13 z M21.5,17 C21.776,17 22,17.224 22,17.5 C22,17.776 21.776,18 21.5,18 C21.224,18 21,17.776 21,17.5 C21,17.224 21.224,17 21.5,17 z M38.5,17 C38.776,17 39,17.224 39,17.5 C39,17.776 38.776,18 38.5,18 C38.224,18 38,17.776 38,17.5 C38,17.224 38.224,17 38.5,17 z M20.562,20 L20.094,22 L17.25,22 C16.696,22 16.384,22.463 16.25,23 L16,24 C15.866,24.537 16.446,25 17,25 L43,25 C43.554,25 44.134,24.537 44,24 L43.75,23 C43.616,22.463 43.304,22 42.75,22 L40.406,22 L39.938,20 L37.438,20 L37.906,22 L22.594,22 L23.062,20 L20.562,20 z M20.5,23 C20.776,23 21,23.224 21,23.5 C21,23.776 20.776,24 20.5,24 C20.224,24 20,23.776 20,23.5 C20,23.224 20.224,23 20.5,23 z M39.5,23 C39.776,23 40,23.224 40,23.5 C40,23.776 39.776,24 39.5,24 C39.224,24 39,23.776 39,23.5 C39,23.224 39.224,23 39.5,23 z M19.156,26 L18.688,28 L16.25,28 C15.696,28 15.384,28.463 15.25,29 L15,30 C14.866,30.537 15.446,31 16,31 L44,31 C44.554,31 45.134,30.537 45,30 L44.75,29 C44.616,28.463 44.304,28 43.75,28 L41.812,28 L41.344,26 L38.844,26 L39.312,28 L21.188,28 L21.656,26 L19.156,26 z M19.5,29 C19.776,29 20,29.224 20,29.5 C20,29.776 19.776,30 19.5,30 C19.224,30 19,29.776 19,29.5 C19,29.224 19.224,29 19.5,29 z M40.5,29 C40.776,29 41,29.224 41,29.5 C41,29.776 40.776,30 40.5,30 C40.224,30 40,29.776 40,29.5 C40,29.224 40.224,29 40.5,29 z M17.719,32 L17,35 L18.5,36 L19.5,35 L20.219,32 L17.719,32 z M40.281,32 L41,35 L42,36 L43.5,35 L42.781,32 L40.281,32 z" fill="#989898"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/railway-subway.svg b/svg/iD-sprite/presets/railway-subway.svg
deleted file mode 100644
index 4f70688bd..000000000
--- a/svg/iD-sprite/presets/railway-subway.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.021,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="railway-subway-stroke"/>
-  <path d="M16,41 L16,42 L12.949,42 L13,41.5 L12.949,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="inherit" id="railway-subway-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  <g>
-    <path d="M22.5,32 L25.833,32 L25,33.488 L35,33.488 L34.167,32 L37.5,32 L40,36.464 L36.667,36.464 L35.833,34.976 L24.167,34.976 L23.333,36.464 L20,36.464 L22.5,32 z" fill="#989898"/>
-    <path d="M25,9 L19,14.739 L19,29.087 L21,31 L39,31 L41,29.087 L41,14.739 L35,9 L25,9 z M26,10.913 L34,10.913 L34,12.826 L26,12.826 L26,10.913 z M22,14.739 L24,14.739 L36,14.739 L38,14.739 L39,15.696 L39,19.522 L36,21.435 L24,21.435 L21,19.522 L21,15.696 L22,14.739 z M21,25.261 L24,25.261 L26,27.174 L26,28.13 L22,28.13 L21,27.174 L21,25.261 z M36,25.261 L39,25.261 L39,27.174 L38,28.13 L34,28.13 L34,27.174 L36,25.261 z" fill="#989898"/>
-    <path d="M23,4 C18,4 14,7 14,13 L14,33 L17,32 L17,13 C17,9 20,7 23,7 L29,7 L31,7 L37,7 C40,7 43,9 43,13 L43,32 L46,33 L46,13 C46,7 41.932,4.822 37,4 L31,4 L29,4 z" fill="#B5B5B5"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-tram.svg b/svg/iD-sprite/presets/railway-tram.svg
deleted file mode 100644
index bfb92be43..000000000
--- a/svg/iD-sprite/presets/railway-tram.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="#000000" id="railway-tram-stroke"/>
-  <path d="M16,41 L16,42 L12.95,42 L13,41.5 L12.95,41 L16,41 z M27,41 L22,41 L22,42 L27,42 L27,41 z M38,41 L33,41 L33,42 L38,42 L38,41 z M47.05,41 L44,41 L44,42 L47.05,42 L47,41.5 L47.05,41 z" fill="#AAAAAA" id="railway-tram-dashes"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-  <g>
-    <path d="M34,33 L35.5,37 L38,37 L36.5,33 z" fill="#989898"/>
-    <path d="M25.469,33 L24,37 L21.5,37 L22.969,33 z" fill="#989898"/>
-    <path d="M26.444,10 L22,16 L22,30 L23.778,32 L36.222,32 L38,30 L38,16 L33.556,10 L26.444,10 z M26.444,11 L33.556,11 L33.556,13 L26.444,13 L26.444,11 z M24.667,16 L26.444,16 L33.556,16 L35.333,16 L36.222,17 L36.222,21 L33.556,21 L26.444,21 L23.778,21 L23.778,17 L24.667,16 z M23.778,26 L26.444,26 L28.222,28 L28.222,29 L24.667,29 L23.778,28 L23.778,26 z M33.556,26 L36.222,26 L36.222,28 L35.333,29 L31.778,29 L31.778,28 L33.556,26 z" fill="#989898"/>
-    <path d="M25,6 L25,7 L29,7 L29,9 L31,9 L31,7 L35,7 L35,6 z" fill="#989898"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/waterway-canal.svg b/svg/iD-sprite/presets/waterway-canal.svg
index 7597c84db..aacfe6233 100644
--- a/svg/iD-sprite/presets/waterway-canal.svg
+++ b/svg/iD-sprite/presets/waterway-canal.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.259,43.944 47.613,43.339 47.154,42.25 L12.846,42.25 C12.509,43.364 11.607,43.888 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.741,39.056 12.387,39.661 12.846,40.75 L47.154,40.75 C47.491,39.636 48.393,39.111 49.5,39 z" fill="currentColor" id="waterway-canal-stroke1"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22,14 C22,14 22.535,15.846 22.344,16.75 C22.122,17.797 20.688,19.5 20.688,19.5 C20.688,19.5 19.253,21.203 19.031,22.25 C18.84,23.154 19.375,25 19.375,25 C19.375,25 19.91,26.846 19.719,27.75 C19.497,28.797 18.063,30.5 18.063,30.5 C18.063,30.5 16.628,32.203 16.406,33.25 C16.215,34.154 16.75,36 16.75,36 L43.75,36 C43.75,36 42.315,34.297 42.094,33.25 C41.903,32.346 42.438,30.5 42.438,30.5 C42.438,30.5 42.972,28.654 42.781,27.75 C42.56,26.703 41.125,25 41.125,25 C41.125,25 39.69,23.297 39.469,22.25 C39.278,21.346 39.813,19.5 39.813,19.5 C39.813,19.5 40.347,17.654 40.156,16.75 C39.935,15.703 38.5,14 38.5,14 z M28,16 L32,16 L34,18 L36,30 L32,32 L28,32 L24,30 L26,18 z M32.2,24 L33,28 L27,28 L27.8,24 z M31.6,21 L32,23 L28,23 L28.4,21 z M31,18 L31.4,20 L28.6,20 L29,18 z" fill="currentColor" id="waterway-canal-stroke2"/>
-  <path d="M24,30 L36,30 L32,32 L28,32 z" fill="currentColor" id="waterway-canal-stroke3" opacity="0.601"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/waterway-ditch.svg b/svg/iD-sprite/presets/waterway-ditch.svg
index ddc97838a..20f45fa77 100644
--- a/svg/iD-sprite/presets/waterway-ditch.svg
+++ b/svg/iD-sprite/presets/waterway-ditch.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.259,43.944 47.613,43.339 47.154,42.25 L12.846,42.25 C12.509,43.364 11.607,43.888 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.741,39.056 12.387,39.661 12.846,40.75 L47.154,40.75 C47.491,39.636 48.393,39.111 49.5,39 z" fill="currentColor" id="waterway-ditch-stroke1"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M24.762,36 L29,14 L31.5,14 L35.738,36 z" fill="currentColor" id="waterway-ditch-stroke2"/>
   <path d="M26,14 L21.75,36 L23.75,36 L28,14 L26,14 z M32.5,14 L36.75,36 L38.75,36 L34.5,14 L32.5,14 z" fill="#B5B5B5"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/waterway-river.svg b/svg/iD-sprite/presets/waterway-river.svg
index dad12e25d..4b3c9b68b 100644
--- a/svg/iD-sprite/presets/waterway-river.svg
+++ b/svg/iD-sprite/presets/waterway-river.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.593,44.004 48.127,43.598 47.529,43 L12.471,43 C11.978,43.678 11.297,43.92 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.407,38.996 11.873,39.402 12.471,40 L47.529,40 C48.022,39.322 48.703,39.08 49.5,39 z" fill="currentColor" id="waterway-river-stroke1"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M16.762,36 C16.762,36 16.226,34.154 16.417,33.25 C16.638,32.203 18.071,30.5 18.071,30.5 C18.071,30.5 19.505,28.797 19.726,27.75 C19.917,26.846 19.381,25 19.381,25 C19.381,25 18.845,23.154 19.036,22.25 C19.257,21.203 20.691,19.5 20.691,19.5 C20.691,19.5 22.124,17.797 22.345,16.75 C22.536,15.846 22,14 22,14 L38.5,14 C38.5,14 39.933,15.703 40.155,16.75 C40.346,17.654 39.81,19.5 39.81,19.5 C39.81,19.5 39.273,21.346 39.464,22.25 C39.686,23.297 41.119,25 41.119,25 C41.119,25 42.553,26.703 42.774,27.75 C42.965,28.654 42.429,30.5 42.429,30.5 C42.429,30.5 41.892,32.346 42.083,33.25 C42.305,34.297 43.738,36 43.738,36 z" fill="currentColor" id="waterway-river-stroke2"/>
   <path d="M17.966,27.759 C17.752,28.559 17.145,29.092 16.612,28.949 C16.078,28.806 15.82,28.041 16.034,27.241 C16.248,26.441 16.855,25.908 17.388,26.051 C17.922,26.194 18.18,26.959 17.966,27.759 z M19.799,17.75 C20.351,16.793 20.217,15.682 19.5,15.268 C18.783,14.854 17.753,15.293 17.201,16.25 C16.649,17.207 16.783,18.318 17.5,18.732 C18.217,19.146 19.247,18.707 19.799,17.75 z M41.422,21.708 C41.208,20.908 41.467,20.143 42,20 C42.534,19.857 43.14,20.39 43.354,21.19 C43.569,21.99 43.31,22.755 42.777,22.898 C42.243,23.041 41.637,22.508 41.422,21.708 z M44.299,32.75 C43.747,31.793 43.881,30.682 44.598,30.268 C45.316,29.854 46.345,30.293 46.897,31.25 C47.449,32.207 47.316,33.318 46.598,33.732 C45.881,34.146 44.851,33.707 44.299,32.75 z" fill="currentColor" id="waterway-river-stroke3" opacity="0.5"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/waterway-stream.svg b/svg/iD-sprite/presets/waterway-stream.svg
index 698401bfb..e84c29ca8 100644
--- a/svg/iD-sprite/presets/waterway-stream.svg
+++ b/svg/iD-sprite/presets/waterway-stream.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M49.5,39 C50.881,39 52,40.119 52,41.5 C52,42.881 50.881,44 49.5,44 C48.259,43.944 47.613,43.339 47.154,42.25 L12.846,42.25 C12.509,43.364 11.607,43.888 10.5,44 C9.119,44 8,42.881 8,41.5 C8,40.119 9.119,39 10.5,39 C11.741,39.056 12.387,39.661 12.846,40.75 L47.154,40.75 C47.491,39.636 48.393,39.111 49.5,39 z" fill="currentColor" id="waterway-stream-stroke1"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
   <path d="M22.762,36 C22.762,36 22.226,34.154 22.417,33.25 C22.638,32.203 24.071,30.5 24.071,30.5 C24.071,30.5 25.505,28.797 25.726,27.75 C25.917,26.846 25.381,25 25.381,25 C25.381,25 24.845,23.154 25.036,22.25 C25.257,21.203 26.691,19.5 26.691,19.5 C26.691,19.5 28.124,17.797 28.345,16.75 C28.536,15.846 28,14 28,14 L32.5,14 C32.5,14 33.933,15.703 34.155,16.75 C34.346,17.654 33.81,19.5 33.81,19.5 C33.81,19.5 33.273,21.346 33.464,22.25 C33.686,23.297 35.119,25 35.119,25 C35.119,25 36.553,26.703 36.774,27.75 C36.965,28.654 36.429,30.5 36.429,30.5 C36.429,30.5 35.892,32.346 36.083,33.25 C36.305,34.297 37.738,36 37.738,36 z" fill="currentColor" id="waterway-stream-stroke2"/>
   <path d="M23.966,27.759 C23.752,28.559 23.145,29.092 22.612,28.949 C22.078,28.806 21.82,28.041 22.034,27.241 C22.248,26.441 22.855,25.908 23.388,26.051 C23.922,26.194 24.18,26.959 23.966,27.759 z M25.799,17.75 C26.351,16.793 26.217,15.682 25.5,15.268 C24.783,14.854 23.753,15.293 23.201,16.25 C22.649,17.207 22.783,18.318 23.5,18.732 C24.217,19.146 25.247,18.707 25.799,17.75 z M35.422,21.708 C35.208,20.908 35.467,20.143 36,20 C36.534,19.857 37.14,20.39 37.354,21.19 C37.569,21.99 37.31,22.755 36.777,22.898 C36.243,23.041 35.637,22.508 35.422,21.708 z M38.299,32.75 C37.747,31.793 37.881,30.682 38.598,30.268 C39.316,29.854 40.345,30.293 40.897,31.25 C41.449,32.207 41.316,33.318 40.598,33.732 C39.881,34.146 38.851,33.707 38.299,32.75 z" fill="currentColor" id="waterway-stream-stroke3" opacity="0.5"/>
-  <path d="M51,41.5 C51,42.328 50.328,43 49.5,43 C48.672,43 48,42.328 48,41.5 C48,40.672 48.672,40 49.5,40 C50.328,40 51,40.672 51,41.5 z" fill="#FFFFFF"/>
-  <path d="M12,41.5 C12,42.328 11.328,43 10.5,43 C9.672,43 9,42.328 9,41.5 C9,40.672 9.672,40 10.5,40 C11.328,40 12,40.672 12,41.5 z" fill="#FFFFFF"/>
-</svg>
\ No newline at end of file
+</svg>