diff --git a/css/app.css b/css/app.css
index 25ba70bcf..98bd568c6 100644
--- a/css/app.css
+++ b/css/app.css
@@ -759,7 +759,7 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 
 .grid-entry > .icon {
     position: absolute;
-    top: 30px;left: -30px; right: -30px;
+    top: 30px;left: 0px; right: 0px;
     margin: auto;
 }
 
diff --git a/css/feature-icons.css b/css/feature-icons.css
index 1ecc54914..b4d8b1226 100644
--- a/css/feature-icons.css
+++ b/css/feature-icons.css
@@ -1,4 +1,4 @@
-/* glue: 0.3 hash: efe68f0007 */
+/* glue: 0.3 hash: 9cf431a4a3 */
 .feature-waterway-stream,
 .feature-waterway-river,
 .feature-waterway-ditch,
@@ -12,6 +12,7 @@
 .feature-highway-unclassified,
 .feature-highway-trunk,
 .feature-highway-trunk-link,
+.feature-highway-track,
 .feature-highway-tertiary,
 .feature-highway-steps,
 .feature-highway-service,
@@ -28,8 +29,6 @@
 .feature-highway-footway,
 .feature-highway-cycleway,
 .feature-highway-bridleway,
-.feature-waterway-riverdsads,
-.feature-waterway-riverdsads-8,
 .feature-zoo,
 .feature-x,
 .feature-wetland,
@@ -301,280 +300,279 @@
 .feature-highway-unclassified{background-position:-180px -60px;width:60px;height:60px;}
 .feature-highway-trunk{background-position:-180px -120px;width:60px;height:60px;}
 .feature-highway-trunk-link{background-position:0px -180px;width:60px;height:60px;}
-.feature-highway-tertiary:link{background-position:-60px -180px;width:60px;height:60px;}
-.feature-highway-tertiary{background-position:-120px -180px;width:60px;height:60px;}
-.feature-highway-steps{background-position:-180px -180px;width:60px;height:60px;}
-.feature-highway-service{background-position:-240px 0px;width:60px;height:60px;}
-.feature-highway-secondary{background-position:-240px -60px;width:60px;height:60px;}
-.feature-highway-secondary-link{background-position:-240px -120px;width:60px;height:60px;}
-.feature-highway-road{background-position:-240px -180px;width:60px;height:60px;}
-.feature-highway-residential{background-position:0px -240px;width:60px;height:60px;}
-.feature-highway-primary{background-position:-60px -240px;width:60px;height:60px;}
-.feature-highway-primary-link{background-position:-120px -240px;width:60px;height:60px;}
-.feature-highway-path{background-position:-180px -240px;width:60px;height:60px;}
-.feature-highway-motorway{background-position:-240px -240px;width:60px;height:60px;}
-.feature-highway-motorway-link{background-position:-300px 0px;width:60px;height:60px;}
-.feature-highway-living_street{background-position:-300px -60px;width:60px;height:60px;}
-.feature-highway-footway{background-position:-300px -120px;width:60px;height:60px;}
-.feature-highway-cycleway{background-position:-300px -180px;width:60px;height:60px;}
-.feature-highway-bridleway{background-position:-300px -240px;width:60px;height:60px;}
-.feature-waterway-riverdsads{background-position:0px -300px;width:27px;height:22px;}
-.feature-waterway-riverdsads-8{background-position:-27px -300px;width:27px;height:22px;}
-.feature-zoo{background-position:0px -322px;width:24px;height:24px;}
-.feature-x{background-position:-24px -322px;width:24px;height:24px;}
-.feature-wetland{background-position:-48px -322px;width:24px;height:24px;}
-.feature-water{background-position:-72px -322px;width:24px;height:24px;}
-.feature-waste-basket{background-position:-96px -322px;width:24px;height:24px;}
-.feature-warehouse{background-position:-120px -322px;width:24px;height:24px;}
-.feature-triangle{background-position:-144px -322px;width:24px;height:24px;}
-.feature-triangle-stroked{background-position:-168px -322px;width:24px;height:24px;}
-.feature-town-hall{background-position:-192px -322px;width:24px;height:24px;}
-.feature-toilets{background-position:-216px -322px;width:24px;height:24px;}
-.feature-theatre{background-position:-240px -322px;width:24px;height:24px;}
-.feature-tennis{background-position:-264px -322px;width:24px;height:24px;}
-.feature-swimming{background-position:-288px -322px;width:24px;height:24px;}
-.feature-star{background-position:-312px -322px;width:24px;height:24px;}
-.feature-star-stroked{background-position:-336px -322px;width:24px;height:24px;}
-.feature-square{background-position:-360px 0px;width:24px;height:24px;}
-.feature-square-stroked{background-position:-360px -24px;width:24px;height:24px;}
-.feature-soccer{background-position:-360px -48px;width:24px;height:24px;}
-.feature-slaughterhouse{background-position:-360px -72px;width:24px;height:24px;}
-.feature-skiing{background-position:-360px -96px;width:24px;height:24px;}
-.feature-shop{background-position:-360px -120px;width:24px;height:24px;}
-.feature-school{background-position:-360px -144px;width:24px;height:24px;}
-.feature-roadblock{background-position:-360px -168px;width:24px;height:24px;}
-.feature-restaurant{background-position:-360px -192px;width:24px;height:24px;}
-.feature-religious-muslim{background-position:-360px -216px;width:24px;height:24px;}
-.feature-religious-jewish{background-position:-360px -240px;width:24px;height:24px;}
-.feature-religious-christian{background-position:-360px -264px;width:24px;height:24px;}
-.feature-rail{background-position:-360px -288px;width:24px;height:24px;}
-.feature-rail-underground{background-position:-360px -312px;width:24px;height:24px;}
-.feature-rail-above{background-position:0px -346px;width:24px;height:24px;}
-.feature-prison{background-position:-24px -346px;width:24px;height:24px;}
-.feature-post{background-position:-48px -346px;width:24px;height:24px;}
-.feature-police{background-position:-72px -346px;width:24px;height:24px;}
-.feature-place-of-worship{background-position:-96px -346px;width:24px;height:24px;}
-.feature-pitch{background-position:-120px -346px;width:24px;height:24px;}
-.feature-pharmacy{background-position:-144px -346px;width:24px;height:24px;}
-.feature-parking{background-position:-168px -346px;width:24px;height:24px;}
-.feature-parking-garage{background-position:-192px -346px;width:24px;height:24px;}
-.feature-park2{background-position:-216px -346px;width:24px;height:24px;}
-.feature-park{background-position:-240px -346px;width:24px;height:24px;}
-.feature-oil-well{background-position:-264px -346px;width:24px;height:24px;}
-.feature-museum{background-position:-288px -346px;width:24px;height:24px;}
-.feature-monument{background-position:-312px -346px;width:24px;height:24px;}
-.feature-minefield{background-position:-336px -346px;width:24px;height:24px;}
-.feature-marker{background-position:-360px -346px;width:24px;height:24px;}
-.feature-marker-stroked{background-position:-384px 0px;width:24px;height:24px;}
-.feature-london-underground{background-position:-384px -24px;width:24px;height:24px;}
-.feature-logging{background-position:-384px -48px;width:24px;height:24px;}
-.feature-lodging{background-position:-384px -72px;width:24px;height:24px;}
-.feature-library{background-position:-384px -96px;width:24px;height:24px;}
-.feature-industrial{background-position:-384px -120px;width:24px;height:24px;}
-.feature-hospital{background-position:-384px -144px;width:24px;height:24px;}
-.feature-heliport{background-position:-384px -168px;width:24px;height:24px;}
-.feature-harbor{background-position:-384px -192px;width:24px;height:24px;}
-.feature-grocery{background-position:-384px -216px;width:24px;height:24px;}
-.feature-golf{background-position:-384px -240px;width:24px;height:24px;}
-.feature-garden{background-position:-384px -264px;width:24px;height:24px;}
-.feature-fuel{background-position:-384px -288px;width:24px;height:24px;}
-.feature-fire-station{background-position:-384px -312px;width:24px;height:24px;}
-.feature-ferry{background-position:-384px -336px;width:24px;height:24px;}
-.feature-fast-food{background-position:0px -370px;width:24px;height:24px;}
-.feature-embassy{background-position:-24px -370px;width:24px;height:24px;}
-.feature-danger{background-position:-48px -370px;width:24px;height:24px;}
-.feature-dam{background-position:-72px -370px;width:24px;height:24px;}
-.feature-cross{background-position:-96px -370px;width:24px;height:24px;}
-.feature-cricket{background-position:-120px -370px;width:24px;height:24px;}
-.feature-commercial{background-position:-144px -370px;width:24px;height:24px;}
-.feature-college{background-position:-168px -370px;width:24px;height:24px;}
-.feature-circle{background-position:-192px -370px;width:24px;height:24px;}
-.feature-circle-stroked{background-position:-216px -370px;width:24px;height:24px;}
-.feature-cinema{background-position:-240px -370px;width:24px;height:24px;}
-.feature-cemetery{background-position:-264px -370px;width:24px;height:24px;}
-.feature-campsite{background-position:-288px -370px;width:24px;height:24px;}
-.feature-cafe{background-position:-312px -370px;width:24px;height:24px;}
-.feature-bus{background-position:-336px -370px;width:24px;height:24px;}
-.feature-bicycle{background-position:-360px -370px;width:24px;height:24px;}
-.feature-beer{background-position:-384px -370px;width:24px;height:24px;}
-.feature-basketball{background-position:-408px 0px;width:24px;height:24px;}
-.feature-baseball{background-position:-408px -24px;width:24px;height:24px;}
-.feature-bar{background-position:-408px -48px;width:24px;height:24px;}
-.feature-bank{background-position:-408px -72px;width:24px;height:24px;}
-.feature-art-gallery{background-position:-408px -96px;width:24px;height:24px;}
-.feature-america-football{background-position:-408px -120px;width:24px;height:24px;}
-.feature-alcohol-shop{background-position:-408px -144px;width:24px;height:24px;}
-.feature-airport{background-position:-408px -168px;width:24px;height:24px;}
-.feature-airfield{background-position:-408px -192px;width:24px;height:24px;}
-.feature-zoo-18{background-position:-408px -216px;width:18px;height:18px;}
-.feature-x-18{background-position:-408px -234px;width:18px;height:18px;}
-.feature-wetland-18{background-position:-408px -252px;width:18px;height:18px;}
-.feature-water-18{background-position:-408px -270px;width:18px;height:18px;}
-.feature-waste-basket-18{background-position:-408px -288px;width:18px;height:18px;}
-.feature-warehouse-18{background-position:-408px -306px;width:18px;height:18px;}
-.feature-triangle-stroked-18{background-position:-408px -324px;width:18px;height:18px;}
-.feature-triangle-18{background-position:-408px -342px;width:18px;height:18px;}
-.feature-town-hall-18{background-position:-408px -360px;width:18px;height:18px;}
-.feature-toilets-18{background-position:-54px -300px;width:18px;height:18px;}
-.feature-theatre-18{background-position:-72px -300px;width:18px;height:18px;}
-.feature-tennis-18{background-position:-90px -300px;width:18px;height:18px;}
-.feature-swimming-18{background-position:-108px -300px;width:18px;height:18px;}
-.feature-star-stroked-18{background-position:-126px -300px;width:18px;height:18px;}
-.feature-star-18{background-position:-144px -300px;width:18px;height:18px;}
-.feature-square-stroked-18{background-position:-162px -300px;width:18px;height:18px;}
-.feature-square-18{background-position:-180px -300px;width:18px;height:18px;}
-.feature-soccer-18{background-position:-198px -300px;width:18px;height:18px;}
-.feature-slaughterhouse-18{background-position:-216px -300px;width:18px;height:18px;}
-.feature-skiing-18{background-position:-234px -300px;width:18px;height:18px;}
-.feature-shop-18{background-position:-252px -300px;width:18px;height:18px;}
-.feature-school-18{background-position:-270px -300px;width:18px;height:18px;}
-.feature-roadblock-18{background-position:-288px -300px;width:18px;height:18px;}
-.feature-restaurant-18{background-position:-306px -300px;width:18px;height:18px;}
-.feature-religious-muslim-18{background-position:-324px -300px;width:18px;height:18px;}
-.feature-religious-jewish-18{background-position:-342px -300px;width:18px;height:18px;}
-.feature-religious-christian-18{background-position:0px -394px;width:18px;height:18px;}
-.feature-rail-underground-18{background-position:-18px -394px;width:18px;height:18px;}
-.feature-rail-above-18{background-position:-36px -394px;width:18px;height:18px;}
-.feature-rail-18{background-position:-54px -394px;width:18px;height:18px;}
-.feature-prison-18{background-position:-72px -394px;width:18px;height:18px;}
-.feature-post-18{background-position:-90px -394px;width:18px;height:18px;}
-.feature-police-18{background-position:-108px -394px;width:18px;height:18px;}
-.feature-place-of-worship-18{background-position:-126px -394px;width:18px;height:18px;}
-.feature-pitch-18{background-position:-144px -394px;width:18px;height:18px;}
-.feature-pharmacy-18{background-position:-162px -394px;width:18px;height:18px;}
-.feature-parking-garage-18{background-position:-180px -394px;width:18px;height:18px;}
-.feature-parking-18{background-position:-198px -394px;width:18px;height:18px;}
-.feature-park2-18{background-position:-216px -394px;width:18px;height:18px;}
-.feature-park-18{background-position:-234px -394px;width:18px;height:18px;}
-.feature-oil-well-18{background-position:-252px -394px;width:18px;height:18px;}
-.feature-museum-18{background-position:-270px -394px;width:18px;height:18px;}
-.feature-monument-18{background-position:-288px -394px;width:18px;height:18px;}
-.feature-minefield-18{background-position:-306px -394px;width:18px;height:18px;}
-.feature-marker-stroked-18{background-position:-324px -394px;width:18px;height:18px;}
-.feature-marker-18{background-position:-342px -394px;width:18px;height:18px;}
-.feature-london-underground-18{background-position:-360px -394px;width:18px;height:18px;}
-.feature-logging-18{background-position:-378px -394px;width:18px;height:18px;}
-.feature-lodging-18{background-position:-396px -394px;width:18px;height:18px;}
-.feature-library-18{background-position:-414px -394px;width:18px;height:18px;}
-.feature-industrial-18{background-position:0px -412px;width:18px;height:18px;}
-.feature-hospital-18{background-position:-18px -412px;width:18px;height:18px;}
-.feature-heliport-18{background-position:-36px -412px;width:18px;height:18px;}
-.feature-harbor-18{background-position:-54px -412px;width:18px;height:18px;}
-.feature-grocery-18{background-position:-72px -412px;width:18px;height:18px;}
-.feature-golf-18{background-position:-90px -412px;width:18px;height:18px;}
-.feature-garden-18{background-position:-108px -412px;width:18px;height:18px;}
-.feature-fuel-18{background-position:-126px -412px;width:18px;height:18px;}
-.feature-fire-station-18{background-position:-144px -412px;width:18px;height:18px;}
-.feature-ferry-18{background-position:-162px -412px;width:18px;height:18px;}
-.feature-fast-food-18{background-position:-180px -412px;width:18px;height:18px;}
-.feature-embassy-18{background-position:-198px -412px;width:18px;height:18px;}
-.feature-danger-18{background-position:-216px -412px;width:18px;height:18px;}
-.feature-dam-18{background-position:-234px -412px;width:18px;height:18px;}
-.feature-cross-18{background-position:-252px -412px;width:18px;height:18px;}
-.feature-cricket-18{background-position:-270px -412px;width:18px;height:18px;}
-.feature-commercial-18{background-position:-288px -412px;width:18px;height:18px;}
-.feature-college-18{background-position:-306px -412px;width:18px;height:18px;}
-.feature-circle-stroked-18{background-position:-324px -412px;width:18px;height:18px;}
-.feature-circle-18{background-position:-342px -412px;width:18px;height:18px;}
-.feature-cinema-18{background-position:-360px -412px;width:18px;height:18px;}
-.feature-cemetery-18{background-position:-378px -412px;width:18px;height:18px;}
-.feature-campsite-18{background-position:-396px -412px;width:18px;height:18px;}
-.feature-cafe-18{background-position:-414px -412px;width:18px;height:18px;}
-.feature-bus-18{background-position:-432px 0px;width:18px;height:18px;}
-.feature-bicycle-18{background-position:-432px -18px;width:18px;height:18px;}
-.feature-beer-18{background-position:-432px -36px;width:18px;height:18px;}
-.feature-basketball-18{background-position:-432px -54px;width:18px;height:18px;}
-.feature-baseball-18{background-position:-432px -72px;width:18px;height:18px;}
-.feature-bar-18{background-position:-432px -90px;width:18px;height:18px;}
-.feature-bank-18{background-position:-432px -108px;width:18px;height:18px;}
-.feature-art-gallery-18{background-position:-432px -126px;width:18px;height:18px;}
-.feature-america-football-18{background-position:-432px -144px;width:18px;height:18px;}
-.feature-alcohol-shop-18{background-position:-432px -162px;width:18px;height:18px;}
-.feature-airport-18{background-position:-432px -180px;width:18px;height:18px;}
-.feature-airfield-18{background-position:-432px -198px;width:18px;height:18px;}
-.feature-zoo-12{background-position:-432px -216px;width:12px;height:12px;}
-.feature-x-12{background-position:-432px -228px;width:12px;height:12px;}
-.feature-wetland-12{background-position:-432px -240px;width:12px;height:12px;}
-.feature-water-12{background-position:-432px -252px;width:12px;height:12px;}
-.feature-waste-basket-12{background-position:-432px -264px;width:12px;height:12px;}
-.feature-warehouse-12{background-position:-432px -276px;width:12px;height:12px;}
-.feature-triangle-stroked-12{background-position:-432px -288px;width:12px;height:12px;}
-.feature-triangle-12{background-position:-432px -300px;width:12px;height:12px;}
-.feature-town-hall-12{background-position:-432px -312px;width:12px;height:12px;}
-.feature-toilets-12{background-position:-432px -324px;width:12px;height:12px;}
-.feature-theatre-12{background-position:-432px -336px;width:12px;height:12px;}
-.feature-tennis-12{background-position:-432px -348px;width:12px;height:12px;}
-.feature-swimming-12{background-position:-432px -360px;width:12px;height:12px;}
-.feature-star-stroked-12{background-position:-432px -372px;width:12px;height:12px;}
-.feature-star-12{background-position:-432px -384px;width:12px;height:12px;}
-.feature-square-stroked-12{background-position:-432px -396px;width:12px;height:12px;}
-.feature-square-12{background-position:-432px -408px;width:12px;height:12px;}
-.feature-soccer-12{background-position:-408px -378px;width:12px;height:12px;}
-.feature-slaughterhouse-12{background-position:-420px -378px;width:12px;height:12px;}
-.feature-skiing-12{background-position:0px -430px;width:12px;height:12px;}
-.feature-shop-12{background-position:-12px -430px;width:12px;height:12px;}
-.feature-school-12{background-position:-24px -430px;width:12px;height:12px;}
-.feature-roadblock-12{background-position:-36px -430px;width:12px;height:12px;}
-.feature-restaurant-12{background-position:-48px -430px;width:12px;height:12px;}
-.feature-religious-muslim-12{background-position:-60px -430px;width:12px;height:12px;}
-.feature-religious-jewish-12{background-position:-72px -430px;width:12px;height:12px;}
-.feature-religious-christian-12{background-position:-84px -430px;width:12px;height:12px;}
-.feature-rail-underground-12{background-position:-96px -430px;width:12px;height:12px;}
-.feature-rail-above-12{background-position:-108px -430px;width:12px;height:12px;}
-.feature-rail-12{background-position:-120px -430px;width:12px;height:12px;}
-.feature-prison-12{background-position:-132px -430px;width:12px;height:12px;}
-.feature-post-12{background-position:-144px -430px;width:12px;height:12px;}
-.feature-police-12{background-position:-156px -430px;width:12px;height:12px;}
-.feature-place-of-worship-12{background-position:-168px -430px;width:12px;height:12px;}
-.feature-pitch-12{background-position:-180px -430px;width:12px;height:12px;}
-.feature-pharmacy-12{background-position:-192px -430px;width:12px;height:12px;}
-.feature-parking-garage-12{background-position:-204px -430px;width:12px;height:12px;}
-.feature-parking-12{background-position:-216px -430px;width:12px;height:12px;}
-.feature-park2-12{background-position:-228px -430px;width:12px;height:12px;}
-.feature-park-12{background-position:-240px -430px;width:12px;height:12px;}
-.feature-oil-well-12{background-position:-252px -430px;width:12px;height:12px;}
-.feature-museum-12{background-position:-264px -430px;width:12px;height:12px;}
-.feature-monument-12{background-position:-276px -430px;width:12px;height:12px;}
-.feature-minefield-12{background-position:-288px -430px;width:12px;height:12px;}
-.feature-marker-stroked-12{background-position:-300px -430px;width:12px;height:12px;}
-.feature-marker-12{background-position:-312px -430px;width:12px;height:12px;}
-.feature-london-underground-12{background-position:-324px -430px;width:12px;height:12px;}
-.feature-logging-12{background-position:-336px -430px;width:12px;height:12px;}
-.feature-lodging-12{background-position:-348px -430px;width:12px;height:12px;}
-.feature-library-12{background-position:-360px -430px;width:12px;height:12px;}
-.feature-industrial-12{background-position:-372px -430px;width:12px;height:12px;}
-.feature-hospital-12{background-position:-384px -430px;width:12px;height:12px;}
-.feature-heliport-12{background-position:-396px -430px;width:12px;height:12px;}
-.feature-harbor-12{background-position:-408px -430px;width:12px;height:12px;}
-.feature-grocery-12{background-position:-420px -430px;width:12px;height:12px;}
-.feature-golf-12{background-position:-432px -430px;width:12px;height:12px;}
-.feature-garden-12{background-position:-450px 0px;width:12px;height:12px;}
-.feature-fuel-12{background-position:-450px -12px;width:12px;height:12px;}
-.feature-fire-station-12{background-position:-450px -24px;width:12px;height:12px;}
-.feature-ferry-12{background-position:-450px -36px;width:12px;height:12px;}
-.feature-fast-food-12{background-position:-450px -48px;width:12px;height:12px;}
-.feature-embassy-12{background-position:-450px -60px;width:12px;height:12px;}
-.feature-danger-12{background-position:-450px -72px;width:12px;height:12px;}
-.feature-dam-12{background-position:-450px -84px;width:12px;height:12px;}
-.feature-cross-12{background-position:-450px -96px;width:12px;height:12px;}
-.feature-cricket-12{background-position:-450px -108px;width:12px;height:12px;}
-.feature-commercial-12{background-position:-450px -120px;width:12px;height:12px;}
-.feature-college-12{background-position:-450px -132px;width:12px;height:12px;}
-.feature-circle-stroked-12{background-position:-450px -144px;width:12px;height:12px;}
-.feature-circle-12{background-position:-450px -156px;width:12px;height:12px;}
-.feature-cinema-12{background-position:-450px -168px;width:12px;height:12px;}
-.feature-cemetery-12{background-position:-450px -180px;width:12px;height:12px;}
-.feature-campsite-12{background-position:-450px -192px;width:12px;height:12px;}
-.feature-cafe-12{background-position:-450px -204px;width:12px;height:12px;}
-.feature-bus-12{background-position:-450px -216px;width:12px;height:12px;}
-.feature-bicycle-12{background-position:-450px -228px;width:12px;height:12px;}
-.feature-beer-12{background-position:-450px -240px;width:12px;height:12px;}
-.feature-basketball-12{background-position:-450px -252px;width:12px;height:12px;}
-.feature-baseball-12{background-position:-450px -264px;width:12px;height:12px;}
-.feature-bar-12{background-position:-450px -276px;width:12px;height:12px;}
-.feature-bank-12{background-position:-450px -288px;width:12px;height:12px;}
-.feature-art-gallery-12{background-position:-450px -300px;width:12px;height:12px;}
-.feature-america-football-12{background-position:-450px -312px;width:12px;height:12px;}
-.feature-alcohol-shop-12{background-position:-450px -324px;width:12px;height:12px;}
-.feature-airport-12{background-position:-450px -336px;width:12px;height:12px;}
-.feature-airfield-12{background-position:-450px -348px;width:12px;height:12px;}
+.feature-highway-track{background-position:-60px -180px;width:60px;height:60px;}
+.feature-highway-tertiary:link{background-position:-120px -180px;width:60px;height:60px;}
+.feature-highway-tertiary{background-position:-180px -180px;width:60px;height:60px;}
+.feature-highway-steps{background-position:-240px 0px;width:60px;height:60px;}
+.feature-highway-service{background-position:-240px -60px;width:60px;height:60px;}
+.feature-highway-secondary{background-position:-240px -120px;width:60px;height:60px;}
+.feature-highway-secondary-link{background-position:-240px -180px;width:60px;height:60px;}
+.feature-highway-road{background-position:0px -240px;width:60px;height:60px;}
+.feature-highway-residential{background-position:-60px -240px;width:60px;height:60px;}
+.feature-highway-primary{background-position:-120px -240px;width:60px;height:60px;}
+.feature-highway-primary-link{background-position:-180px -240px;width:60px;height:60px;}
+.feature-highway-path{background-position:-240px -240px;width:60px;height:60px;}
+.feature-highway-motorway{background-position:-300px 0px;width:60px;height:60px;}
+.feature-highway-motorway-link{background-position:-300px -60px;width:60px;height:60px;}
+.feature-highway-living_street{background-position:-300px -120px;width:60px;height:60px;}
+.feature-highway-footway{background-position:-300px -180px;width:60px;height:60px;}
+.feature-highway-cycleway{background-position:-300px -240px;width:60px;height:60px;}
+.feature-highway-bridleway{background-position:0px -300px;width:60px;height:60px;}
+.feature-zoo{background-position:-60px -300px;width:24px;height:24px;}
+.feature-x{background-position:-84px -300px;width:24px;height:24px;}
+.feature-wetland{background-position:-108px -300px;width:24px;height:24px;}
+.feature-water{background-position:-132px -300px;width:24px;height:24px;}
+.feature-waste-basket{background-position:-156px -300px;width:24px;height:24px;}
+.feature-warehouse{background-position:-180px -300px;width:24px;height:24px;}
+.feature-triangle{background-position:-204px -300px;width:24px;height:24px;}
+.feature-triangle-stroked{background-position:-228px -300px;width:24px;height:24px;}
+.feature-town-hall{background-position:-252px -300px;width:24px;height:24px;}
+.feature-toilets{background-position:-276px -300px;width:24px;height:24px;}
+.feature-theatre{background-position:-300px -300px;width:24px;height:24px;}
+.feature-tennis{background-position:-324px -300px;width:24px;height:24px;}
+.feature-swimming{background-position:-60px -324px;width:24px;height:24px;}
+.feature-star{background-position:-84px -324px;width:24px;height:24px;}
+.feature-star-stroked{background-position:-108px -324px;width:24px;height:24px;}
+.feature-square{background-position:-132px -324px;width:24px;height:24px;}
+.feature-square-stroked{background-position:-156px -324px;width:24px;height:24px;}
+.feature-soccer{background-position:-180px -324px;width:24px;height:24px;}
+.feature-slaughterhouse{background-position:-204px -324px;width:24px;height:24px;}
+.feature-skiing{background-position:-228px -324px;width:24px;height:24px;}
+.feature-shop{background-position:-252px -324px;width:24px;height:24px;}
+.feature-school{background-position:-276px -324px;width:24px;height:24px;}
+.feature-roadblock{background-position:-300px -324px;width:24px;height:24px;}
+.feature-restaurant{background-position:-324px -324px;width:24px;height:24px;}
+.feature-religious-muslim{background-position:-360px 0px;width:24px;height:24px;}
+.feature-religious-jewish{background-position:-360px -24px;width:24px;height:24px;}
+.feature-religious-christian{background-position:-360px -48px;width:24px;height:24px;}
+.feature-rail{background-position:-360px -72px;width:24px;height:24px;}
+.feature-rail-underground{background-position:-360px -96px;width:24px;height:24px;}
+.feature-rail-above{background-position:-360px -120px;width:24px;height:24px;}
+.feature-prison{background-position:-360px -144px;width:24px;height:24px;}
+.feature-post{background-position:-360px -168px;width:24px;height:24px;}
+.feature-police{background-position:-360px -192px;width:24px;height:24px;}
+.feature-place-of-worship{background-position:-360px -216px;width:24px;height:24px;}
+.feature-pitch{background-position:-360px -240px;width:24px;height:24px;}
+.feature-pharmacy{background-position:-360px -264px;width:24px;height:24px;}
+.feature-parking{background-position:-360px -288px;width:24px;height:24px;}
+.feature-parking-garage{background-position:-360px -312px;width:24px;height:24px;}
+.feature-park2{background-position:-360px -336px;width:24px;height:24px;}
+.feature-park{background-position:0px -360px;width:24px;height:24px;}
+.feature-oil-well{background-position:-24px -360px;width:24px;height:24px;}
+.feature-museum{background-position:-48px -360px;width:24px;height:24px;}
+.feature-monument{background-position:-72px -360px;width:24px;height:24px;}
+.feature-minefield{background-position:-96px -360px;width:24px;height:24px;}
+.feature-marker{background-position:-120px -360px;width:24px;height:24px;}
+.feature-marker-stroked{background-position:-144px -360px;width:24px;height:24px;}
+.feature-london-underground{background-position:-168px -360px;width:24px;height:24px;}
+.feature-logging{background-position:-192px -360px;width:24px;height:24px;}
+.feature-lodging{background-position:-216px -360px;width:24px;height:24px;}
+.feature-library{background-position:-240px -360px;width:24px;height:24px;}
+.feature-industrial{background-position:-264px -360px;width:24px;height:24px;}
+.feature-hospital{background-position:-288px -360px;width:24px;height:24px;}
+.feature-heliport{background-position:-312px -360px;width:24px;height:24px;}
+.feature-harbor{background-position:-336px -360px;width:24px;height:24px;}
+.feature-grocery{background-position:-360px -360px;width:24px;height:24px;}
+.feature-golf{background-position:-384px 0px;width:24px;height:24px;}
+.feature-garden{background-position:-384px -24px;width:24px;height:24px;}
+.feature-fuel{background-position:-384px -48px;width:24px;height:24px;}
+.feature-fire-station{background-position:-384px -72px;width:24px;height:24px;}
+.feature-ferry{background-position:-384px -96px;width:24px;height:24px;}
+.feature-fast-food{background-position:-384px -120px;width:24px;height:24px;}
+.feature-embassy{background-position:-384px -144px;width:24px;height:24px;}
+.feature-danger{background-position:-384px -168px;width:24px;height:24px;}
+.feature-dam{background-position:-384px -192px;width:24px;height:24px;}
+.feature-cross{background-position:-384px -216px;width:24px;height:24px;}
+.feature-cricket{background-position:-384px -240px;width:24px;height:24px;}
+.feature-commercial{background-position:-384px -264px;width:24px;height:24px;}
+.feature-college{background-position:-384px -288px;width:24px;height:24px;}
+.feature-circle{background-position:-384px -312px;width:24px;height:24px;}
+.feature-circle-stroked{background-position:-384px -336px;width:24px;height:24px;}
+.feature-cinema{background-position:-384px -360px;width:24px;height:24px;}
+.feature-cemetery{background-position:0px -384px;width:24px;height:24px;}
+.feature-campsite{background-position:-24px -384px;width:24px;height:24px;}
+.feature-cafe{background-position:-48px -384px;width:24px;height:24px;}
+.feature-bus{background-position:-72px -384px;width:24px;height:24px;}
+.feature-bicycle{background-position:-96px -384px;width:24px;height:24px;}
+.feature-beer{background-position:-120px -384px;width:24px;height:24px;}
+.feature-basketball{background-position:-144px -384px;width:24px;height:24px;}
+.feature-baseball{background-position:-168px -384px;width:24px;height:24px;}
+.feature-bar{background-position:-192px -384px;width:24px;height:24px;}
+.feature-bank{background-position:-216px -384px;width:24px;height:24px;}
+.feature-art-gallery{background-position:-240px -384px;width:24px;height:24px;}
+.feature-america-football{background-position:-264px -384px;width:24px;height:24px;}
+.feature-alcohol-shop{background-position:-288px -384px;width:24px;height:24px;}
+.feature-airport{background-position:-312px -384px;width:24px;height:24px;}
+.feature-airfield{background-position:-336px -384px;width:24px;height:24px;}
+.feature-zoo-18{background-position:-360px -384px;width:18px;height:18px;}
+.feature-x-18{background-position:-378px -384px;width:18px;height:18px;}
+.feature-wetland-18{background-position:-408px 0px;width:18px;height:18px;}
+.feature-water-18{background-position:-408px -18px;width:18px;height:18px;}
+.feature-waste-basket-18{background-position:-408px -36px;width:18px;height:18px;}
+.feature-warehouse-18{background-position:-408px -54px;width:18px;height:18px;}
+.feature-triangle-stroked-18{background-position:-408px -72px;width:18px;height:18px;}
+.feature-triangle-18{background-position:-408px -90px;width:18px;height:18px;}
+.feature-town-hall-18{background-position:-408px -108px;width:18px;height:18px;}
+.feature-toilets-18{background-position:-408px -126px;width:18px;height:18px;}
+.feature-theatre-18{background-position:-408px -144px;width:18px;height:18px;}
+.feature-tennis-18{background-position:-408px -162px;width:18px;height:18px;}
+.feature-swimming-18{background-position:-408px -180px;width:18px;height:18px;}
+.feature-star-stroked-18{background-position:-408px -198px;width:18px;height:18px;}
+.feature-star-18{background-position:-408px -216px;width:18px;height:18px;}
+.feature-square-stroked-18{background-position:-408px -234px;width:18px;height:18px;}
+.feature-square-18{background-position:-408px -252px;width:18px;height:18px;}
+.feature-soccer-18{background-position:-408px -270px;width:18px;height:18px;}
+.feature-slaughterhouse-18{background-position:-408px -288px;width:18px;height:18px;}
+.feature-skiing-18{background-position:-408px -306px;width:18px;height:18px;}
+.feature-shop-18{background-position:-408px -324px;width:18px;height:18px;}
+.feature-school-18{background-position:-408px -342px;width:18px;height:18px;}
+.feature-roadblock-18{background-position:-408px -360px;width:18px;height:18px;}
+.feature-restaurant-18{background-position:-408px -378px;width:18px;height:18px;}
+.feature-religious-muslim-18{background-position:0px -408px;width:18px;height:18px;}
+.feature-religious-jewish-18{background-position:-18px -408px;width:18px;height:18px;}
+.feature-religious-christian-18{background-position:-36px -408px;width:18px;height:18px;}
+.feature-rail-underground-18{background-position:-54px -408px;width:18px;height:18px;}
+.feature-rail-above-18{background-position:-72px -408px;width:18px;height:18px;}
+.feature-rail-18{background-position:-90px -408px;width:18px;height:18px;}
+.feature-prison-18{background-position:-108px -408px;width:18px;height:18px;}
+.feature-post-18{background-position:-126px -408px;width:18px;height:18px;}
+.feature-police-18{background-position:-144px -408px;width:18px;height:18px;}
+.feature-place-of-worship-18{background-position:-162px -408px;width:18px;height:18px;}
+.feature-pitch-18{background-position:-180px -408px;width:18px;height:18px;}
+.feature-pharmacy-18{background-position:-198px -408px;width:18px;height:18px;}
+.feature-parking-garage-18{background-position:-216px -408px;width:18px;height:18px;}
+.feature-parking-18{background-position:-234px -408px;width:18px;height:18px;}
+.feature-park2-18{background-position:-252px -408px;width:18px;height:18px;}
+.feature-park-18{background-position:-270px -408px;width:18px;height:18px;}
+.feature-oil-well-18{background-position:-288px -408px;width:18px;height:18px;}
+.feature-museum-18{background-position:-306px -408px;width:18px;height:18px;}
+.feature-monument-18{background-position:-324px -408px;width:18px;height:18px;}
+.feature-minefield-18{background-position:-342px -408px;width:18px;height:18px;}
+.feature-marker-stroked-18{background-position:-360px -408px;width:18px;height:18px;}
+.feature-marker-18{background-position:-378px -408px;width:18px;height:18px;}
+.feature-london-underground-18{background-position:-396px -408px;width:18px;height:18px;}
+.feature-logging-18{background-position:-426px 0px;width:18px;height:18px;}
+.feature-lodging-18{background-position:-426px -18px;width:18px;height:18px;}
+.feature-library-18{background-position:-426px -36px;width:18px;height:18px;}
+.feature-industrial-18{background-position:-426px -54px;width:18px;height:18px;}
+.feature-hospital-18{background-position:-426px -72px;width:18px;height:18px;}
+.feature-heliport-18{background-position:-426px -90px;width:18px;height:18px;}
+.feature-harbor-18{background-position:-426px -108px;width:18px;height:18px;}
+.feature-grocery-18{background-position:-426px -126px;width:18px;height:18px;}
+.feature-golf-18{background-position:-426px -144px;width:18px;height:18px;}
+.feature-garden-18{background-position:-426px -162px;width:18px;height:18px;}
+.feature-fuel-18{background-position:-426px -180px;width:18px;height:18px;}
+.feature-fire-station-18{background-position:-426px -198px;width:18px;height:18px;}
+.feature-ferry-18{background-position:-426px -216px;width:18px;height:18px;}
+.feature-fast-food-18{background-position:-426px -234px;width:18px;height:18px;}
+.feature-embassy-18{background-position:-426px -252px;width:18px;height:18px;}
+.feature-danger-18{background-position:-426px -270px;width:18px;height:18px;}
+.feature-dam-18{background-position:-426px -288px;width:18px;height:18px;}
+.feature-cross-18{background-position:-426px -306px;width:18px;height:18px;}
+.feature-cricket-18{background-position:-426px -324px;width:18px;height:18px;}
+.feature-commercial-18{background-position:-426px -342px;width:18px;height:18px;}
+.feature-college-18{background-position:-426px -360px;width:18px;height:18px;}
+.feature-circle-stroked-18{background-position:-426px -378px;width:18px;height:18px;}
+.feature-circle-18{background-position:-426px -396px;width:18px;height:18px;}
+.feature-cinema-18{background-position:0px -426px;width:18px;height:18px;}
+.feature-cemetery-18{background-position:-18px -426px;width:18px;height:18px;}
+.feature-campsite-18{background-position:-36px -426px;width:18px;height:18px;}
+.feature-cafe-18{background-position:-54px -426px;width:18px;height:18px;}
+.feature-bus-18{background-position:-72px -426px;width:18px;height:18px;}
+.feature-bicycle-18{background-position:-90px -426px;width:18px;height:18px;}
+.feature-beer-18{background-position:-108px -426px;width:18px;height:18px;}
+.feature-basketball-18{background-position:-126px -426px;width:18px;height:18px;}
+.feature-baseball-18{background-position:-144px -426px;width:18px;height:18px;}
+.feature-bar-18{background-position:-162px -426px;width:18px;height:18px;}
+.feature-bank-18{background-position:-180px -426px;width:18px;height:18px;}
+.feature-art-gallery-18{background-position:-198px -426px;width:18px;height:18px;}
+.feature-america-football-18{background-position:-216px -426px;width:18px;height:18px;}
+.feature-alcohol-shop-18{background-position:-234px -426px;width:18px;height:18px;}
+.feature-airport-18{background-position:-252px -426px;width:18px;height:18px;}
+.feature-airfield-18{background-position:-270px -426px;width:18px;height:18px;}
+.feature-zoo-12{background-position:-426px -414px;width:12px;height:12px;}
+.feature-x-12{background-position:-408px -396px;width:12px;height:12px;}
+.feature-wetland-12{background-position:-348px -300px;width:12px;height:12px;}
+.feature-water-12{background-position:-348px -312px;width:12px;height:12px;}
+.feature-waste-basket-12{background-position:-348px -324px;width:12px;height:12px;}
+.feature-warehouse-12{background-position:-348px -336px;width:12px;height:12px;}
+.feature-triangle-stroked-12{background-position:-60px -348px;width:12px;height:12px;}
+.feature-triangle-12{background-position:-72px -348px;width:12px;height:12px;}
+.feature-town-hall-12{background-position:-84px -348px;width:12px;height:12px;}
+.feature-toilets-12{background-position:-96px -348px;width:12px;height:12px;}
+.feature-theatre-12{background-position:-108px -348px;width:12px;height:12px;}
+.feature-tennis-12{background-position:-120px -348px;width:12px;height:12px;}
+.feature-swimming-12{background-position:-132px -348px;width:12px;height:12px;}
+.feature-star-stroked-12{background-position:-144px -348px;width:12px;height:12px;}
+.feature-star-12{background-position:-156px -348px;width:12px;height:12px;}
+.feature-square-stroked-12{background-position:-168px -348px;width:12px;height:12px;}
+.feature-square-12{background-position:-180px -348px;width:12px;height:12px;}
+.feature-soccer-12{background-position:-192px -348px;width:12px;height:12px;}
+.feature-slaughterhouse-12{background-position:-204px -348px;width:12px;height:12px;}
+.feature-skiing-12{background-position:-216px -348px;width:12px;height:12px;}
+.feature-shop-12{background-position:-228px -348px;width:12px;height:12px;}
+.feature-school-12{background-position:-240px -348px;width:12px;height:12px;}
+.feature-roadblock-12{background-position:-252px -348px;width:12px;height:12px;}
+.feature-restaurant-12{background-position:-264px -348px;width:12px;height:12px;}
+.feature-religious-muslim-12{background-position:-276px -348px;width:12px;height:12px;}
+.feature-religious-jewish-12{background-position:-288px -348px;width:12px;height:12px;}
+.feature-religious-christian-12{background-position:-300px -348px;width:12px;height:12px;}
+.feature-rail-underground-12{background-position:-312px -348px;width:12px;height:12px;}
+.feature-rail-above-12{background-position:-324px -348px;width:12px;height:12px;}
+.feature-rail-12{background-position:-336px -348px;width:12px;height:12px;}
+.feature-prison-12{background-position:-348px -348px;width:12px;height:12px;}
+.feature-post-12{background-position:-396px -384px;width:12px;height:12px;}
+.feature-police-12{background-position:-414px -408px;width:12px;height:12px;}
+.feature-place-of-worship-12{background-position:-288px -426px;width:12px;height:12px;}
+.feature-pitch-12{background-position:-300px -426px;width:12px;height:12px;}
+.feature-pharmacy-12{background-position:-312px -426px;width:12px;height:12px;}
+.feature-parking-garage-12{background-position:-324px -426px;width:12px;height:12px;}
+.feature-parking-12{background-position:-336px -426px;width:12px;height:12px;}
+.feature-park2-12{background-position:-348px -426px;width:12px;height:12px;}
+.feature-park-12{background-position:-360px -426px;width:12px;height:12px;}
+.feature-oil-well-12{background-position:-372px -426px;width:12px;height:12px;}
+.feature-museum-12{background-position:-384px -426px;width:12px;height:12px;}
+.feature-monument-12{background-position:-396px -426px;width:12px;height:12px;}
+.feature-minefield-12{background-position:-408px -426px;width:12px;height:12px;}
+.feature-marker-stroked-12{background-position:-420px -426px;width:12px;height:12px;}
+.feature-marker-12{background-position:-432px -426px;width:12px;height:12px;}
+.feature-london-underground-12{background-position:-444px 0px;width:12px;height:12px;}
+.feature-logging-12{background-position:-444px -12px;width:12px;height:12px;}
+.feature-lodging-12{background-position:-444px -24px;width:12px;height:12px;}
+.feature-library-12{background-position:-444px -36px;width:12px;height:12px;}
+.feature-industrial-12{background-position:-444px -48px;width:12px;height:12px;}
+.feature-hospital-12{background-position:-444px -60px;width:12px;height:12px;}
+.feature-heliport-12{background-position:-444px -72px;width:12px;height:12px;}
+.feature-harbor-12{background-position:-444px -84px;width:12px;height:12px;}
+.feature-grocery-12{background-position:-444px -96px;width:12px;height:12px;}
+.feature-golf-12{background-position:-444px -108px;width:12px;height:12px;}
+.feature-garden-12{background-position:-444px -120px;width:12px;height:12px;}
+.feature-fuel-12{background-position:-444px -132px;width:12px;height:12px;}
+.feature-fire-station-12{background-position:-444px -144px;width:12px;height:12px;}
+.feature-ferry-12{background-position:-444px -156px;width:12px;height:12px;}
+.feature-fast-food-12{background-position:-444px -168px;width:12px;height:12px;}
+.feature-embassy-12{background-position:-444px -180px;width:12px;height:12px;}
+.feature-danger-12{background-position:-444px -192px;width:12px;height:12px;}
+.feature-dam-12{background-position:-444px -204px;width:12px;height:12px;}
+.feature-cross-12{background-position:-444px -216px;width:12px;height:12px;}
+.feature-cricket-12{background-position:-444px -228px;width:12px;height:12px;}
+.feature-commercial-12{background-position:-444px -240px;width:12px;height:12px;}
+.feature-college-12{background-position:-444px -252px;width:12px;height:12px;}
+.feature-circle-stroked-12{background-position:-444px -264px;width:12px;height:12px;}
+.feature-circle-12{background-position:-444px -276px;width:12px;height:12px;}
+.feature-cinema-12{background-position:-444px -288px;width:12px;height:12px;}
+.feature-cemetery-12{background-position:-444px -300px;width:12px;height:12px;}
+.feature-campsite-12{background-position:-444px -312px;width:12px;height:12px;}
+.feature-cafe-12{background-position:-444px -324px;width:12px;height:12px;}
+.feature-bus-12{background-position:-444px -336px;width:12px;height:12px;}
+.feature-bicycle-12{background-position:-444px -348px;width:12px;height:12px;}
+.feature-beer-12{background-position:-444px -360px;width:12px;height:12px;}
+.feature-basketball-12{background-position:-444px -372px;width:12px;height:12px;}
+.feature-baseball-12{background-position:-444px -384px;width:12px;height:12px;}
+.feature-bar-12{background-position:-444px -396px;width:12px;height:12px;}
+.feature-bank-12{background-position:-444px -408px;width:12px;height:12px;}
+.feature-art-gallery-12{background-position:-444px -420px;width:12px;height:12px;}
+.feature-america-football-12{background-position:-444px -432px;width:12px;height:12px;}
+.feature-alcohol-shop-12{background-position:0px -444px;width:12px;height:12px;}
+.feature-airport-12{background-position:-12px -444px;width:12px;height:12px;}
+.feature-airfield-12{background-position:-24px -444px;width:12px;height:12px;}
diff --git a/img/feature-icons.png b/img/feature-icons.png
index 663180538..edfb5ded1 100644
Binary files a/img/feature-icons.png and b/img/feature-icons.png differ
diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg
index b9d576f91..e9936420d 100644
--- a/img/source/line-presets.svg
+++ b/img/source/line-presets.svg
@@ -126,16 +126,6 @@
          offset="1"
          style="stop-color:#b5b5b5;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5138-2"
-       id="linearGradient7078-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-250,-110)"
-       x1="200"
-       y1="162.36218"
-       x2="200"
-       y2="147.36218" />
     <linearGradient
        id="linearGradient5138-2"
        inkscape:collect="always">
@@ -158,16 +148,6 @@
        id="linearGradient6374"
        xlink:href="#linearGradient5138-2"
        inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5150-7"
-       id="linearGradient7337-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-410,-97.637817)"
-       x1="610"
-       y1="147"
-       x2="610"
-       y2="135" />
     <linearGradient
        id="linearGradient5150-7"
        inkscape:collect="always">
@@ -248,8 +228,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="636.34449"
-     inkscape:cy="12.095372"
+     inkscape:cx="286.0879"
+     inkscape:cy="78.076074"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -343,6 +323,10 @@
        orientation="0,1"
        position="76,-84"
        id="guide6110" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="665,71"
+       id="guide5181" />
   </sodipodi:namedview>
   <metadata
      id="metadata7018">
@@ -700,7 +684,7 @@
          inkscape:label="#path24321"
          sodipodi:nodetypes="cscscscsccscscscscc"
          inkscape:connector-curvature="0"
-         id="waterway-riverdsads"
+         id="245"
          d="m 406.76193,73.362183 c 0,0 -0.53638,-1.846128 -0.34524,-2.75 0.22134,-1.046677 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 0,0 -0.53639,-1.846127 -0.34525,-2.75 0.22134,-1.046678 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 l 16.5,0 c 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 z"
          style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
@@ -2940,7 +2924,7 @@
            sodipodi:nodetypes="cccccccccssccccccssccccccccccccccccccccccccccccccccccccccccccccccc" />
         <path
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           d="m 212,46.36218 4,1.50001 0,20.87499 7,2.625 0,-12.375 -3,-1.125 0,-7 1,0.375 2,0.75 0,-1.125 0,-9.5 z"
+           d="m 212,49.36218 4,1.50001 0,17.87499 7,2.625 0,-12.375 -3,-1.125 0,-4 1,0.375 2,0.75 0,-1.125 0,-9.5 z"
            id="path23978"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccccccccccc" />
@@ -2960,7 +2944,7 @@
            sodipodi:nodetypes="cccccccccccc"
            inkscape:connector-curvature="0"
            id="path23989"
-           d="m 188,46.36218 -4,1.50001 0,20.87499 -7,2.625 0,-12.375 3,-1.125 0,-7 -1,0.375 -2,0.75 0,-1.125 0,-9.5 z"
+           d="m 188,49.36218 -4,1.50001 0,17.87499 -7,2.625 0,-12.375 3,-1.125 0,-4 -1,0.375 -2,0.75 0,-1.125 0,-9.5 z"
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
         <rect
            y="78.362183"
@@ -3007,11 +2991,6 @@
              transform="translate(-362,12.362183)" />
         </g>
       </g>
-      <path
-         id="rect23474-8"
-         d="m -72.125,37.362183 -0.875,2 13,6 0,2 -4,2 0,3 7,-3 0,-12 -15.125,0 z m 29.125,0 0,12 7,3 0,-3 -4,-2 0,-2 13,-6 -0.875,-2 -15.125,0 z"
-         style="opacity:0.5;color:#000000;fill:url(#linearGradient7078-0);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
     </g>
     <g
        id="g7457"
@@ -3040,8 +3019,8 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccccc" />
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#989898;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           d="m 628,43.36218 -4,1.50001 0,23.87499 -7,2.625 0,-12.375 3,-1.125 0,-7 -1,0.375 -2,0.75 0,-1.125 0,-12.5 z"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m 628,49.36218 -4,1.50001 0,17.87499 -7,2.625 0,-12.375 3,-1.125 0,-4 -1,0.375 -2,0.75 0,-1.125 0,-9.5 z"
            id="path25569"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccccccccccc" />
@@ -3049,7 +3028,7 @@
            sodipodi:nodetypes="ccccccccccccccccccccccccccccccsssss"
            inkscape:connector-curvature="0"
            id="rect24381-9"
-           d="m 661,47.362183 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m -1,5 -1,1 -5,5 2.5,0 2.5,-2.5 0,4.5 0,7 1,0 1,-1 0,-6 2.1875,0 0.8125,4 2,0 2,0 1,-1 0,-1 -3.4062,0 -0.5938,-3 0,-6 -1,-1 z m -4.5,10 c -0.8284,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.6716,1.5 1.5,1.5 0.8284,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.6716,-1.5 -1.5,-1.5 z"
+           d="m 661,47.362183 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 z m -1,5 -1,1 -5,5 2.5,0 2.5,-2.5 0,4.5 0,7 1,0 1,-1 0,-6 2.1875,0 0.8125,4 2,0 2,0 1,-1 0,-1 -3.4062,0 -0.5938,-3 0,-6 -1,-1 z m -4.5,11 c -0.8284,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.6716,1.5 1.5,1.5 0.8284,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.6716,-1.5 -1.5,-1.5 z"
            style="color:#000000;fill:#989898;fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <path
            sodipodi:nodetypes="ccccc"
@@ -3121,11 +3100,6 @@
            style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            sodipodi:type="arc" />
       </g>
-      <path
-         id="rect16839-4"
-         d="m 169.1562,37.362183 10.8438,5 0,2 -4,2 0,6 7,-3 0,-12 -13.8438,0 z"
-         style="opacity:0.5;color:#000000;fill:url(#linearGradient7337-9);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
     </g>
     <g
        id="waterway-canal"
@@ -3195,8 +3169,9 @@
              style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              d="m 1722,39 c 0,0 0.5349,1.84613 0.3438,2.75 -0.2214,1.04668 -1.6563,2.75 -1.6563,2.75 0,0 -1.4349,1.70333 -1.6563,2.75 -0.1911,0.90388 0.3438,2.75 0.3438,2.75 0,0 0.5349,1.84613 0.3438,2.75 -0.2214,1.04668 -1.6563,2.75 -1.6563,2.75 0,0 -1.4349,1.70333 -1.6563,2.75 -0.1911,0.90388 0.3438,2.75 0.3438,2.75 l 27,0 c 0,0 -1.4349,-1.70332 -1.6562,-2.75 -0.1912,-0.90387 0.3437,-2.75 0.3437,-2.75 0,0 0.5349,-1.84612 0.3437,-2.75 -0.2213,-1.04667 -1.6562,-2.75 -1.6562,-2.75 0,0 -1.4349,-1.70332 -1.6562,-2.75 -0.1912,-0.90387 0.3437,-2.75 0.3437,-2.75 0,0 0.5349,-1.84612 0.3437,-2.75 C 1739.9349,40.70333 1738.5,39 1738.5,39 l -16.5,0 z m 6,2 4,0 2,2 0,12 -2,2 -4,0 -2,-2 0,-12 2,-2 z"
              transform="translate(-1310,12.362183)"
-             id="waterway-riverdsads-8"
-             inkscape:connector-curvature="0" />
+             id="333"
+             inkscape:connector-curvature="0"
+             inkscape:label="#waterway-riverdsads-8" />
         </g>
         <path
            style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"