diff --git a/css/20_map.css b/css/20_map.css
index d5e7b0e24..6bb193e7e 100644
--- a/css/20_map.css
+++ b/css/20_map.css
@@ -179,7 +179,7 @@ g.vertex.selected .shadow {
 .preset-icon .icon.iD-other-line {
     color: #989898;
 }
-.preset-icon-line path.casing {
+.preset-icon-container path.line.casing {
     stroke: #afafaf;
 }
 
diff --git a/css/30_highways.css b/css/30_highways.css
index 298ceedbf..cb000b1d7 100644
--- a/css/30_highways.css
+++ b/css/30_highways.css
@@ -1,4 +1,4 @@
-/* highways */
+preset-icon-container/* highways */
 
 /* defaults */
 .preset-icon .icon.tag-highway.other-line {
@@ -486,10 +486,10 @@ path.line.stroke.tag-highway-path {
 }
 path.line.stroke.tag-highway-footway,
 path.line.stroke.tag-highway_bus_stop,
-.preset-icon-line path.casing.tag-highway-footway {
+.preset-icon-container path.casing.tag-highway-footway {
     stroke: #988;
 }
-.preset-icon-line path.stroke.tag-highway-footway:not(.tag-footway-crossing):not(.tag-man_made-pier):not(.tag-public_transport-platform) {
+.preset-icon-container path.stroke.tag-highway-footway:not(.tag-footway-crossing):not(.tag-man_made-pier):not(.tag-public_transport-platform) {
     stroke: #fff;
 }
 
@@ -500,10 +500,10 @@ path.line.stroke.tag-highway_bus_stop,
     fill: #fff;
 }
 path.line.stroke.tag-highway-cycleway,
-.preset-icon-line path.casing.tag-highway-cycleway {
+.preset-icon-container path.casing.tag-highway-cycleway {
     stroke: #58a9ed;
 }
-.preset-icon-line path.stroke.tag-highway-cycleway:not(.tag-crossing) {
+.preset-icon-container path.stroke.tag-highway-cycleway:not(.tag-crossing) {
     stroke: #fff;
 }
 
@@ -514,10 +514,10 @@ path.line.stroke.tag-highway-cycleway,
     fill: #fff;
 }
 path.line.stroke.tag-highway-bridleway,
-.preset-icon-line path.casing.tag-highway-bridleway {
+.preset-icon-container path.casing.tag-highway-bridleway {
     stroke: #e06d5f;
 }
-.preset-icon-line path.stroke.tag-highway-bridleway {
+.preset-icon-container path.stroke.tag-highway-bridleway {
     stroke: #fff;
 }
 
@@ -526,10 +526,10 @@ path.line.stroke.tag-highway-bridleway,
     color: rgb(229, 184, 43);
 }
 path.line.stroke.tag-leisure-track,
-.preset-icon-line path.casing.tag-highway.tag-leisure-track {
+.preset-icon-container path.casing.tag-highway.tag-leisure-track {
     stroke: rgb(229, 184, 43);
 }
-.preset-icon-line path.line.stroke.tag-highway.tag-leisure-track {
+.preset-icon-container path.line.stroke.tag-highway.tag-leisure-track {
     stroke: #fff;
 }
 
@@ -552,10 +552,10 @@ path.line.casing.tag-highway-steps.tag-unpaved {
     stroke-dasharray: none;
 }
 path.line.stroke.tag-highway-steps,
-.preset-icon-line path.line.casing.tag-highway-steps {
+.preset-icon-container path.line.casing.tag-highway-steps {
     stroke: #81d25c;
 }
-.preset-icon-line path.line.stroke.tag-highway-steps {
+.preset-icon-container path.line.stroke.tag-highway-steps {
     stroke: #fff;
 }
 
diff --git a/css/35_aeroways.css b/css/35_aeroways.css
index 56cffee52..22b903331 100644
--- a/css/35_aeroways.css
+++ b/css/35_aeroways.css
@@ -83,6 +83,6 @@ path.line.stroke.tag-aeroway-runway {
     stroke-width: 2;
     stroke-dasharray: 12, 24;
 }
-.preset-icon-line path.line.stroke.tag-aeroway-runway {
+.preset-icon-container path.line.stroke.tag-aeroway-runway {
     stroke-dasharray: 0, 14, 8, 14;
 }
diff --git a/css/40_railways.css b/css/40_railways.css
index 0b0adbfbf..2e08618b9 100644
--- a/css/40_railways.css
+++ b/css/40_railways.css
@@ -33,7 +33,7 @@ path.line.stroke.tag-railway {
     stroke-width: 2;
     stroke-dasharray: 6,6;
 }
-.preset-icon-line path.line.stroke.tag-railway:not(.tag-status) {
+.preset-icon-container path.line.stroke.tag-railway:not(.tag-status) {
     stroke-dasharray: 6;
 }
 
diff --git a/css/50_misc.css b/css/50_misc.css
index 127a23fd5..dbf76d81d 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -74,7 +74,7 @@ path.line.stroke.tag-route-ferry {
     stroke-width: 12;
 }
 .low-zoom path.line.stroke.tag-route-ferry,
-.preset-icon-line path.line.stroke.tag-route-ferry {
+.preset-icon-container path.line.stroke.tag-route-ferry {
     stroke-width: 2;
     stroke-dasharray: 6,4;
 }
@@ -163,7 +163,7 @@ path.line.casing.tag-man_made-pipeline {
 .low-zoom path.line.stroke.tag-man_made-pipeline {
     stroke-dasharray: 40, 1;
 }
-.preset-icon-line path.line.stroke.tag-man_made-pipeline {
+.preset-icon-container path.line.stroke.tag-man_made-pipeline {
     stroke-dasharray: 19, 1;
 }
 
@@ -190,7 +190,7 @@ path.line.casing.tag-boundary-national_park {
 path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
     stroke: #ddd;
 }
-.preset-icon-line path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
+.preset-icon-container path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
     stroke: rgb(170, 170, 170);
 }
 path.line.casing.tag-natural,
@@ -213,9 +213,9 @@ path.line.stroke.tag-man_made-breakwater {
     stroke-linecap: butt;
     stroke-dasharray: 8, 2, 2, 2;
 }
-.preset-icon-line path.line.stroke.tag-barrier,
-.preset-icon-line path.line.stroke.tag-man_made-groyne,
-.preset-icon-line path.line.stroke.tag-man_made-breakwater {
+.preset-icon-container path.line.stroke.tag-barrier,
+.preset-icon-container path.line.stroke.tag-man_made-groyne,
+.preset-icon-container path.line.stroke.tag-man_made-breakwater {
     stroke-dasharray: 1, 4, 6, 4;
 }
 
@@ -387,11 +387,11 @@ path.line.stroke.tag-highway.tag-status.tag-status-construction {
     stroke-dasharray: 10, 10;
 }
 path.line.casing.tag-highway.tag-status.tag-status-construction,
-.preset-icon-line path.line.stroke.tag-highway.tag-status.tag-status-construction {
+.preset-icon-container path.line.stroke.tag-highway.tag-status.tag-status-construction {
     stroke: #fff;
 }
 path.line.stroke.tag-highway.tag-status.tag-status-construction,
-.preset-icon-line path.line.casing.tag-highway.tag-status.tag-status-construction {
+.preset-icon-container path.line.casing.tag-highway.tag-status.tag-status-construction {
     stroke: #fc6c14;
 }
 .low-zoom path.line.shadow.tag-highway.tag-status.tag-status-construction {
diff --git a/css/80_app.css b/css/80_app.css
index 122bcb87a..5e6a7d27b 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -1202,21 +1202,16 @@ a.hide-toggle {
 .preset-icon-line {
     margin: auto;
     position: absolute;
+    left: 0;
+    right: 0;
     top: 0;
     width: 100%;
     height: 100%;
 }
-[dir='ltr'] .preset-icon-line {
-    left: 0;
-}
-[dir='rtl'] .preset-icon-line {
-    right: 0;
-}
-.preset-icon-line path.line {
+.preset-icon-container path {
     cursor: inherit;
 }
-.preset-icon-line circle.vertex,
-.preset-icon-fill circle.vertex {
+.preset-icon-container circle.vertex {
     fill: #fff;
     stroke: rgba(0, 0, 0, 0.25);
 }
@@ -1225,10 +1220,10 @@ a.hide-toggle {
     stroke: rgba(0, 0, 0, 0.25);
 }
 /* use a consistent stroke width */
-.preset-icon-line path.line.stroke {
+.preset-icon-container path.line.stroke {
     stroke-width: 2 !important;
 }
-.preset-icon-line path.line.casing {
+.preset-icon-container path.line.casing {
     stroke-width: 4 !important;
 }
 
@@ -1279,7 +1274,8 @@ a.hide-toggle {
 .preset-icon.framed .icon {
     transform: scale(0.4);
 }
-.preset-icon.framed.line-geom .icon {
+.preset-icon.framed.line-geom .icon,
+.preset-icon.framed.route-geom .icon {
     top: 20%;
     transform: translateY(-30%) scale(0.4);
 }
@@ -1289,7 +1285,8 @@ a.hide-toggle {
 .preset-icon-iD.framed .icon {
     transform: scale(0.74);
 }
-.preset-icon-iD.framed.line-geom .icon {
+.preset-icon-iD.framed.line-geom .icon,
+.preset-icon-iD.framed.route-geom .icon {
     transform: translateY(-30%) scale(0.74);
 }
 .preset-icon-container.fallback .preset-icon .icon {
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d809f79ea..93ca5ae12 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1092,23 +1092,23 @@
     "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "name": "Only U-turn"},
     "type/route_master": {"icon": "iD-route-master", "fields": ["name", "route_master", "ref", "operator", "network"], "moreFields": ["colour", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route_master"}, "name": "Route Master"},
     "type/route": {"icon": "iD-route", "fields": ["name", "route", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"},
-    "type/route/bicycle": {"icon": "iD-route-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
-    "type/route/bus": {"icon": "iD-route-bus", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
+    "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
+    "type/route/bus": {"icon": "maki-bus", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
     "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"},
-    "type/route/ferry": {"icon": "iD-route-ferry", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
-    "type/route/foot": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
-    "type/route/hiking": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
-    "type/route/horse": {"icon": "iD-route-horse", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
-    "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
-    "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
-    "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "piste/type", "colour", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
-    "type/route/power": {"icon": "iD-route-power", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
-    "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
-    "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
-    "type/route/train": {"icon": "iD-route-train", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
-    "type/route/tram": {"icon": "iD-route-tram", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
+    "type/route/ferry": {"icon": "maki-ferry", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
+    "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["name", "ref_route", "operator", "network_foot", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
+    "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
+    "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
+    "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
+    "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
+    "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "colour", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
+    "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
+    "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
+    "type/route/subway": {"icon": "temaki-subway", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
+    "type/route/train": {"icon": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
+    "type/route/tram": {"icon": "temaki-tram", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
     "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
-    "type/waterway": {"icon": "iD-route-water", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
+    "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
     "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
     "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "moreFields": ["salt"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json
index 2a26657e7..e905a29eb 100644
--- a/data/presets/presets/type/route/bicycle.json
+++ b/data/presets/presets/type/route/bicycle.json
@@ -1,11 +1,11 @@
 {
-    "icon": "iD-route-bicycle",
+    "icon": "maki-bicycle",
     "fields": [
         "name",
         "ref_route",
         "network_bicycle",
         "cycle_network",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json
index 62ddb64fc..838a375f4 100644
--- a/data/presets/presets/type/route/bus.json
+++ b/data/presets/presets/type/route/bus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-bus",
+    "icon": "maki-bus",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json
index 91152dde7..44ffb38cb 100644
--- a/data/presets/presets/type/route/ferry.json
+++ b/data/presets/presets/type/route/ferry.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-ferry",
+    "icon": "maki-ferry",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json
index f8c841a91..3bb4739a0 100644
--- a/data/presets/presets/type/route/foot.json
+++ b/data/presets/presets/type/route/foot.json
@@ -1,11 +1,11 @@
 {
-    "icon": "iD-route-foot",
+    "icon": "temaki-pedestrian",
     "fields": [
         "name",
         "ref_route",
         "operator",
         "network_foot",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index a18d19517..e53811c2a 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-foot",
+    "icon": "fas-hiking",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json
index d4501ff03..9b8789351 100644
--- a/data/presets/presets/type/route/horse.json
+++ b/data/presets/presets/type/route/horse.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-horse",
+    "icon": "maki-horse-riding",
     "fields": [
         "name",
         "ref_route",
@@ -7,7 +7,7 @@
         "network_horse",
         "description",
         "distance",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json
index 1dad43bf8..3d68b665b 100644
--- a/data/presets/presets/type/route/light_rail.json
+++ b/data/presets/presets/type/route/light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-light-rail",
+    "icon": "temaki-light_rail",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json
index d15c7547b..b3a666848 100644
--- a/data/presets/presets/type/route/pipeline.json
+++ b/data/presets/presets/type/route/pipeline.json
@@ -1,10 +1,10 @@
 {
-    "icon": "iD-route-pipeline",
+    "icon": "iD-pipeline-line",
     "fields": [
         "name",
         "ref_route",
         "operator",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json
index 7f478bd04..0176f2ec6 100644
--- a/data/presets/presets/type/route/piste.json
+++ b/data/presets/presets/type/route/piste.json
@@ -1,12 +1,12 @@
 {
-    "icon": "iD-route-piste",
+    "icon": "fas-skiing",
     "fields": [
         "name",
         "piste/type",
         "colour",
         "ref_route",
         "operator",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json
index 9689d02bb..58927f92f 100644
--- a/data/presets/presets/type/route/power.json
+++ b/data/presets/presets/type/route/power.json
@@ -1,10 +1,10 @@
 {
-    "icon": "iD-route-power",
+    "icon": "iD-power-line",
     "fields": [
         "name",
         "ref_route",
         "operator",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json
index 21908c406..bf874982b 100644
--- a/data/presets/presets/type/route/road.json
+++ b/data/presets/presets/type/route/road.json
@@ -1,10 +1,10 @@
 {
-    "icon": "iD-route-road",
+    "icon": "iD-highway-unclassified",
     "fields": [
         "name",
         "ref_route",
         "network_road",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json
index b8a302457..6a0fbbae7 100644
--- a/data/presets/presets/type/route/subway.json
+++ b/data/presets/presets/type/route/subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-subway",
+    "icon": "temaki-subway",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json
index 0f40f7a07..0868434ad 100644
--- a/data/presets/presets/type/route/train.json
+++ b/data/presets/presets/type/route/train.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-train",
+    "icon": "iD-railway-rail",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json
index 5f19120d9..06952e181 100644
--- a/data/presets/presets/type/route/tram.json
+++ b/data/presets/presets/type/route/tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-tram",
+    "icon": "temaki-tram",
     "fields": [
         "name",
         "ref_route",
diff --git a/data/presets/presets/type/waterway.json b/data/presets/presets/type/waterway.json
index be2fed808..e7382718d 100644
--- a/data/presets/presets/type/waterway.json
+++ b/data/presets/presets/type/waterway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-route-water",
+    "icon": "iD-waterway-stream",
     "fields": [
         "name",
         "waterway",
diff --git a/data/taginfo.json b/data/taginfo.json
index c98e28c91..4d0eaf5d5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1028,22 +1028,22 @@
     {"key": "restriction", "value": "only_u_turn", "description": "🄿 Only U-turn", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-only-u-turn.svg?sanitize=true"},
     {"key": "type", "value": "route_master", "description": "🄿 Route Master", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-master.svg?sanitize=true"},
     {"key": "type", "value": "route", "description": "🄿 Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route.svg?sanitize=true"},
-    {"key": "route", "value": "bicycle", "description": "🄿 Cycle Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-bicycle.svg?sanitize=true"},
-    {"key": "route", "value": "bus", "description": "🄿 Bus Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-bus.svg?sanitize=true"},
+    {"key": "route", "value": "bicycle", "description": "🄿 Cycle Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"},
+    {"key": "route", "value": "bus", "description": "🄿 Bus Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"},
     {"key": "route", "value": "detour", "description": "🄿 Detour Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-detour.svg?sanitize=true"},
-    {"key": "route", "value": "foot", "description": "🄿 Foot Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-foot.svg?sanitize=true"},
-    {"key": "route", "value": "hiking", "description": "🄿 Hiking Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-foot.svg?sanitize=true"},
-    {"key": "route", "value": "horse", "description": "🄿 Riding Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-horse.svg?sanitize=true"},
-    {"key": "route", "value": "light_rail", "description": "🄿 Light Rail Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-light-rail.svg?sanitize=true"},
-    {"key": "route", "value": "pipeline", "description": "🄿 Pipeline Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-pipeline.svg?sanitize=true"},
-    {"key": "route", "value": "piste", "description": "🄿 Piste/Ski Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-piste.svg?sanitize=true"},
-    {"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-power.svg?sanitize=true"},
-    {"key": "route", "value": "road", "description": "🄿 Road Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-road.svg?sanitize=true"},
-    {"key": "route", "value": "subway", "description": "🄿 Subway Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-subway.svg?sanitize=true"},
-    {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-train.svg?sanitize=true"},
-    {"key": "route", "value": "tram", "description": "🄿 Tram Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-tram.svg?sanitize=true"},
+    {"key": "route", "value": "foot", "description": "🄿 Foot Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
+    {"key": "route", "value": "hiking", "description": "🄿 Hiking Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-hiking.svg?sanitize=true"},
+    {"key": "route", "value": "horse", "description": "🄿 Riding Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
+    {"key": "route", "value": "light_rail", "description": "🄿 Light Rail Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/light_rail.svg?sanitize=true"},
+    {"key": "route", "value": "pipeline", "description": "🄿 Pipeline Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"},
+    {"key": "route", "value": "piste", "description": "🄿 Piste/Ski Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skiing.svg?sanitize=true"},
+    {"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true"},
+    {"key": "route", "value": "road", "description": "🄿 Road Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-unclassified.svg?sanitize=true"},
+    {"key": "route", "value": "subway", "description": "🄿 Subway Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/subway.svg?sanitize=true"},
+    {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"},
+    {"key": "route", "value": "tram", "description": "🄿 Tram Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tram.svg?sanitize=true"},
     {"key": "type", "value": "site", "description": "🄿 Site", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"},
-    {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-water.svg?sanitize=true"},
+    {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-stream.svg?sanitize=true"},
     {"key": "waterway", "value": "riverbank", "description": "🄿 Riverbank (unsearchable), 🄳 ➜ natural=water + water=river", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
     {"key": "waterway", "value": "boatyard", "description": "🄿 Boatyard", "object_types": ["area", "node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true"},
     {"key": "waterway", "value": "canal", "description": "🄿 Canal", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true"},
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index 1a58a27d2..ba7f4857d 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -152,7 +152,7 @@ export function uiEntityEditor(context) {
             });
 
         body.select('.preset-list-item button')
-            .call(uiPresetIcon()
+            .call(uiPresetIcon(context)
                 .geometry(context.geometry(_entityID))
                 .preset(_activePreset)
             );
diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index 87150053d..e8d7a6c0f 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -3,7 +3,7 @@ import { select as d3_select } from 'd3-selection';
 import { svgIcon, svgTagClasses } from '../svg';
 import { utilFunctor } from '../util';
 
-export function uiPresetIcon() {
+export function uiPresetIcon(context) {
     var preset, geometry, sizeClass = 'medium';
 
     function isSmall() {
@@ -119,30 +119,87 @@ export function uiPresetIcon() {
             .attr('height', h)
             .attr('viewBox', '0 0 ' + w + ' ' + h);
 
-        lineEnter.append('path')
-            .attr('d', 'M' + x1 + ' ' + y + ' L' + x2 + ' ' + y)
-            .attr('class', 'line casing');
-        lineEnter.append('path')
-            .attr('d', 'M' + x1 + ' ' + y + ' L' + x2 + ' ' + y)
-            .attr('class', 'line stroke');
-        lineEnter.append('circle')
-            .attr('class', 'vertex')
-            .attr('cx', x1 - 1)
-            .attr('cy', y)
-            .attr('r', r);
-        lineEnter.append('circle')
-            .attr('class', 'vertex')
-            .attr('cx', x2 + 1)
-            .attr('cy', y)
-            .attr('r', r);
+        ['casing', 'stroke'].forEach(function(klass) {
+            lineEnter.append('path')
+                .attr('d', 'M' + x1 + ' ' + y + ' L' + x2 + ' ' + y)
+                .attr('class', 'line ' + klass);
+        });
+
+        [[x1 - 1, y], [x2 + 1, y]].forEach(function(loc) {
+            lineEnter.append('circle')
+                .attr('class', 'vertex')
+                .attr('cx', loc[0])
+                .attr('cy', loc[1])
+                .attr('r', r);
+        });
     }
 
+    function renderRoute(routeEnter) {
+        var d = isSmall() ? 40 : 60;
+        // draw the route parametrically
+        var w = d,
+            h = d,
+            y1 = Math.round(d*0.80),
+            y2 = Math.round(d*0.68),
+            l = Math.round(d*0.6),
+            r = 2;
+        var x1 = (w - l)/2, x2 = x1 + l/3, x3 = x2 + l/3, x4 = x3 + l/3;
+
+        routeEnter = routeEnter
+            .append('svg')
+            .attr('class', 'preset-icon-route')
+            .attr('width', w)
+            .attr('height', h)
+            .attr('viewBox', '0 0 ' + w + ' ' + h);
+
+        ['casing', 'stroke'].forEach(function(klass) {
+            routeEnter.append('path')
+                .attr('d', 'M' + x1 + ' ' + y1 + ' L' + x2 + ' ' + y2)
+                .attr('class', 'segment0 line ' + klass);
+            routeEnter.append('path')
+                .attr('d', 'M' + x2 + ' ' + y2 + ' L' + x3 + ' ' + y1)
+                .attr('class', 'segment1 line ' + klass);
+            routeEnter.append('path')
+                .attr('d', 'M' + x3 + ' ' + y1 + ' L' + x4 + ' ' + y2)
+                .attr('class', 'segment2 line ' + klass);
+        });
+
+        [[x1, y1], [x2, y2], [x3, y1], [x4, y2]].forEach(function(loc) {
+            routeEnter.append('circle')
+                .attr('class', 'vertex')
+                .attr('cx', loc[0])
+                .attr('cy', loc[1])
+                .attr('r', r);
+        });
+    }
+
+    var routeSegements = {
+        bicycle: ['highway/cycleway', 'highway/cycleway', 'highway/cycleway'],
+        bus: ['highway/unclassified', 'highway/secondary', 'highway/primary'],
+        detour: ['highway/tertiary', 'highway/residential', 'highway/unclassified'],
+        ferry: ['route/ferry', 'route/ferry', 'route/ferry'],
+        foot: ['highway/footway', 'highway/footway', 'highway/footway'],
+        hiking: ['highway/path', 'highway/path', 'highway/path'],
+        horse: ['highway/bridleway', 'highway/bridleway', 'highway/bridleway'],
+        light_rail: ['railway/light_rail', 'railway/light_rail', 'railway/light_rail'],
+        pipeline: ['man_made/pipeline', 'man_made/pipeline', 'man_made/pipeline'],
+        piste: ['piste/downhill', 'piste/hike', 'piste/nordic'],
+        power: ['power/line', 'power/line', 'power/line'],
+        road: ['highway/secondary', 'highway/primary', 'highway/trunk'],
+        subway: ['railway/subway', 'railway/subway', 'railway/subway'],
+        train: ['railway/rail', 'railway/rail', 'railway/rail'],
+        tram: ['railway/tram', 'railway/tram', 'railway/tram'],
+        waterway: ['waterway/stream', 'waterway/stream', 'waterway/stream']
+    };
 
     function render() {
 
         var p = preset.apply(this, arguments);
         var isFallback = isSmall() && p.isFallback && p.isFallback();
         var geom = geometry ? geometry.apply(this, arguments) : null;
+        if (geom === 'relation' && p.tags && ((p.tags.type === 'route' && p.tags.route && routeSegements[p.tags.route]) || p.tags.type === 'waterway')) {
+            geom = 'route';
+        }
         var imageURL = p.imageURL;
         var picon = imageURL ? null : getIcon(p, geom);
         var isMaki = picon && /^maki-/.test(picon);
@@ -154,7 +211,8 @@ export function uiPresetIcon() {
         var drawVertex = picon !== null && geom === 'vertex' && (!isSmall() || !isFallback);
         var drawLine = picon && geom === 'line' && !isFallback && !isCategory;
         var drawArea = picon && geom === 'area' && !isFallback;
-        var isFramed = (drawVertex || drawArea || drawLine);
+        var drawRoute = picon && geom === 'route';
+        var isFramed = (drawVertex || drawArea || drawLine || drawRoute);
 
         var tags = !isCategory ? p.setTags({}, geom) : {};
         for (var k in tags) {
@@ -244,6 +302,31 @@ export function uiPresetIcon() {
         line.selectAll('path.casing')
             .attr('class', 'line casing ' + tagClasses);
 
+        var route = container.selectAll('.preset-icon-route')
+            .data(drawRoute ? [0] : []);
+
+        route.exit()
+            .remove();
+
+        var routeEnter = route.enter();
+        renderRoute(routeEnter);
+
+        route = routeEnter.merge(route);
+
+        if (drawRoute) {
+            var routeType = p.tags.type === 'waterway' ? 'waterway' : p.tags.route;
+            var segmentPresetIDs = routeSegements[routeType];
+            for (var segmentIndex in segmentPresetIDs) {
+                var segmentPreset = context.presets().item(segmentPresetIDs[segmentIndex]);
+                var segmentTagClasses = svgTagClasses().getClassesString(segmentPreset.tags, '');
+                route.selectAll('path.stroke.segment' + segmentIndex)
+                    .attr('class', 'segment' + segmentIndex + ' line stroke ' + segmentTagClasses);
+                route.selectAll('path.casing.segment' + segmentIndex)
+                    .attr('class', 'segment' + segmentIndex + ' line casing ' + segmentTagClasses);
+            }
+
+        }
+
 
         var icon = container.selectAll('.preset-icon')
             .data(picon ? [0] : []);
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index e83a0df30..d91d02768 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -292,7 +292,7 @@ export function uiPresetList(context) {
                 .append('button')
                 .attr('class', 'preset-list-button')
                 .classed('expanded', false)
-                .call(uiPresetIcon()
+                .call(uiPresetIcon(context)
                     .geometry(context.geometry(_entityID))
                     .preset(preset))
                 .on('click', click)
@@ -380,7 +380,7 @@ export function uiPresetList(context) {
 
             var button = wrap.append('button')
                 .attr('class', 'preset-list-button')
-                .call(uiPresetIcon()
+                .call(uiPresetIcon(context)
                     .geometry(context.geometry(_entityID))
                     .preset(preset))
                 .on('click', item.choose)
diff --git a/modules/ui/tools/add_favorite.js b/modules/ui/tools/add_favorite.js
index 89f62388b..c921bc7f6 100644
--- a/modules/ui/tools/add_favorite.js
+++ b/modules/ui/tools/add_favorite.js
@@ -173,7 +173,7 @@ export function uiToolAddFavorite(context) {
             buttonsEnter
                 .each(function(d) {
                     d3_select(this)
-                        .call(uiPresetIcon()
+                        .call(uiPresetIcon(context)
                             .geometry((d.geometry === 'point' && !d.preset.matchGeometry(d.geometry)) ? 'vertex' : d.geometry)
                             .preset(d.preset)
                             .sizeClass('small')
diff --git a/modules/ui/tools/add_recent.js b/modules/ui/tools/add_recent.js
index 5965bd263..9db1803c8 100644
--- a/modules/ui/tools/add_recent.js
+++ b/modules/ui/tools/add_recent.js
@@ -210,7 +210,7 @@ export function uiToolAddRecent(context) {
             buttonsEnter
                 .each(function(d) {
                     d3_select(this)
-                        .call(uiPresetIcon()
+                        .call(uiPresetIcon(context)
                             .geometry((d.geometry === 'point' && !d.preset.matchGeometry(d.geometry)) ? 'vertex' : d.geometry)
                             .preset(d.preset)
                             .sizeClass('small')
diff --git a/modules/ui/tools/search_add.js b/modules/ui/tools/search_add.js
index 66202ca61..682df3de1 100644
--- a/modules/ui/tools/search_add.js
+++ b/modules/ui/tools/search_add.js
@@ -418,7 +418,7 @@ export function uiToolSearchAdd(context) {
 
         row.each(function(d) {
             d3_select(this).call(
-                uiPresetIcon()
+                uiPresetIcon(context)
                     .geometry(d.geometry)
                     .preset(d.preset || d.presets[0])
                     .sizeClass('small')
diff --git a/svg/iD-sprite/presets/route-bicycle.svg b/svg/iD-sprite/presets/route-bicycle.svg
deleted file mode 100644
index 9c25ff0da..000000000
--- a/svg/iD-sprite/presets/route-bicycle.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M22.589,11 L22.589,13 L23.433,13 L23.995,16 L21.495,16 L15.995,26 L15.995,27 L16.995,28 L27.995,28 L35.558,18.531 L39.495,27 L39.995,27 L40.995,27 L40.995,26 L34.995,13 L37.995,13 L37.995,12 L36.995,11 L32.995,11 L32.995,13 L34.401,16 L26.058,16 L25.495,13 L27.589,13 L27.589,12 L26.589,11 L22.589,11 z M22.495,18 L24.495,18 L26.495,26 L17.995,26 L22.495,18 z M26.495,18 L33.495,18 L27.995,24.5 L26.495,18 z M17.495,20 C13.905,20 10.995,22.91 10.995,26.5 C10.995,30.09 13.905,33 17.495,33 C20.198,33 22.515,31.347 23.495,29 L21.245,29 C20.439,30.216 19.063,31 17.495,31 C15.01,31 12.995,28.985 12.995,26.5 C12.995,24.176 14.765,22.301 17.026,22.062 L18.151,20.031 C17.933,20.009 17.72,20 17.495,20 z M39.339,20 L40.276,22.094 C42.387,22.466 43.995,24.283 43.995,26.5 C43.995,28.985 41.98,31 39.495,31 C37.01,31 34.995,28.985 34.995,26.5 C34.995,25.126 35.618,23.919 36.589,23.094 L35.714,21.219 C34.072,22.398 32.995,24.324 32.995,26.5 C32.995,30.09 35.905,33 39.495,33 C43.085,33 45.995,30.09 45.995,26.5 C45.995,22.91 43.085,20 39.495,20 C39.442,20 39.392,19.999 39.339,20 z M21.683,21.531 L20.683,23.312 C21.149,23.779 21.488,24.366 21.714,25 L23.808,25 C23.483,23.628 22.723,22.413 21.683,21.531 z" fill="currentColor" id="route-bicycle-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-bus.svg b/svg/iD-sprite/presets/route-bus.svg
deleted file mode 100644
index b68d6dffa..000000000
--- a/svg/iD-sprite/presets/route-bus.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M24.167,8 C21.894,8 19.167,9.239 19.167,12.577 L19.167,21.665 L19.167,28 C19.167,28 19.167,29.667 20.833,29.667 L20.833,31.333 C20.833,31.333 20.833,33 22.5,33 C24.167,33 24.167,31.333 24.167,31.333 L24.167,29.667 L35.833,29.667 L35.833,31.333 C35.833,31.333 35.833,33 37.5,33 C39.167,33 39.167,31.333 39.167,31.333 L39.167,29.667 C39.167,29.667 40.833,29.667 40.833,28 L40.833,12.577 C40.833,9.168 38.773,8 36.501,8 L24.167,8 z M24.583,10.5 L35.417,10.5 C35.647,10.5 35.833,10.686 35.833,10.917 C35.833,11.148 35.647,11.333 35.417,11.333 L24.583,11.333 C24.352,11.333 24.167,11.148 24.167,10.917 C24.167,10.686 24.352,10.5 24.583,10.5 z M22.5,13 L37.5,13 C39.167,13 39.167,14.611 39.167,14.611 L39.167,19.667 C39.167,19.667 39.167,21.333 37.5,21.333 L22.5,21.333 C20.833,21.333 20.833,19.667 20.833,19.667 L20.833,14.667 C20.833,14.667 20.833,13 22.5,13 z M22.5,24.667 C23.42,24.667 24.167,25.413 24.167,26.333 C24.167,27.254 23.42,28 22.5,28 C21.579,28 20.833,27.254 20.833,26.333 C20.833,25.413 21.579,24.667 22.5,24.667 z M37.5,24.667 C38.42,24.667 39.167,25.413 39.167,26.333 C39.167,27.254 38.42,28 37.5,28 C36.579,28 35.833,27.254 35.833,26.333 C35.833,25.413 36.579,24.667 37.5,24.667 z" fill="#989898"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-detour.svg b/svg/iD-sprite/presets/route-detour.svg
index 93dc5137e..8231c19b0 100644
--- a/svg/iD-sprite/presets/route-detour.svg
+++ b/svg/iD-sprite/presets/route-detour.svg
@@ -1,23 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.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="60" height="60" viewBox="5 0 50 50">
   <path d="M17,14 L15,16 L15,31 L17,33 L45,33 L47,31 L47,16 L45,14 L17,14" fill="#FC6C14"/>
   <path d="M34,19.5 L39,23.5 L34,27.5 L34,25 L23,25 L23,22 L34,22" fill="#000000"/>
   <path d="M17,16.013 L17,16.513 L17,30.513 L17,31.013 L17.5,31.013 L44.5,31.013 L45,31.013 L45,30.513 L45,16.513 L45,16.013 L44.5,16.013 L17.5,16.013 L17,16.013 z M18,17.013 L44,17.013 L44,30.013 L18,30.013 L18,17.013 z" fill="#000000"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/iD-sprite/presets/route-ferry.svg b/svg/iD-sprite/presets/route-ferry.svg
deleted file mode 100644
index 3c8ba1f75..000000000
--- a/svg/iD-sprite/presets/route-ferry.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <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.438,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.001,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.577,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.516,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.362,33.087 39.215,33.087 39.787,32.587 L40.726,31.768 C41.364,31.25 42.161,30.968 42.982,30.969 z" fill="currentColor" id="route-ferry-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-foot.svg b/svg/iD-sprite/presets/route-foot.svg
deleted file mode 100644
index 0fef5de75..000000000
--- a/svg/iD-sprite/presets/route-foot.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11,45.419 L13.75,49.575 L25.75,41.575 L23,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M32,12.5 C32,13.881 30.881,15 29.5,15 C28.119,15 27,13.881 27,12.5 C27,11.119 28.119,10 29.5,10 C30.881,10 32,11.119 32,12.5 z M27,16 L28,16 L28.5,16 L37,22.5 L37,24 L36,24 L31,20.125 L31,24 L33,28 L35,33 L34,34 L33,34 L31,29 L27,23 L27,18.344 L24.5,20.5 L22.5,24 L21,24 L21,23 L22.5,20 L27,16 z M27.844,26.406 L25.531,34 L24.5,34 L23.5,33 L26.312,24.562 z" fill="currentColor" id="route-foot-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-horse.svg b/svg/iD-sprite/presets/route-horse.svg
deleted file mode 100644
index 717a2e456..000000000
--- a/svg/iD-sprite/presets/route-horse.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M27.5,5 C26.119,5 25,6.119 25,7.5 C25,8.881 26.119,10 27.5,10 C28.881,10 30,8.881 30,7.5 C30,6.119 28.881,5 27.5,5 z M41,8.156 L38,12 L33.719,17 L33,17 L31,17 L30,16.656 L30,12 C30,11.446 29.554,11 29,11 L26,11 C25.446,11 25,11.446 25,12 L25,16 L23,16 L19,16 L15,20 L14,26 L16,26 L17,24 L18,21 L19,19.656 L19,23.156 L17,27.5 L17,33 C17,34 17,35 18.5,35 C20,35 20,34 20,33 L20,27.5 L21.156,25 L23,25 L23,27.5 L25.5,33.5 C25.751,34.435 26.405,35 27.25,35 C28.059,35 28.346,34.124 28,33 L26,27.5 L26,25.188 L29,26 L33,26 L33,33 C33,33.5 33,35 34.5,35 C36,35 36,33.5 36,33 L36,26 L41,17 L43,17 L45,18 L46,17 L46,15 L42,12 L41,12 z M25,17 L28,17 L31,20 L31,24 L30,25 L29,24 L29,21 L25,18 z" fill="currentColor" id="route-horse-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-light-rail.svg b/svg/iD-sprite/presets/route-light-rail.svg
deleted file mode 100644
index e25e204f1..000000000
--- a/svg/iD-sprite/presets/route-light-rail.svg
+++ /dev/null
@@ -1,25 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <g>
-    <path d="M22.5,31 L25.833,31 L25,32.488 L35,32.488 L34.167,31 L37.5,31 L40,35.464 L36.667,35.464 L35.833,33.976 L24.167,33.976 L23.333,35.464 L20,35.464 L22.5,31 z" fill="#989898"/>
-    <path d="M25.111,9 L19,14.727 L19,28.091 L21.444,30 L38.556,30 L41,28.091 L41,14.727 L34.889,9 L25.111,9 z M25.111,9.955 L34.889,9.955 L34.889,11.864 L25.111,11.864 L25.111,9.955 z M22.667,14.727 L25.111,14.727 L34.889,14.727 L37.333,14.727 L38.556,15.682 L38.556,19.5 L34.889,19.5 L25.111,19.5 L21.444,19.5 L21.444,15.682 L22.667,14.727 z M21.444,24.273 L25.111,24.273 L27.556,26.182 L27.556,27.136 L22.667,27.136 L21.444,26.182 L21.444,24.273 z M34.889,24.273 L38.556,24.273 L38.556,26.182 L37.333,27.136 L32.444,27.136 L32.444,26.182 L34.889,24.273 z" fill="#989898"/>
-    <path d="M25,5 L25,6 L29,6 L29,8 L31,8 L31,6 L35,6 L35,5 z" fill="#989898"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-line.svg b/svg/iD-sprite/presets/route-line.svg
deleted file mode 100644
index ecfb9a9e6..000000000
--- a/svg/iD-sprite/presets/route-line.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M22,31 L25,20 L28,9 L32,9 L35,20 L38,31 z" fill="#989898" id="route-line-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-pipeline.svg b/svg/iD-sprite/presets/route-pipeline.svg
deleted file mode 100644
index 9ab78c031..000000000
--- a/svg/iD-sprite/presets/route-pipeline.svg
+++ /dev/null
@@ -1,25 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <g>
-    <path d="M15.5,13 C14.119,13 13,15.239 13,18 C13,20.761 14.119,23 15.5,23 L26,23 L26,13 L15.5,13 z M30,13 L30,23 L44.5,23 L44.5,13 L30,13 z" fill="#B5B5B5"/>
-    <path d="M47,18 C47,20.761 45.881,23 44.5,23 C43.119,23 42,20.761 42,18 C42,15.239 43.119,13 44.5,13 C45.881,13 47,15.239 47,18 z" fill="#989898"/>
-    <path d="M27,10 L27,24 L25,34 L27,34 L28.594,26 L33.406,26 L35,34 L37,34 L35,24 L34,24 L29,24 L29,10 L27,10 z M33,10 L33,12 L35,12 L35,10 L33,10 z M21,13 C20,13 18.5,15.239 18.5,18 C18.5,20.761 20,23 21,23 L23,23 C21.619,23 20,20.761 20,18 C20,15.239 21.619,13 23,13 L21,13 z M36,13 C35,13 33.5,15.239 33.5,18 C33.5,20.761 35,23 36,23 L38,23 C36.619,23 35,20.761 35,18 C35,15.239 36.619,13 38,13 L36,13 z M44.5,13 C43.119,13 42,15.239 42,18 C42,20.761 43.119,23 44.5,23 C45.881,23 47,20.761 47,18 C47,15.239 45.881,13 44.5,13 z" fill="#989898"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-piste.svg b/svg/iD-sprite/presets/route-piste.svg
deleted file mode 100644
index 9cc4cd626..000000000
--- a/svg/iD-sprite/presets/route-piste.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M41.884,18.834 C41.884,20.169 40.802,21.251 39.467,21.251 C38.132,21.251 37.05,20.169 37.05,18.834 C37.05,17.499 38.132,16.417 39.467,16.417 C40.802,16.417 41.884,17.499 41.884,18.834 z M39.822,30.742 C39.721,30.549 39.486,30.47 39.29,30.564 C38.187,31.24 36.839,31.388 35.616,30.967 L25.416,25.859 L29.799,23.668 L29.799,18.834 L32.216,20.043 L32.216,24.876 L34.633,26.085 L37.05,24.876 L34.633,23.668 L34.633,16.417 L29.799,14 L27.382,15.209 L27.382,22.46 L22.999,24.651 L18.697,22.508 C18.497,22.41 18.255,22.493 18.157,22.693 C18.059,22.893 18.142,23.135 18.343,23.233 L35.262,31.692 C35.77,31.91 36.32,32.014 36.873,31.999 C37.839,31.982 38.789,31.739 39.644,31.29 C39.843,31.19 39.925,30.949 39.826,30.749 C39.824,30.747 39.823,30.744 39.822,30.742 z" fill="currentColor" id="route-piste-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-power.svg b/svg/iD-sprite/presets/route-power.svg
deleted file mode 100644
index baf9121ac..000000000
--- a/svg/iD-sprite/presets/route-power.svg
+++ /dev/null
@@ -1,22 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M20,8 L20,9 L22,9 L22,8 L20,8 z M24,8 L24,9 L26,9 L26,8 L24,8 z M34,8 L34,9 L36,9 L36,8 L34,8 z M38,8 L38,9 L40,9 L40,8 L38,8 z M20.312,13 C19.647,16.533 17.267,18.5 15,18.5 L14,18.5 L14,19.5 L15,19.5 C16.042,19.5 17.082,19.196 18,18.594 L18,19.5 L19,19.5 C21.879,19.5 24.615,17.022 25.312,13 L24.312,13 C23.647,16.533 21.267,18.5 19,18.5 L18.125,18.5 C19.686,17.42 20.885,15.509 21.312,13 L20.312,13 z M34.688,13 C35.385,17.022 38.121,19.5 41,19.5 L42,19.5 L42,18.594 C42.918,19.196 43.958,19.5 45,19.5 L46,19.5 L46,18.5 L45,18.5 C42.733,18.5 40.353,16.533 39.688,13 L38.688,13 C39.115,15.509 40.314,17.42 41.875,18.5 L41,18.5 C38.733,18.5 36.353,16.533 35.688,13 L34.688,13 z" fill="#989898"/>
-  <path d="M28,8 L28,10 L19,10 L19,12 L28,12 L28,34 L32,34 L32,12 L41,12 L41,10 L32,10 L32,8 L28,8 z" fill="#B5B5B5"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-road.svg b/svg/iD-sprite/presets/route-road.svg
deleted file mode 100644
index 6ab66d4e6..000000000
--- a/svg/iD-sprite/presets/route-road.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M22.5,12 L19.625,18 L18,18 L17,19 L17,21 L18.406,21 L18,22 L18,27 L18,28 L18,28 C18,28 18.608,28.608 19,29 L20,29 L24,29 L26,30 L34,30 L36,29 L40,29 L41,29 L42,28 L42,28 L42,27 L42,22 L41.594,21 L43,21 L43,19 L42,18 L40.375,18 L37.5,12 z M23.5,15 L36.5,15 L38,19 L37,20 L23,20 L22,19 z M21,23 L24,23 L25,25 L25,26 L21,26 L20,25 L20,24 z M36,23 L39,23 L40,24 L40,25 L39,26 L35,26 L35,25 z M19,30 L19,32 L20,33 L23,33 L24,32 L24,30 z M36,30 L36,32 L37,33 L40,33 L41,32 L41,30 z" fill="#989898"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-subway.svg b/svg/iD-sprite/presets/route-subway.svg
deleted file mode 100644
index b39b0e6cd..000000000
--- a/svg/iD-sprite/presets/route-subway.svg
+++ /dev/null
@@ -1,25 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <g>
-    <path d="M22.5,31 L25.833,31 L25,32.488 L35,32.488 L34.167,31 L37.5,31 L40,35.464 L36.667,35.464 L35.833,33.976 L24.167,33.976 L23.333,35.464 L20,35.464 L22.5,31 z" fill="#989898"/>
-    <path d="M25,8 L19,13.739 L19,28.087 L21,30 L39,30 L41,28.087 L41,13.739 L35,8 L25,8 z M26,9.913 L34,9.913 L34,11.826 L26,11.826 L26,9.913 z M22,13.739 L24,13.739 L36,13.739 L38,13.739 L39,14.696 L39,18.522 L36,20.435 L24,20.435 L21,18.522 L21,14.696 L22,13.739 z M21,24.261 L24,24.261 L26,26.174 L26,27.131 L22,27.131 L21,26.174 L21,24.261 z M36,24.261 L39,24.261 L39,26.174 L38,27.131 L34,27.131 L34,26.174 L36,24.261 z" fill="#989898"/>
-    <path d="M23,3 C18,3 14,6 14,12 L14,32 L17,31 L17,12 C17,8 20,6 23,6 L29,6 L31,6 L37,6 C40,6 43,8 43,12 L43,31 L46,32 L46,12 C46,6 41.932,3.822 37,3 L31,3 L29,3 z" fill="#B5B5B5"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-train.svg b/svg/iD-sprite/presets/route-train.svg
deleted file mode 100644
index 78feb1f20..000000000
--- a/svg/iD-sprite/presets/route-train.svg
+++ /dev/null
@@ -1,21 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M23.5,11 L22,12 L21.531,14 L18.25,14 C17.696,14 17.384,14.463 17.25,15 L17,16 C16.866,16.537 17.446,17 18,17 L42,17 C42.554,17 43.134,16.537 43,16 L42.75,15 C42.616,14.463 42.304,14 41.75,14 L38.969,14 L38.5,12 L37,11 L36,12 L36.469,14 L24.031,14 L24.5,12 L23.5,11 z M21.5,15 C21.776,15 22,15.224 22,15.5 C22,15.776 21.776,16 21.5,16 C21.224,16 21,15.776 21,15.5 C21,15.224 21.224,15 21.5,15 z M38.5,15 C38.776,15 39,15.224 39,15.5 C39,15.776 38.776,16 38.5,16 C38.224,16 38,15.776 38,15.5 C38,15.224 38.224,15 38.5,15 z M20.562,18 L20.094,20 L17.25,20 C16.696,20 16.384,20.463 16.25,21 L16,22 C15.866,22.537 16.446,23 17,23 L43,23 C43.554,23 44.134,22.537 44,22 L43.75,21 C43.616,20.463 43.304,20 42.75,20 L40.406,20 L39.938,18 L37.438,18 L37.906,20 L22.594,20 L23.062,18 L20.562,18 z M20.5,21 C20.776,21 21,21.224 21,21.5 C21,21.776 20.776,22 20.5,22 C20.224,22 20,21.776 20,21.5 C20,21.224 20.224,21 20.5,21 z M39.5,21 C39.776,21 40,21.224 40,21.5 C40,21.776 39.776,22 39.5,22 C39.224,22 39,21.776 39,21.5 C39,21.224 39.224,21 39.5,21 z M19.156,24 L18.688,26 L16.25,26 C15.696,26 15.384,26.463 15.25,27 L15,28 C14.866,28.537 15.446,29 16,29 L44,29 C44.554,29 45.134,28.537 45,28 L44.75,27 C44.616,26.463 44.304,26 43.75,26 L41.812,26 L41.344,24 L38.844,24 L39.312,26 L21.188,26 L21.656,24 L19.156,24 z M19.5,27 C19.776,27 20,27.224 20,27.5 C20,27.776 19.776,28 19.5,28 C19.224,28 19,27.776 19,27.5 C19,27.224 19.224,27 19.5,27 z M40.5,27 C40.776,27 41,27.224 41,27.5 C41,27.776 40.776,28 40.5,28 C40.224,28 40,27.776 40,27.5 C40,27.224 40.224,27 40.5,27 z M17.719,30 L17,33 L18.5,34 L19.5,33 L20.219,30 L17.719,30 z M40.281,30 L41,33 L42,34 L43.5,33 L42.781,30 L40.281,30 z" fill="#989898"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-tram.svg b/svg/iD-sprite/presets/route-tram.svg
deleted file mode 100644
index d54b356cb..000000000
--- a/svg/iD-sprite/presets/route-tram.svg
+++ /dev/null
@@ -1,26 +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="M35.969,47.469 L33.031,51.531 L22.031,43.531 L24.969,39.469 z" fill="#46682F"/>
-    <path d="M33.125,47.406 L35.875,51.594 L47.875,43.594 L45.125,39.406 z" fill="#70372F"/>
-    <path d="M10.125,47.419 L12.875,51.575 L24.875,43.575 L22.125,39.419 z" fill="#2C5476"/>
-    <path d="M35.375,48.281 L33.625,50.719 L22.625,42.719 L24.375,40.281 z" fill="#8CD05F"/>
-    <path d="M33.656,48.25 L35.344,50.75 L47.344,42.75 L45.656,40.25 z" fill="#E06D5F"/>
-    <path d="M10.656,48.263 L12.344,50.763 L24.344,42.763 L22.656,40.263 z" fill="#58A9ED"/>
-    <path d="M49,41.5 C49,42.881 47.881,44 46.5,44 C45.119,44 44,42.881 44,41.5 C44,40.119 45.119,39 46.5,39 C47.881,39 49,40.119 49,41.5 z" fill="#70372F"/>
-    <path d="M14,49.5 C14,50.881 12.881,52 11.5,52 C10.119,52 9,50.881 9,49.5 C9,48.119 10.119,47 11.5,47 C12.881,47 14,48.119 14,49.5 z" fill="#2C5476"/>
-    <path d="M26,41.5 C26,42.881 24.881,44 23.5,44 C22.119,44 21,42.881 21,41.5 C21,40.119 22.119,39 23.5,39 C24.881,39 26,40.119 26,41.5 z" fill="#395E53"/>
-    <path d="M37,49.5 C37,50.881 35.881,52 34.5,52 C33.119,52 32,50.881 32,49.5 C32,48.119 33.119,47 34.5,47 C35.881,47 37,48.119 37,49.5 z" fill="#5B502F"/>
-    <path d="M48,41.5 C48,42.328 47.328,43 46.5,43 C45.672,43 45,42.328 45,41.5 C45,40.672 45.672,40 46.5,40 C47.328,40 48,40.672 48,41.5 z" fill="#FFFFFF"/>
-    <path d="M36,49.5 C36,50.328 35.328,51 34.5,51 C33.672,51 33,50.328 33,49.5 C33,48.672 33.672,48 34.5,48 C35.328,48 36,48.672 36,49.5 z" fill="#FFFFFF"/>
-    <path d="M25,41.5 C25,42.328 24.328,43 23.5,43 C22.672,43 22,42.328 22,41.5 C22,40.672 22.672,40 23.5,40 C24.328,40 25,40.672 25,41.5 z" fill="#FFFFFF"/>
-    <path d="M13,49.5 C13,50.328 12.328,51 11.5,51 C10.672,51 10,50.328 10,49.5 C10,48.672 10.672,48 11.5,48 C12.328,48 13,48.672 13,49.5 z" fill="#FFFFFF"/>
-  </g>
-  <g>
-    <path d="M34.031,34 L35,36 L36,37 L37.5,36 L36.531,34 z" fill="#989898"/>
-    <path d="M23.5,34 L22.531,36 L21.531,37 L20.031,36 L21,34 z" fill="#989898"/>
-    <path d="M25,11 L20,17 L20,31 L22,33 L36,33 L38,31 L38,17 L33,11 L25,11 z M25,12 L33,12 L33,14 L25,14 L25,12 z M23,17 L25,17 L33,17 L35,17 L36,18 L36,22 L33,22 L25,22 L22,22 L22,18 L23,17 z M22,27 L25,27 L27,29 L27,30 L23,30 L22,29 L22,27 z M33,27 L36,27 L36,29 L35,30 L31,30 L31,29 L33,27 z" fill="#989898"/>
-    <path d="M24,7 L24,8 L28,8 L28,10 L30,10 L30,8 L34,8 L34,7 z" fill="#B5B5B5"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-water.svg b/svg/iD-sprite/presets/route-water.svg
deleted file mode 100644
index 3031ca461..000000000
--- a/svg/iD-sprite/presets/route-water.svg
+++ /dev/null
@@ -1,22 +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="M36.969,45.469 L34.031,49.531 L23.031,41.531 L25.969,37.469 z" fill="#46682F"/>
-    <path d="M34.125,45.406 L36.875,49.594 L48.875,41.594 L46.125,37.406 z" fill="#70372F"/>
-    <path d="M11.125,45.419 L13.875,49.575 L25.875,41.575 L23.125,37.419 z" fill="#2C5476"/>
-    <path d="M36.375,46.281 L34.625,48.719 L23.625,40.719 L25.375,38.281 z" fill="#8CD05F"/>
-    <path d="M34.656,46.25 L36.344,48.75 L48.344,40.75 L46.656,38.25 z" fill="#E06D5F"/>
-    <path d="M11.656,46.263 L13.344,48.763 L25.344,40.763 L23.656,38.263 z" fill="#58A9ED"/>
-    <path d="M50,39.5 C50,40.881 48.881,42 47.5,42 C46.119,42 45,40.881 45,39.5 C45,38.119 46.119,37 47.5,37 C48.881,37 50,38.119 50,39.5 z" fill="#70372F"/>
-    <path d="M15,47.5 C15,48.881 13.881,50 12.5,50 C11.119,50 10,48.881 10,47.5 C10,46.119 11.119,45 12.5,45 C13.881,45 15,46.119 15,47.5 z" fill="#2C5476"/>
-    <path d="M27,39.5 C27,40.881 25.881,42 24.5,42 C23.119,42 22,40.881 22,39.5 C22,38.119 23.119,37 24.5,37 C25.881,37 27,38.119 27,39.5 z" fill="#395E53"/>
-    <path d="M38,47.5 C38,48.881 36.881,50 35.5,50 C34.119,50 33,48.881 33,47.5 C33,46.119 34.119,45 35.5,45 C36.881,45 38,46.119 38,47.5 z" fill="#5B502F"/>
-    <path d="M49,39.5 C49,40.328 48.328,41 47.5,41 C46.672,41 46,40.328 46,39.5 C46,38.672 46.672,38 47.5,38 C48.328,38 49,38.672 49,39.5 z" fill="#FFFFFF"/>
-    <path d="M37,47.5 C37,48.328 36.328,49 35.5,49 C34.672,49 34,48.328 34,47.5 C34,46.672 34.672,46 35.5,46 C36.328,46 37,46.672 37,47.5 z" fill="#FFFFFF"/>
-    <path d="M26,39.5 C26,40.328 25.328,41 24.5,41 C23.672,41 23,40.328 23,39.5 C23,38.672 23.672,38 24.5,38 C25.328,38 26,38.672 26,39.5 z" fill="#FFFFFF"/>
-    <path d="M14,47.5 C14,48.328 13.328,49 12.5,49 C11.672,49 11,48.328 11,47.5 C11,46.672 11.672,46 12.5,46 C13.328,46 14,46.672 14,47.5 z" fill="#FFFFFF"/>
-  </g>
-  <path d="M18.007,23.759 C17.793,24.559 17.187,25.092 16.653,24.949 C16.12,24.806 15.861,24.041 16.075,23.241 C16.29,22.441 16.896,21.908 17.43,22.051 C17.963,22.194 18.222,22.959 18.007,23.759 z M19.84,13.75 C20.393,12.793 20.259,11.682 19.541,11.268 C18.824,10.854 17.795,11.293 17.242,12.25 C16.69,13.207 16.824,14.318 17.541,14.732 C18.259,15.146 19.288,14.707 19.84,13.75 z M41.464,17.708 C41.249,16.908 41.508,16.143 42.041,16 C42.575,15.857 43.181,16.39 43.396,17.19 C43.61,17.99 43.351,18.755 42.818,18.898 C42.284,19.041 41.678,18.508 41.464,17.708 z M44.34,28.75 C43.788,27.793 43.922,26.682 44.639,26.268 C45.357,25.854 46.386,26.293 46.938,27.25 C47.491,28.207 47.357,29.318 46.639,29.732 C45.922,30.146 44.893,29.707 44.34,28.75 z" fill="currentColor" id="route-water-stroke2" opacity="0.5"/>
-  <path d="M16.803,32 C16.803,32 16.267,30.154 16.458,29.25 C16.679,28.203 18.113,26.5 18.113,26.5 C18.113,26.5 19.546,24.797 19.767,23.75 C19.959,22.846 19.422,21 19.422,21 C19.422,21 18.886,19.154 19.077,18.25 C19.298,17.203 20.732,15.5 20.732,15.5 C20.732,15.5 22.165,13.797 22.386,12.75 C22.578,11.846 22.041,10 22.041,10 L38.541,10 C38.541,10 39.975,11.703 40.196,12.75 C40.387,13.654 39.851,15.5 39.851,15.5 C39.851,15.5 39.314,17.346 39.506,18.25 C39.727,19.297 41.16,21 41.16,21 C41.16,21 42.594,22.703 42.815,23.75 C43.006,24.654 42.47,26.5 42.47,26.5 C42.47,26.5 41.933,28.346 42.125,29.25 C42.346,30.297 43.779,32 43.779,32 z" fill="currentColor" id="route-water-stroke1"/>
-</svg>
\ No newline at end of file