diff --git a/css/feature-icons.css b/css/feature-icons.css
new file mode 100644
index 000000000..52e8a87f4
--- /dev/null
+++ b/css/feature-icons.css
@@ -0,0 +1,541 @@
+/* glue: 0.3 hash: 1aa9a5a776 */
+.feature-waterway-river,
+.feature-railway-rail,
+.feature-highway,
+.feature-highway-trunk,
+.feature-highway-tertiary,
+.feature-highway-service,
+.feature-highway-secondary,
+.feature-highway-residential,
+.feature-highway-primary,
+.feature-highway-motorway,
+.feature-highway-footway,
+.feature-highway-cycleway,
+.feature-zoo,
+.feature-x,
+.feature-wetland,
+.feature-water,
+.feature-waste-basket,
+.feature-warehouse,
+.feature-triangle,
+.feature-triangle-stroked,
+.feature-town-hall,
+.feature-toilets,
+.feature-theatre,
+.feature-tennis,
+.feature-swimming,
+.feature-star,
+.feature-star-stroked,
+.feature-square,
+.feature-square-stroked,
+.feature-soccer,
+.feature-slaughterhouse,
+.feature-skiing,
+.feature-shop,
+.feature-school,
+.feature-roadblock,
+.feature-restaurant,
+.feature-religious-muslim,
+.feature-religious-jewish,
+.feature-religious-christian,
+.feature-rail,
+.feature-rail-underground,
+.feature-rail-above,
+.feature-prison,
+.feature-post,
+.feature-police,
+.feature-place-of-worship,
+.feature-pitch,
+.feature-pharmacy,
+.feature-parking,
+.feature-parking-garage,
+.feature-park2,
+.feature-park,
+.feature-oil-well,
+.feature-museum,
+.feature-monument,
+.feature-minefield,
+.feature-marker,
+.feature-marker-stroked,
+.feature-london-underground,
+.feature-logging,
+.feature-lodging,
+.feature-library,
+.feature-industrial,
+.feature-hospital,
+.feature-heliport,
+.feature-harbor,
+.feature-grocery,
+.feature-golf,
+.feature-garden,
+.feature-fuel,
+.feature-fire-station,
+.feature-ferry,
+.feature-fast-food,
+.feature-embassy,
+.feature-danger,
+.feature-dam,
+.feature-cross,
+.feature-cricket,
+.feature-commercial,
+.feature-college,
+.feature-circle,
+.feature-circle-stroked,
+.feature-cinema,
+.feature-cemetery,
+.feature-campsite,
+.feature-cafe,
+.feature-bus,
+.feature-bicycle,
+.feature-beer,
+.feature-basketball,
+.feature-baseball,
+.feature-bar,
+.feature-bank,
+.feature-art-gallery,
+.feature-america-football,
+.feature-alcohol-shop,
+.feature-airport,
+.feature-airfield,
+.feature-zoo-18,
+.feature-x-18,
+.feature-wetland-18,
+.feature-water-18,
+.feature-waste-basket-18,
+.feature-warehouse-18,
+.feature-triangle-stroked-18,
+.feature-triangle-18,
+.feature-town-hall-18,
+.feature-toilets-18,
+.feature-theatre-18,
+.feature-tennis-18,
+.feature-swimming-18,
+.feature-star-stroked-18,
+.feature-star-18,
+.feature-square-stroked-18,
+.feature-square-18,
+.feature-soccer-18,
+.feature-slaughterhouse-18,
+.feature-skiing-18,
+.feature-shop-18,
+.feature-school-18,
+.feature-roadblock-18,
+.feature-restaurant-18,
+.feature-religious-muslim-18,
+.feature-religious-jewish-18,
+.feature-religious-christian-18,
+.feature-rail-underground-18,
+.feature-rail-above-18,
+.feature-rail-18,
+.feature-prison-18,
+.feature-post-18,
+.feature-police-18,
+.feature-place-of-worship-18,
+.feature-pitch-18,
+.feature-pharmacy-18,
+.feature-parking-garage-18,
+.feature-parking-18,
+.feature-park2-18,
+.feature-park-18,
+.feature-oil-well-18,
+.feature-museum-18,
+.feature-monument-18,
+.feature-minefield-18,
+.feature-marker-stroked-18,
+.feature-marker-18,
+.feature-london-underground-18,
+.feature-logging-18,
+.feature-lodging-18,
+.feature-library-18,
+.feature-industrial-18,
+.feature-hospital-18,
+.feature-heliport-18,
+.feature-harbor-18,
+.feature-grocery-18,
+.feature-golf-18,
+.feature-garden-18,
+.feature-fuel-18,
+.feature-fire-station-18,
+.feature-ferry-18,
+.feature-fast-food-18,
+.feature-embassy-18,
+.feature-danger-18,
+.feature-dam-18,
+.feature-cross-18,
+.feature-cricket-18,
+.feature-commercial-18,
+.feature-college-18,
+.feature-circle-stroked-18,
+.feature-circle-18,
+.feature-cinema-18,
+.feature-cemetery-18,
+.feature-campsite-18,
+.feature-cafe-18,
+.feature-bus-18,
+.feature-bicycle-18,
+.feature-beer-18,
+.feature-basketball-18,
+.feature-baseball-18,
+.feature-bar-18,
+.feature-bank-18,
+.feature-art-gallery-18,
+.feature-america-football-18,
+.feature-alcohol-shop-18,
+.feature-airport-18,
+.feature-airfield-18,
+.feature-zoo-12,
+.feature-x-12,
+.feature-wetland-12,
+.feature-water-12,
+.feature-waste-basket-12,
+.feature-warehouse-12,
+.feature-triangle-stroked-12,
+.feature-triangle-12,
+.feature-town-hall-12,
+.feature-toilets-12,
+.feature-theatre-12,
+.feature-tennis-12,
+.feature-swimming-12,
+.feature-star-stroked-12,
+.feature-star-12,
+.feature-square-stroked-12,
+.feature-square-12,
+.feature-soccer-12,
+.feature-slaughterhouse-12,
+.feature-skiing-12,
+.feature-shop-12,
+.feature-school-12,
+.feature-roadblock-12,
+.feature-restaurant-12,
+.feature-religious-muslim-12,
+.feature-religious-jewish-12,
+.feature-religious-christian-12,
+.feature-rail-underground-12,
+.feature-rail-above-12,
+.feature-rail-12,
+.feature-prison-12,
+.feature-post-12,
+.feature-police-12,
+.feature-place-of-worship-12,
+.feature-pitch-12,
+.feature-pharmacy-12,
+.feature-parking-garage-12,
+.feature-parking-12,
+.feature-park2-12,
+.feature-park-12,
+.feature-oil-well-12,
+.feature-museum-12,
+.feature-monument-12,
+.feature-minefield-12,
+.feature-marker-stroked-12,
+.feature-marker-12,
+.feature-london-underground-12,
+.feature-logging-12,
+.feature-lodging-12,
+.feature-library-12,
+.feature-industrial-12,
+.feature-hospital-12,
+.feature-heliport-12,
+.feature-harbor-12,
+.feature-grocery-12,
+.feature-golf-12,
+.feature-garden-12,
+.feature-fuel-12,
+.feature-fire-station-12,
+.feature-ferry-12,
+.feature-fast-food-12,
+.feature-embassy-12,
+.feature-danger-12,
+.feature-dam-12,
+.feature-cross-12,
+.feature-cricket-12,
+.feature-commercial-12,
+.feature-college-12,
+.feature-circle-stroked-12,
+.feature-circle-12,
+.feature-cinema-12,
+.feature-cemetery-12,
+.feature-campsite-12,
+.feature-cafe-12,
+.feature-bus-12,
+.feature-bicycle-12,
+.feature-beer-12,
+.feature-basketball-12,
+.feature-baseball-12,
+.feature-bar-12,
+.feature-bank-12,
+.feature-art-gallery-12,
+.feature-america-football-12,
+.feature-alcohol-shop-12,
+.feature-airport-12,
+.feature-airfield-12{background-image:url('../img/feature-icons.png');background-repeat:no-repeat}
+.feature-waterway-river{background-position:0px 0px;width:100px;height:100px;}
+.feature-railway-rail{background-position:-100px 0px;width:100px;height:100px;}
+.feature-highway{background-position:0px -100px;width:100px;height:100px;}
+.feature-highway-trunk{background-position:-100px -100px;width:100px;height:100px;}
+.feature-highway-tertiary{background-position:-200px 0px;width:100px;height:100px;}
+.feature-highway-service{background-position:-200px -100px;width:100px;height:100px;}
+.feature-highway-secondary{background-position:0px -200px;width:100px;height:100px;}
+.feature-highway-residential{background-position:-100px -200px;width:100px;height:100px;}
+.feature-highway-primary{background-position:-200px -200px;width:100px;height:100px;}
+.feature-highway-motorway{background-position:-300px 0px;width:100px;height:100px;}
+.feature-highway-footway{background-position:-300px -100px;width:100px;height:100px;}
+.feature-highway-cycleway{background-position:-300px -200px;width:100px;height:100px;}
+.feature-zoo{background-position:0px -300px;width:24px;height:24px;}
+.feature-x{background-position:-24px -300px;width:24px;height:24px;}
+.feature-wetland{background-position:-48px -300px;width:24px;height:24px;}
+.feature-water{background-position:-72px -300px;width:24px;height:24px;}
+.feature-waste-basket{background-position:-96px -300px;width:24px;height:24px;}
+.feature-warehouse{background-position:-120px -300px;width:24px;height:24px;}
+.feature-triangle{background-position:-144px -300px;width:24px;height:24px;}
+.feature-triangle-stroked{background-position:-168px -300px;width:24px;height:24px;}
+.feature-town-hall{background-position:-192px -300px;width:24px;height:24px;}
+.feature-toilets{background-position:-216px -300px;width:24px;height:24px;}
+.feature-theatre{background-position:-240px -300px;width:24px;height:24px;}
+.feature-tennis{background-position:-264px -300px;width:24px;height:24px;}
+.feature-swimming{background-position:-288px -300px;width:24px;height:24px;}
+.feature-star{background-position:-312px -300px;width:24px;height:24px;}
+.feature-star-stroked{background-position:-336px -300px;width:24px;height:24px;}
+.feature-square{background-position:-360px -300px;width:24px;height:24px;}
+.feature-square-stroked{background-position:0px -324px;width:24px;height:24px;}
+.feature-soccer{background-position:-24px -324px;width:24px;height:24px;}
+.feature-slaughterhouse{background-position:-48px -324px;width:24px;height:24px;}
+.feature-skiing{background-position:-72px -324px;width:24px;height:24px;}
+.feature-shop{background-position:-96px -324px;width:24px;height:24px;}
+.feature-school{background-position:-120px -324px;width:24px;height:24px;}
+.feature-roadblock{background-position:-144px -324px;width:24px;height:24px;}
+.feature-restaurant{background-position:-168px -324px;width:24px;height:24px;}
+.feature-religious-muslim{background-position:-192px -324px;width:24px;height:24px;}
+.feature-religious-jewish{background-position:-216px -324px;width:24px;height:24px;}
+.feature-religious-christian{background-position:-240px -324px;width:24px;height:24px;}
+.feature-rail{background-position:-264px -324px;width:24px;height:24px;}
+.feature-rail-underground{background-position:-288px -324px;width:24px;height:24px;}
+.feature-rail-above{background-position:-312px -324px;width:24px;height:24px;}
+.feature-prison{background-position:-336px -324px;width:24px;height:24px;}
+.feature-post{background-position:-360px -324px;width:24px;height:24px;}
+.feature-police{background-position:0px -348px;width:24px;height:24px;}
+.feature-place-of-worship{background-position:-24px -348px;width:24px;height:24px;}
+.feature-pitch{background-position:-48px -348px;width:24px;height:24px;}
+.feature-pharmacy{background-position:-72px -348px;width:24px;height:24px;}
+.feature-parking{background-position:-96px -348px;width:24px;height:24px;}
+.feature-parking-garage{background-position:-120px -348px;width:24px;height:24px;}
+.feature-park2{background-position:-144px -348px;width:24px;height:24px;}
+.feature-park{background-position:-168px -348px;width:24px;height:24px;}
+.feature-oil-well{background-position:-192px -348px;width:24px;height:24px;}
+.feature-museum{background-position:-216px -348px;width:24px;height:24px;}
+.feature-monument{background-position:-240px -348px;width:24px;height:24px;}
+.feature-minefield{background-position:-264px -348px;width:24px;height:24px;}
+.feature-marker{background-position:-288px -348px;width:24px;height:24px;}
+.feature-marker-stroked{background-position:-312px -348px;width:24px;height:24px;}
+.feature-london-underground{background-position:-336px -348px;width:24px;height:24px;}
+.feature-logging{background-position:-360px -348px;width:24px;height:24px;}
+.feature-lodging{background-position:0px -372px;width:24px;height:24px;}
+.feature-library{background-position:-24px -372px;width:24px;height:24px;}
+.feature-industrial{background-position:-48px -372px;width:24px;height:24px;}
+.feature-hospital{background-position:-72px -372px;width:24px;height:24px;}
+.feature-heliport{background-position:-96px -372px;width:24px;height:24px;}
+.feature-harbor{background-position:-120px -372px;width:24px;height:24px;}
+.feature-grocery{background-position:-144px -372px;width:24px;height:24px;}
+.feature-golf{background-position:-168px -372px;width:24px;height:24px;}
+.feature-garden{background-position:-192px -372px;width:24px;height:24px;}
+.feature-fuel{background-position:-216px -372px;width:24px;height:24px;}
+.feature-fire-station{background-position:-240px -372px;width:24px;height:24px;}
+.feature-ferry{background-position:-264px -372px;width:24px;height:24px;}
+.feature-fast-food{background-position:-288px -372px;width:24px;height:24px;}
+.feature-embassy{background-position:-312px -372px;width:24px;height:24px;}
+.feature-danger{background-position:-336px -372px;width:24px;height:24px;}
+.feature-dam{background-position:-360px -372px;width:24px;height:24px;}
+.feature-cross{background-position:-400px 0px;width:24px;height:24px;}
+.feature-cricket{background-position:-400px -24px;width:24px;height:24px;}
+.feature-commercial{background-position:-400px -48px;width:24px;height:24px;}
+.feature-college{background-position:-400px -72px;width:24px;height:24px;}
+.feature-circle{background-position:-400px -96px;width:24px;height:24px;}
+.feature-circle-stroked{background-position:-400px -120px;width:24px;height:24px;}
+.feature-cinema{background-position:-400px -144px;width:24px;height:24px;}
+.feature-cemetery{background-position:-400px -168px;width:24px;height:24px;}
+.feature-campsite{background-position:-400px -192px;width:24px;height:24px;}
+.feature-cafe{background-position:-400px -216px;width:24px;height:24px;}
+.feature-bus{background-position:-400px -240px;width:24px;height:24px;}
+.feature-bicycle{background-position:-400px -264px;width:24px;height:24px;}
+.feature-beer{background-position:-400px -288px;width:24px;height:24px;}
+.feature-basketball{background-position:-400px -312px;width:24px;height:24px;}
+.feature-baseball{background-position:-400px -336px;width:24px;height:24px;}
+.feature-bar{background-position:-400px -360px;width:24px;height:24px;}
+.feature-bank{background-position:0px -396px;width:24px;height:24px;}
+.feature-art-gallery{background-position:-24px -396px;width:24px;height:24px;}
+.feature-america-football{background-position:-48px -396px;width:24px;height:24px;}
+.feature-alcohol-shop{background-position:-72px -396px;width:24px;height:24px;}
+.feature-airport{background-position:-96px -396px;width:24px;height:24px;}
+.feature-airfield{background-position:-120px -396px;width:24px;height:24px;}
+.feature-zoo-18{background-position:-144px -396px;width:18px;height:18px;}
+.feature-x-18{background-position:-162px -396px;width:18px;height:18px;}
+.feature-wetland-18{background-position:-180px -396px;width:18px;height:18px;}
+.feature-water-18{background-position:-198px -396px;width:18px;height:18px;}
+.feature-waste-basket-18{background-position:-216px -396px;width:18px;height:18px;}
+.feature-warehouse-18{background-position:-234px -396px;width:18px;height:18px;}
+.feature-triangle-stroked-18{background-position:-252px -396px;width:18px;height:18px;}
+.feature-triangle-18{background-position:-270px -396px;width:18px;height:18px;}
+.feature-town-hall-18{background-position:-288px -396px;width:18px;height:18px;}
+.feature-toilets-18{background-position:-306px -396px;width:18px;height:18px;}
+.feature-theatre-18{background-position:-324px -396px;width:18px;height:18px;}
+.feature-tennis-18{background-position:-342px -396px;width:18px;height:18px;}
+.feature-swimming-18{background-position:-360px -396px;width:18px;height:18px;}
+.feature-star-stroked-18{background-position:-378px -396px;width:18px;height:18px;}
+.feature-star-18{background-position:-396px -396px;width:18px;height:18px;}
+.feature-square-stroked-18{background-position:-424px 0px;width:18px;height:18px;}
+.feature-square-18{background-position:-424px -18px;width:18px;height:18px;}
+.feature-soccer-18{background-position:-424px -36px;width:18px;height:18px;}
+.feature-slaughterhouse-18{background-position:-424px -54px;width:18px;height:18px;}
+.feature-skiing-18{background-position:-424px -72px;width:18px;height:18px;}
+.feature-shop-18{background-position:-424px -90px;width:18px;height:18px;}
+.feature-school-18{background-position:-424px -108px;width:18px;height:18px;}
+.feature-roadblock-18{background-position:-424px -126px;width:18px;height:18px;}
+.feature-restaurant-18{background-position:-424px -144px;width:18px;height:18px;}
+.feature-religious-muslim-18{background-position:-424px -162px;width:18px;height:18px;}
+.feature-religious-jewish-18{background-position:-424px -180px;width:18px;height:18px;}
+.feature-religious-christian-18{background-position:-424px -198px;width:18px;height:18px;}
+.feature-rail-underground-18{background-position:-424px -216px;width:18px;height:18px;}
+.feature-rail-above-18{background-position:-424px -234px;width:18px;height:18px;}
+.feature-rail-18{background-position:-424px -252px;width:18px;height:18px;}
+.feature-prison-18{background-position:-424px -270px;width:18px;height:18px;}
+.feature-post-18{background-position:-424px -288px;width:18px;height:18px;}
+.feature-police-18{background-position:-424px -306px;width:18px;height:18px;}
+.feature-place-of-worship-18{background-position:-424px -324px;width:18px;height:18px;}
+.feature-pitch-18{background-position:-424px -342px;width:18px;height:18px;}
+.feature-pharmacy-18{background-position:-424px -360px;width:18px;height:18px;}
+.feature-parking-garage-18{background-position:-424px -378px;width:18px;height:18px;}
+.feature-parking-18{background-position:-424px -396px;width:18px;height:18px;}
+.feature-park2-18{background-position:0px -420px;width:18px;height:18px;}
+.feature-park-18{background-position:-18px -420px;width:18px;height:18px;}
+.feature-oil-well-18{background-position:-36px -420px;width:18px;height:18px;}
+.feature-museum-18{background-position:-54px -420px;width:18px;height:18px;}
+.feature-monument-18{background-position:-72px -420px;width:18px;height:18px;}
+.feature-minefield-18{background-position:-90px -420px;width:18px;height:18px;}
+.feature-marker-stroked-18{background-position:-108px -420px;width:18px;height:18px;}
+.feature-marker-18{background-position:-126px -420px;width:18px;height:18px;}
+.feature-london-underground-18{background-position:-144px -420px;width:18px;height:18px;}
+.feature-logging-18{background-position:-162px -420px;width:18px;height:18px;}
+.feature-lodging-18{background-position:-180px -420px;width:18px;height:18px;}
+.feature-library-18{background-position:-198px -420px;width:18px;height:18px;}
+.feature-industrial-18{background-position:-216px -420px;width:18px;height:18px;}
+.feature-hospital-18{background-position:-234px -420px;width:18px;height:18px;}
+.feature-heliport-18{background-position:-252px -420px;width:18px;height:18px;}
+.feature-harbor-18{background-position:-270px -420px;width:18px;height:18px;}
+.feature-grocery-18{background-position:-288px -420px;width:18px;height:18px;}
+.feature-golf-18{background-position:-306px -420px;width:18px;height:18px;}
+.feature-garden-18{background-position:-324px -420px;width:18px;height:18px;}
+.feature-fuel-18{background-position:-342px -420px;width:18px;height:18px;}
+.feature-fire-station-18{background-position:-360px -420px;width:18px;height:18px;}
+.feature-ferry-18{background-position:-378px -420px;width:18px;height:18px;}
+.feature-fast-food-18{background-position:-396px -420px;width:18px;height:18px;}
+.feature-embassy-18{background-position:-414px -420px;width:18px;height:18px;}
+.feature-danger-18{background-position:-442px 0px;width:18px;height:18px;}
+.feature-dam-18{background-position:-442px -18px;width:18px;height:18px;}
+.feature-cross-18{background-position:-442px -36px;width:18px;height:18px;}
+.feature-cricket-18{background-position:-442px -54px;width:18px;height:18px;}
+.feature-commercial-18{background-position:-442px -72px;width:18px;height:18px;}
+.feature-college-18{background-position:-442px -90px;width:18px;height:18px;}
+.feature-circle-stroked-18{background-position:-442px -108px;width:18px;height:18px;}
+.feature-circle-18{background-position:-442px -126px;width:18px;height:18px;}
+.feature-cinema-18{background-position:-442px -144px;width:18px;height:18px;}
+.feature-cemetery-18{background-position:-442px -162px;width:18px;height:18px;}
+.feature-campsite-18{background-position:-442px -180px;width:18px;height:18px;}
+.feature-cafe-18{background-position:-442px -198px;width:18px;height:18px;}
+.feature-bus-18{background-position:-442px -216px;width:18px;height:18px;}
+.feature-bicycle-18{background-position:-442px -234px;width:18px;height:18px;}
+.feature-beer-18{background-position:-442px -252px;width:18px;height:18px;}
+.feature-basketball-18{background-position:-442px -270px;width:18px;height:18px;}
+.feature-baseball-18{background-position:-442px -288px;width:18px;height:18px;}
+.feature-bar-18{background-position:-442px -306px;width:18px;height:18px;}
+.feature-bank-18{background-position:-442px -324px;width:18px;height:18px;}
+.feature-art-gallery-18{background-position:-442px -342px;width:18px;height:18px;}
+.feature-america-football-18{background-position:-442px -360px;width:18px;height:18px;}
+.feature-alcohol-shop-18{background-position:-442px -378px;width:18px;height:18px;}
+.feature-airport-18{background-position:-442px -396px;width:18px;height:18px;}
+.feature-airfield-18{background-position:-442px -414px;width:18px;height:18px;}
+.feature-zoo-12{background-position:-400px -384px;width:12px;height:12px;}
+.feature-x-12{background-position:-412px -384px;width:12px;height:12px;}
+.feature-wetland-12{background-position:-384px -300px;width:12px;height:12px;}
+.feature-water-12{background-position:-384px -312px;width:12px;height:12px;}
+.feature-waste-basket-12{background-position:-384px -324px;width:12px;height:12px;}
+.feature-warehouse-12{background-position:-384px -336px;width:12px;height:12px;}
+.feature-triangle-stroked-12{background-position:-384px -348px;width:12px;height:12px;}
+.feature-triangle-12{background-position:-384px -360px;width:12px;height:12px;}
+.feature-town-hall-12{background-position:-384px -372px;width:12px;height:12px;}
+.feature-toilets-12{background-position:-384px -384px;width:12px;height:12px;}
+.feature-theatre-12{background-position:0px -438px;width:12px;height:12px;}
+.feature-tennis-12{background-position:-12px -438px;width:12px;height:12px;}
+.feature-swimming-12{background-position:-24px -438px;width:12px;height:12px;}
+.feature-star-stroked-12{background-position:-36px -438px;width:12px;height:12px;}
+.feature-star-12{background-position:-48px -438px;width:12px;height:12px;}
+.feature-square-stroked-12{background-position:-60px -438px;width:12px;height:12px;}
+.feature-square-12{background-position:-72px -438px;width:12px;height:12px;}
+.feature-soccer-12{background-position:-84px -438px;width:12px;height:12px;}
+.feature-slaughterhouse-12{background-position:-96px -438px;width:12px;height:12px;}
+.feature-skiing-12{background-position:-108px -438px;width:12px;height:12px;}
+.feature-shop-12{background-position:-120px -438px;width:12px;height:12px;}
+.feature-school-12{background-position:-132px -438px;width:12px;height:12px;}
+.feature-roadblock-12{background-position:-144px -438px;width:12px;height:12px;}
+.feature-restaurant-12{background-position:-156px -438px;width:12px;height:12px;}
+.feature-religious-muslim-12{background-position:-168px -438px;width:12px;height:12px;}
+.feature-religious-jewish-12{background-position:-180px -438px;width:12px;height:12px;}
+.feature-religious-christian-12{background-position:-192px -438px;width:12px;height:12px;}
+.feature-rail-underground-12{background-position:-204px -438px;width:12px;height:12px;}
+.feature-rail-above-12{background-position:-216px -438px;width:12px;height:12px;}
+.feature-rail-12{background-position:-228px -438px;width:12px;height:12px;}
+.feature-prison-12{background-position:-240px -438px;width:12px;height:12px;}
+.feature-post-12{background-position:-252px -438px;width:12px;height:12px;}
+.feature-police-12{background-position:-264px -438px;width:12px;height:12px;}
+.feature-place-of-worship-12{background-position:-276px -438px;width:12px;height:12px;}
+.feature-pitch-12{background-position:-288px -438px;width:12px;height:12px;}
+.feature-pharmacy-12{background-position:-300px -438px;width:12px;height:12px;}
+.feature-parking-garage-12{background-position:-312px -438px;width:12px;height:12px;}
+.feature-parking-12{background-position:-324px -438px;width:12px;height:12px;}
+.feature-park2-12{background-position:-336px -438px;width:12px;height:12px;}
+.feature-park-12{background-position:-348px -438px;width:12px;height:12px;}
+.feature-oil-well-12{background-position:-360px -438px;width:12px;height:12px;}
+.feature-museum-12{background-position:-372px -438px;width:12px;height:12px;}
+.feature-monument-12{background-position:-384px -438px;width:12px;height:12px;}
+.feature-minefield-12{background-position:-396px -438px;width:12px;height:12px;}
+.feature-marker-stroked-12{background-position:-408px -438px;width:12px;height:12px;}
+.feature-marker-12{background-position:-420px -438px;width:12px;height:12px;}
+.feature-london-underground-12{background-position:-432px -438px;width:12px;height:12px;}
+.feature-logging-12{background-position:-444px -438px;width:12px;height:12px;}
+.feature-lodging-12{background-position:-460px 0px;width:12px;height:12px;}
+.feature-library-12{background-position:-460px -12px;width:12px;height:12px;}
+.feature-industrial-12{background-position:-460px -24px;width:12px;height:12px;}
+.feature-hospital-12{background-position:-460px -36px;width:12px;height:12px;}
+.feature-heliport-12{background-position:-460px -48px;width:12px;height:12px;}
+.feature-harbor-12{background-position:-460px -60px;width:12px;height:12px;}
+.feature-grocery-12{background-position:-460px -72px;width:12px;height:12px;}
+.feature-golf-12{background-position:-460px -84px;width:12px;height:12px;}
+.feature-garden-12{background-position:-460px -96px;width:12px;height:12px;}
+.feature-fuel-12{background-position:-460px -108px;width:12px;height:12px;}
+.feature-fire-station-12{background-position:-460px -120px;width:12px;height:12px;}
+.feature-ferry-12{background-position:-460px -132px;width:12px;height:12px;}
+.feature-fast-food-12{background-position:-460px -144px;width:12px;height:12px;}
+.feature-embassy-12{background-position:-460px -156px;width:12px;height:12px;}
+.feature-danger-12{background-position:-460px -168px;width:12px;height:12px;}
+.feature-dam-12{background-position:-460px -180px;width:12px;height:12px;}
+.feature-cross-12{background-position:-460px -192px;width:12px;height:12px;}
+.feature-cricket-12{background-position:-460px -204px;width:12px;height:12px;}
+.feature-commercial-12{background-position:-460px -216px;width:12px;height:12px;}
+.feature-college-12{background-position:-460px -228px;width:12px;height:12px;}
+.feature-circle-stroked-12{background-position:-460px -240px;width:12px;height:12px;}
+.feature-circle-12{background-position:-460px -252px;width:12px;height:12px;}
+.feature-cinema-12{background-position:-460px -264px;width:12px;height:12px;}
+.feature-cemetery-12{background-position:-460px -276px;width:12px;height:12px;}
+.feature-campsite-12{background-position:-460px -288px;width:12px;height:12px;}
+.feature-cafe-12{background-position:-460px -300px;width:12px;height:12px;}
+.feature-bus-12{background-position:-460px -312px;width:12px;height:12px;}
+.feature-bicycle-12{background-position:-460px -324px;width:12px;height:12px;}
+.feature-beer-12{background-position:-460px -336px;width:12px;height:12px;}
+.feature-basketball-12{background-position:-460px -348px;width:12px;height:12px;}
+.feature-baseball-12{background-position:-460px -360px;width:12px;height:12px;}
+.feature-bar-12{background-position:-460px -372px;width:12px;height:12px;}
+.feature-bank-12{background-position:-460px -384px;width:12px;height:12px;}
+.feature-art-gallery-12{background-position:-460px -396px;width:12px;height:12px;}
+.feature-america-football-12{background-position:-460px -408px;width:12px;height:12px;}
+.feature-alcohol-shop-12{background-position:-460px -420px;width:12px;height:12px;}
+.feature-airport-12{background-position:-460px -432px;width:12px;height:12px;}
+.feature-airfield-12{background-position:0px -450px;width:12px;height:12px;}
diff --git a/css/maki.css b/css/maki.css
deleted file mode 100644
index 7825142c3..000000000
--- a/css/maki.css
+++ /dev/null
@@ -1,505 +0,0 @@
-/* glue: 0.3 hash: 93c01f1651 */
-.maki-zoo-24,
-.maki-x-24,
-.maki-waste-basket-24,
-.maki-warehouse-24,
-.maki-triangle-stroked-24,
-.maki-triangle-24,
-.maki-town-hall-24,
-.maki-toilets-24,
-.maki-theatre-24,
-.maki-tennis-24,
-.maki-swimming-24,
-.maki-star-stroked-24,
-.maki-star-24,
-.maki-square-stroked-24,
-.maki-square-24,
-.maki-soccer-24,
-.maki-slaughterhouse-24,
-.maki-skiing-24,
-.maki-shop-24,
-.maki-school-24,
-.maki-roadblock-24,
-.maki-restaurant-24,
-.maki-religious-muslim-24,
-.maki-religious-jewish-24,
-.maki-religious-christian-24,
-.maki-rail-underground-24,
-.maki-rail-above-24,
-.maki-rail-24,
-.maki-prison-24,
-.maki-post-24,
-.maki-police-24,
-.maki-place-of-worship-24,
-.maki-pitch-24,
-.maki-pharmacy-24,
-.maki-parking-garage-24,
-.maki-parking-24,
-.maki-park2-24,
-.maki-park-24,
-.maki-oil-well-24,
-.maki-museum-24,
-.maki-monument-24,
-.maki-minefield-24,
-.maki-marker-stroked-24,
-.maki-marker-24,
-.maki-london-underground-24,
-.maki-logging-24,
-.maki-lodging-24,
-.maki-library-24,
-.maki-industrial-24,
-.maki-hospital-24,
-.maki-heliport-24,
-.maki-harbor-24,
-.maki-grocery-24,
-.maki-golf-24,
-.maki-garden-24,
-.maki-fuel-24,
-.maki-fire-station-24,
-.maki-ferry-24,
-.maki-fast-food-24,
-.maki-embassy-24,
-.maki-danger-24,
-.maki-dam-24,
-.maki-cross-24,
-.maki-cricket-24,
-.maki-commercial-24,
-.maki-college-24,
-.maki-circle-stroked-24,
-.maki-circle-24,
-.maki-cinema-24,
-.maki-cemetery-24,
-.maki-campsite-24,
-.maki-cafe-24,
-.maki-bus-24,
-.maki-bicycle-24,
-.maki-beer-24,
-.maki-basketball-24,
-.maki-baseball-24,
-.maki-bar-24,
-.maki-bank-24,
-.maki-art-gallery-24,
-.maki-america-football-24,
-.maki-alcohol-shop-24,
-.maki-airport-24,
-.maki-airfield-24,
-.maki-zoo-18,
-.maki-x-18,
-.maki-waste-basket-18,
-.maki-warehouse-18,
-.maki-triangle-stroked-18,
-.maki-triangle-18,
-.maki-town-hall-18,
-.maki-toilets-18,
-.maki-theatre-18,
-.maki-tennis-18,
-.maki-swimming-18,
-.maki-star-stroked-18,
-.maki-star-18,
-.maki-square-stroked-18,
-.maki-square-18,
-.maki-soccer-18,
-.maki-slaughterhouse-18,
-.maki-skiing-18,
-.maki-shop-18,
-.maki-school-18,
-.maki-roadblock-18,
-.maki-restaurant-18,
-.maki-religious-muslim-18,
-.maki-religious-jewish-18,
-.maki-religious-christian-18,
-.maki-rail-underground-18,
-.maki-rail-above-18,
-.maki-rail-18,
-.maki-prison-18,
-.maki-post-18,
-.maki-police-18,
-.maki-place-of-worship-18,
-.maki-pitch-18,
-.maki-pharmacy-18,
-.maki-parking-garage-18,
-.maki-parking-18,
-.maki-park2-18,
-.maki-park-18,
-.maki-oil-well-18,
-.maki-museum-18,
-.maki-monument-18,
-.maki-minefield-18,
-.maki-marker-stroked-18,
-.maki-marker-18,
-.maki-london-underground-18,
-.maki-logging-18,
-.maki-lodging-18,
-.maki-library-18,
-.maki-industrial-18,
-.maki-hospital-18,
-.maki-heliport-18,
-.maki-harbor-18,
-.maki-grocery-18,
-.maki-golf-18,
-.maki-garden-18,
-.maki-fuel-18,
-.maki-fire-station-18,
-.maki-ferry-18,
-.maki-fast-food-18,
-.maki-embassy-18,
-.maki-danger-18,
-.maki-dam-18,
-.maki-cross-18,
-.maki-cricket-18,
-.maki-commercial-18,
-.maki-college-18,
-.maki-circle-stroked-18,
-.maki-circle-18,
-.maki-cinema-18,
-.maki-cemetery-18,
-.maki-campsite-18,
-.maki-cafe-18,
-.maki-bus-18,
-.maki-bicycle-18,
-.maki-beer-18,
-.maki-basketball-18,
-.maki-baseball-18,
-.maki-bar-18,
-.maki-bank-18,
-.maki-art-gallery-18,
-.maki-america-football-18,
-.maki-alcohol-shop-18,
-.maki-airport-18,
-.maki-airfield-18,
-.maki-zoo-12,
-.maki-x-12,
-.maki-waste-basket-12,
-.maki-warehouse-12,
-.maki-triangle-stroked-12,
-.maki-triangle-12,
-.maki-town-hall-12,
-.maki-toilets-12,
-.maki-theatre-12,
-.maki-tennis-12,
-.maki-swimming-12,
-.maki-star-stroked-12,
-.maki-star-12,
-.maki-square-stroked-12,
-.maki-square-12,
-.maki-soccer-12,
-.maki-slaughterhouse-12,
-.maki-skiing-12,
-.maki-shop-12,
-.maki-school-12,
-.maki-roadblock-12,
-.maki-restaurant-12,
-.maki-religious-muslim-12,
-.maki-religious-jewish-12,
-.maki-religious-christian-12,
-.maki-rail-underground-12,
-.maki-rail-above-12,
-.maki-rail-12,
-.maki-prison-12,
-.maki-post-12,
-.maki-police-12,
-.maki-place-of-worship-12,
-.maki-pitch-12,
-.maki-pharmacy-12,
-.maki-parking-garage-12,
-.maki-parking-12,
-.maki-park2-12,
-.maki-park-12,
-.maki-oil-well-12,
-.maki-museum-12,
-.maki-monument-12,
-.maki-minefield-12,
-.maki-marker-stroked-12,
-.maki-marker-12,
-.maki-london-underground-12,
-.maki-logging-12,
-.maki-lodging-12,
-.maki-library-12,
-.maki-industrial-12,
-.maki-hospital-12,
-.maki-heliport-12,
-.maki-harbor-12,
-.maki-grocery-12,
-.maki-golf-12,
-.maki-garden-12,
-.maki-fuel-12,
-.maki-fire-station-12,
-.maki-ferry-12,
-.maki-fast-food-12,
-.maki-embassy-12,
-.maki-danger-12,
-.maki-dam-12,
-.maki-cross-12,
-.maki-cricket-12,
-.maki-commercial-12,
-.maki-college-12,
-.maki-circle-stroked-12,
-.maki-circle-12,
-.maki-cinema-12,
-.maki-cemetery-12,
-.maki-campsite-12,
-.maki-cafe-12,
-.maki-bus-12,
-.maki-bicycle-12,
-.maki-beer-12,
-.maki-basketball-12,
-.maki-baseball-12,
-.maki-bar-12,
-.maki-bank-12,
-.maki-art-gallery-12,
-.maki-america-football-12,
-.maki-alcohol-shop-12,
-.maki-airport-12,
-.maki-airfield-12{background-image:url('../img/maki.png');background-repeat:no-repeat}
-.maki-zoo-24{background-position:0px 0px;width:24px;height:24px;}
-.maki-x-24{background-position:-24px 0px;width:24px;height:24px;}
-.maki-waste-basket-24{background-position:0px -24px;width:24px;height:24px;}
-.maki-warehouse-24{background-position:-24px -24px;width:24px;height:24px;}
-.maki-triangle-stroked-24{background-position:-48px 0px;width:24px;height:24px;}
-.maki-triangle-24{background-position:-48px -24px;width:24px;height:24px;}
-.maki-town-hall-24{background-position:0px -48px;width:24px;height:24px;}
-.maki-toilets-24{background-position:-24px -48px;width:24px;height:24px;}
-.maki-theatre-24{background-position:-48px -48px;width:24px;height:24px;}
-.maki-tennis-24{background-position:-72px 0px;width:24px;height:24px;}
-.maki-swimming-24{background-position:-72px -24px;width:24px;height:24px;}
-.maki-star-stroked-24{background-position:-72px -48px;width:24px;height:24px;}
-.maki-star-24{background-position:0px -72px;width:24px;height:24px;}
-.maki-square-stroked-24{background-position:-24px -72px;width:24px;height:24px;}
-.maki-square-24{background-position:-48px -72px;width:24px;height:24px;}
-.maki-soccer-24{background-position:-72px -72px;width:24px;height:24px;}
-.maki-slaughterhouse-24{background-position:-96px 0px;width:24px;height:24px;}
-.maki-skiing-24{background-position:-96px -24px;width:24px;height:24px;}
-.maki-shop-24{background-position:-96px -48px;width:24px;height:24px;}
-.maki-school-24{background-position:-96px -72px;width:24px;height:24px;}
-.maki-roadblock-24{background-position:0px -96px;width:24px;height:24px;}
-.maki-restaurant-24{background-position:-24px -96px;width:24px;height:24px;}
-.maki-religious-muslim-24{background-position:-48px -96px;width:24px;height:24px;}
-.maki-religious-jewish-24{background-position:-72px -96px;width:24px;height:24px;}
-.maki-religious-christian-24{background-position:-96px -96px;width:24px;height:24px;}
-.maki-rail-underground-24{background-position:-120px 0px;width:24px;height:24px;}
-.maki-rail-above-24{background-position:-120px -24px;width:24px;height:24px;}
-.maki-rail-24{background-position:-120px -48px;width:24px;height:24px;}
-.maki-prison-24{background-position:-120px -72px;width:24px;height:24px;}
-.maki-post-24{background-position:-120px -96px;width:24px;height:24px;}
-.maki-police-24{background-position:0px -120px;width:24px;height:24px;}
-.maki-place-of-worship-24{background-position:-24px -120px;width:24px;height:24px;}
-.maki-pitch-24{background-position:-48px -120px;width:24px;height:24px;}
-.maki-pharmacy-24{background-position:-72px -120px;width:24px;height:24px;}
-.maki-parking-garage-24{background-position:-96px -120px;width:24px;height:24px;}
-.maki-parking-24{background-position:-120px -120px;width:24px;height:24px;}
-.maki-park2-24{background-position:-144px 0px;width:24px;height:24px;}
-.maki-park-24{background-position:-144px -24px;width:24px;height:24px;}
-.maki-oil-well-24{background-position:-144px -48px;width:24px;height:24px;}
-.maki-museum-24{background-position:-144px -72px;width:24px;height:24px;}
-.maki-monument-24{background-position:-144px -96px;width:24px;height:24px;}
-.maki-minefield-24{background-position:-144px -120px;width:24px;height:24px;}
-.maki-marker-stroked-24{background-position:0px -144px;width:24px;height:24px;}
-.maki-marker-24{background-position:-24px -144px;width:24px;height:24px;}
-.maki-london-underground-24{background-position:-48px -144px;width:24px;height:24px;}
-.maki-logging-24{background-position:-72px -144px;width:24px;height:24px;}
-.maki-lodging-24{background-position:-96px -144px;width:24px;height:24px;}
-.maki-library-24{background-position:-120px -144px;width:24px;height:24px;}
-.maki-industrial-24{background-position:-144px -144px;width:24px;height:24px;}
-.maki-hospital-24{background-position:-168px 0px;width:24px;height:24px;}
-.maki-heliport-24{background-position:-168px -24px;width:24px;height:24px;}
-.maki-harbor-24{background-position:-168px -48px;width:24px;height:24px;}
-.maki-grocery-24{background-position:-168px -72px;width:24px;height:24px;}
-.maki-golf-24{background-position:-168px -96px;width:24px;height:24px;}
-.maki-garden-24{background-position:-168px -120px;width:24px;height:24px;}
-.maki-fuel-24{background-position:-168px -144px;width:24px;height:24px;}
-.maki-fire-station-24{background-position:0px -168px;width:24px;height:24px;}
-.maki-ferry-24{background-position:-24px -168px;width:24px;height:24px;}
-.maki-fast-food-24{background-position:-48px -168px;width:24px;height:24px;}
-.maki-embassy-24{background-position:-72px -168px;width:24px;height:24px;}
-.maki-danger-24{background-position:-96px -168px;width:24px;height:24px;}
-.maki-dam-24{background-position:-120px -168px;width:24px;height:24px;}
-.maki-cross-24{background-position:-144px -168px;width:24px;height:24px;}
-.maki-cricket-24{background-position:-168px -168px;width:24px;height:24px;}
-.maki-commercial-24{background-position:-192px 0px;width:24px;height:24px;}
-.maki-college-24{background-position:-192px -24px;width:24px;height:24px;}
-.maki-circle-stroked-24{background-position:-192px -48px;width:24px;height:24px;}
-.maki-circle-24{background-position:-192px -72px;width:24px;height:24px;}
-.maki-cinema-24{background-position:-192px -96px;width:24px;height:24px;}
-.maki-cemetery-24{background-position:-192px -120px;width:24px;height:24px;}
-.maki-campsite-24{background-position:-192px -144px;width:24px;height:24px;}
-.maki-cafe-24{background-position:-192px -168px;width:24px;height:24px;}
-.maki-bus-24{background-position:0px -192px;width:24px;height:24px;}
-.maki-bicycle-24{background-position:-24px -192px;width:24px;height:24px;}
-.maki-beer-24{background-position:-48px -192px;width:24px;height:24px;}
-.maki-basketball-24{background-position:-72px -192px;width:24px;height:24px;}
-.maki-baseball-24{background-position:-96px -192px;width:24px;height:24px;}
-.maki-bar-24{background-position:-120px -192px;width:24px;height:24px;}
-.maki-bank-24{background-position:-144px -192px;width:24px;height:24px;}
-.maki-art-gallery-24{background-position:-168px -192px;width:24px;height:24px;}
-.maki-america-football-24{background-position:-192px -192px;width:24px;height:24px;}
-.maki-alcohol-shop-24{background-position:-216px 0px;width:24px;height:24px;}
-.maki-airport-24{background-position:-216px -24px;width:24px;height:24px;}
-.maki-airfield-24{background-position:-216px -48px;width:24px;height:24px;}
-.maki-zoo-18{background-position:-216px -72px;width:18px;height:18px;}
-.maki-x-18{background-position:-216px -90px;width:18px;height:18px;}
-.maki-waste-basket-18{background-position:-216px -108px;width:18px;height:18px;}
-.maki-warehouse-18{background-position:-216px -126px;width:18px;height:18px;}
-.maki-triangle-stroked-18{background-position:-216px -144px;width:18px;height:18px;}
-.maki-triangle-18{background-position:-216px -162px;width:18px;height:18px;}
-.maki-town-hall-18{background-position:-216px -180px;width:18px;height:18px;}
-.maki-toilets-18{background-position:-216px -198px;width:18px;height:18px;}
-.maki-theatre-18{background-position:0px -216px;width:18px;height:18px;}
-.maki-tennis-18{background-position:-18px -216px;width:18px;height:18px;}
-.maki-swimming-18{background-position:-36px -216px;width:18px;height:18px;}
-.maki-star-stroked-18{background-position:-54px -216px;width:18px;height:18px;}
-.maki-star-18{background-position:-72px -216px;width:18px;height:18px;}
-.maki-square-stroked-18{background-position:-90px -216px;width:18px;height:18px;}
-.maki-square-18{background-position:-108px -216px;width:18px;height:18px;}
-.maki-soccer-18{background-position:-126px -216px;width:18px;height:18px;}
-.maki-slaughterhouse-18{background-position:-144px -216px;width:18px;height:18px;}
-.maki-skiing-18{background-position:-162px -216px;width:18px;height:18px;}
-.maki-shop-18{background-position:-180px -216px;width:18px;height:18px;}
-.maki-school-18{background-position:-198px -216px;width:18px;height:18px;}
-.maki-roadblock-18{background-position:-216px -216px;width:18px;height:18px;}
-.maki-restaurant-18{background-position:-240px 0px;width:18px;height:18px;}
-.maki-religious-muslim-18{background-position:-240px -18px;width:18px;height:18px;}
-.maki-religious-jewish-18{background-position:-240px -36px;width:18px;height:18px;}
-.maki-religious-christian-18{background-position:-240px -54px;width:18px;height:18px;}
-.maki-rail-underground-18{background-position:-240px -72px;width:18px;height:18px;}
-.maki-rail-above-18{background-position:-240px -90px;width:18px;height:18px;}
-.maki-rail-18{background-position:-240px -108px;width:18px;height:18px;}
-.maki-prison-18{background-position:-240px -126px;width:18px;height:18px;}
-.maki-post-18{background-position:-240px -144px;width:18px;height:18px;}
-.maki-police-18{background-position:-240px -162px;width:18px;height:18px;}
-.maki-place-of-worship-18{background-position:-240px -180px;width:18px;height:18px;}
-.maki-pitch-18{background-position:-240px -198px;width:18px;height:18px;}
-.maki-pharmacy-18{background-position:-240px -216px;width:18px;height:18px;}
-.maki-parking-garage-18{background-position:0px -234px;width:18px;height:18px;}
-.maki-parking-18{background-position:-18px -234px;width:18px;height:18px;}
-.maki-park2-18{background-position:-36px -234px;width:18px;height:18px;}
-.maki-park-18{background-position:-54px -234px;width:18px;height:18px;}
-.maki-oil-well-18{background-position:-72px -234px;width:18px;height:18px;}
-.maki-museum-18{background-position:-90px -234px;width:18px;height:18px;}
-.maki-monument-18{background-position:-108px -234px;width:18px;height:18px;}
-.maki-minefield-18{background-position:-126px -234px;width:18px;height:18px;}
-.maki-marker-stroked-18{background-position:-144px -234px;width:18px;height:18px;}
-.maki-marker-18{background-position:-162px -234px;width:18px;height:18px;}
-.maki-london-underground-18{background-position:-180px -234px;width:18px;height:18px;}
-.maki-logging-18{background-position:-198px -234px;width:18px;height:18px;}
-.maki-lodging-18{background-position:-216px -234px;width:18px;height:18px;}
-.maki-library-18{background-position:-234px -234px;width:18px;height:18px;}
-.maki-industrial-18{background-position:-258px 0px;width:18px;height:18px;}
-.maki-hospital-18{background-position:-258px -18px;width:18px;height:18px;}
-.maki-heliport-18{background-position:-258px -36px;width:18px;height:18px;}
-.maki-harbor-18{background-position:-258px -54px;width:18px;height:18px;}
-.maki-grocery-18{background-position:-258px -72px;width:18px;height:18px;}
-.maki-golf-18{background-position:-258px -90px;width:18px;height:18px;}
-.maki-garden-18{background-position:-258px -108px;width:18px;height:18px;}
-.maki-fuel-18{background-position:-258px -126px;width:18px;height:18px;}
-.maki-fire-station-18{background-position:-258px -144px;width:18px;height:18px;}
-.maki-ferry-18{background-position:-258px -162px;width:18px;height:18px;}
-.maki-fast-food-18{background-position:-258px -180px;width:18px;height:18px;}
-.maki-embassy-18{background-position:-258px -198px;width:18px;height:18px;}
-.maki-danger-18{background-position:-258px -216px;width:18px;height:18px;}
-.maki-dam-18{background-position:-258px -234px;width:18px;height:18px;}
-.maki-cross-18{background-position:0px -252px;width:18px;height:18px;}
-.maki-cricket-18{background-position:-18px -252px;width:18px;height:18px;}
-.maki-commercial-18{background-position:-36px -252px;width:18px;height:18px;}
-.maki-college-18{background-position:-54px -252px;width:18px;height:18px;}
-.maki-circle-stroked-18{background-position:-72px -252px;width:18px;height:18px;}
-.maki-circle-18{background-position:-90px -252px;width:18px;height:18px;}
-.maki-cinema-18{background-position:-108px -252px;width:18px;height:18px;}
-.maki-cemetery-18{background-position:-126px -252px;width:18px;height:18px;}
-.maki-campsite-18{background-position:-144px -252px;width:18px;height:18px;}
-.maki-cafe-18{background-position:-162px -252px;width:18px;height:18px;}
-.maki-bus-18{background-position:-180px -252px;width:18px;height:18px;}
-.maki-bicycle-18{background-position:-198px -252px;width:18px;height:18px;}
-.maki-beer-18{background-position:-216px -252px;width:18px;height:18px;}
-.maki-basketball-18{background-position:-234px -252px;width:18px;height:18px;}
-.maki-baseball-18{background-position:-252px -252px;width:18px;height:18px;}
-.maki-bar-18{background-position:-276px 0px;width:18px;height:18px;}
-.maki-bank-18{background-position:-276px -18px;width:18px;height:18px;}
-.maki-art-gallery-18{background-position:-276px -36px;width:18px;height:18px;}
-.maki-america-football-18{background-position:-276px -54px;width:18px;height:18px;}
-.maki-alcohol-shop-18{background-position:-276px -72px;width:18px;height:18px;}
-.maki-airport-18{background-position:-276px -90px;width:18px;height:18px;}
-.maki-airfield-18{background-position:-276px -108px;width:18px;height:18px;}
-.maki-zoo-12{background-position:-276px -126px;width:12px;height:12px;}
-.maki-x-12{background-position:-276px -138px;width:12px;height:12px;}
-.maki-waste-basket-12{background-position:-276px -150px;width:12px;height:12px;}
-.maki-warehouse-12{background-position:-276px -162px;width:12px;height:12px;}
-.maki-triangle-stroked-12{background-position:-276px -174px;width:12px;height:12px;}
-.maki-triangle-12{background-position:-276px -186px;width:12px;height:12px;}
-.maki-town-hall-12{background-position:-276px -198px;width:12px;height:12px;}
-.maki-toilets-12{background-position:-276px -210px;width:12px;height:12px;}
-.maki-theatre-12{background-position:-276px -222px;width:12px;height:12px;}
-.maki-tennis-12{background-position:-276px -234px;width:12px;height:12px;}
-.maki-swimming-12{background-position:-276px -246px;width:12px;height:12px;}
-.maki-star-stroked-12{background-position:-276px -258px;width:12px;height:12px;}
-.maki-star-12{background-position:0px -270px;width:12px;height:12px;}
-.maki-square-stroked-12{background-position:-12px -270px;width:12px;height:12px;}
-.maki-square-12{background-position:-24px -270px;width:12px;height:12px;}
-.maki-soccer-12{background-position:-36px -270px;width:12px;height:12px;}
-.maki-slaughterhouse-12{background-position:-48px -270px;width:12px;height:12px;}
-.maki-skiing-12{background-position:-60px -270px;width:12px;height:12px;}
-.maki-shop-12{background-position:-72px -270px;width:12px;height:12px;}
-.maki-school-12{background-position:-84px -270px;width:12px;height:12px;}
-.maki-roadblock-12{background-position:-96px -270px;width:12px;height:12px;}
-.maki-restaurant-12{background-position:-108px -270px;width:12px;height:12px;}
-.maki-religious-muslim-12{background-position:-120px -270px;width:12px;height:12px;}
-.maki-religious-jewish-12{background-position:-132px -270px;width:12px;height:12px;}
-.maki-religious-christian-12{background-position:-144px -270px;width:12px;height:12px;}
-.maki-rail-underground-12{background-position:-156px -270px;width:12px;height:12px;}
-.maki-rail-above-12{background-position:-168px -270px;width:12px;height:12px;}
-.maki-rail-12{background-position:-180px -270px;width:12px;height:12px;}
-.maki-prison-12{background-position:-192px -270px;width:12px;height:12px;}
-.maki-post-12{background-position:-204px -270px;width:12px;height:12px;}
-.maki-police-12{background-position:-216px -270px;width:12px;height:12px;}
-.maki-place-of-worship-12{background-position:-228px -270px;width:12px;height:12px;}
-.maki-pitch-12{background-position:-240px -270px;width:12px;height:12px;}
-.maki-pharmacy-12{background-position:-252px -270px;width:12px;height:12px;}
-.maki-parking-garage-12{background-position:-264px -270px;width:12px;height:12px;}
-.maki-parking-12{background-position:-276px -270px;width:12px;height:12px;}
-.maki-park2-12{background-position:0px -282px;width:12px;height:12px;}
-.maki-park-12{background-position:-12px -282px;width:12px;height:12px;}
-.maki-oil-well-12{background-position:-24px -282px;width:12px;height:12px;}
-.maki-museum-12{background-position:-36px -282px;width:12px;height:12px;}
-.maki-monument-12{background-position:-48px -282px;width:12px;height:12px;}
-.maki-minefield-12{background-position:-60px -282px;width:12px;height:12px;}
-.maki-marker-stroked-12{background-position:-72px -282px;width:12px;height:12px;}
-.maki-marker-12{background-position:-84px -282px;width:12px;height:12px;}
-.maki-london-underground-12{background-position:-96px -282px;width:12px;height:12px;}
-.maki-logging-12{background-position:-108px -282px;width:12px;height:12px;}
-.maki-lodging-12{background-position:-120px -282px;width:12px;height:12px;}
-.maki-library-12{background-position:-132px -282px;width:12px;height:12px;}
-.maki-industrial-12{background-position:-144px -282px;width:12px;height:12px;}
-.maki-hospital-12{background-position:-156px -282px;width:12px;height:12px;}
-.maki-heliport-12{background-position:-168px -282px;width:12px;height:12px;}
-.maki-harbor-12{background-position:-180px -282px;width:12px;height:12px;}
-.maki-grocery-12{background-position:-192px -282px;width:12px;height:12px;}
-.maki-golf-12{background-position:-204px -282px;width:12px;height:12px;}
-.maki-garden-12{background-position:-216px -282px;width:12px;height:12px;}
-.maki-fuel-12{background-position:-228px -282px;width:12px;height:12px;}
-.maki-fire-station-12{background-position:-240px -282px;width:12px;height:12px;}
-.maki-ferry-12{background-position:-252px -282px;width:12px;height:12px;}
-.maki-fast-food-12{background-position:-264px -282px;width:12px;height:12px;}
-.maki-embassy-12{background-position:-276px -282px;width:12px;height:12px;}
-.maki-danger-12{background-position:-294px 0px;width:12px;height:12px;}
-.maki-dam-12{background-position:-294px -12px;width:12px;height:12px;}
-.maki-cross-12{background-position:-294px -24px;width:12px;height:12px;}
-.maki-cricket-12{background-position:-294px -36px;width:12px;height:12px;}
-.maki-commercial-12{background-position:-294px -48px;width:12px;height:12px;}
-.maki-college-12{background-position:-294px -60px;width:12px;height:12px;}
-.maki-circle-stroked-12{background-position:-294px -72px;width:12px;height:12px;}
-.maki-circle-12{background-position:-294px -84px;width:12px;height:12px;}
-.maki-cinema-12{background-position:-294px -96px;width:12px;height:12px;}
-.maki-cemetery-12{background-position:-294px -108px;width:12px;height:12px;}
-.maki-campsite-12{background-position:-294px -120px;width:12px;height:12px;}
-.maki-cafe-12{background-position:-294px -132px;width:12px;height:12px;}
-.maki-bus-12{background-position:-294px -144px;width:12px;height:12px;}
-.maki-bicycle-12{background-position:-294px -156px;width:12px;height:12px;}
-.maki-beer-12{background-position:-294px -168px;width:12px;height:12px;}
-.maki-basketball-12{background-position:-294px -180px;width:12px;height:12px;}
-.maki-baseball-12{background-position:-294px -192px;width:12px;height:12px;}
-.maki-bar-12{background-position:-294px -204px;width:12px;height:12px;}
-.maki-bank-12{background-position:-294px -216px;width:12px;height:12px;}
-.maki-art-gallery-12{background-position:-294px -228px;width:12px;height:12px;}
-.maki-america-football-12{background-position:-294px -240px;width:12px;height:12px;}
-.maki-alcohol-shop-12{background-position:-294px -252px;width:12px;height:12px;}
-.maki-airport-12{background-position:-294px -264px;width:12px;height:12px;}
-.maki-airfield-12{background-position:-294px -276px;width:12px;height:12px;}
diff --git a/css/preset-icons.css b/css/preset-icons.css
deleted file mode 100644
index c62bae90c..000000000
--- a/css/preset-icons.css
+++ /dev/null
@@ -1,193 +0,0 @@
-/* glue: 0.3 hash: df242e0604 */
-.preset-waterway-river,
-.preset-railway-rail,
-.preset-highway,
-.preset-highway-trunk,
-.preset-highway-tertiary,
-.preset-highway-service,
-.preset-highway-secondary,
-.preset-highway-residential,
-.preset-highway-primary,
-.preset-highway-motorway,
-.preset-highway-footway,
-.preset-highway-cycleway,
-.preset-zoo,
-.preset-x,
-.preset-waste-basket,
-.preset-warehouse,
-.preset-triangle,
-.preset-triangle-stroked,
-.preset-town-hall,
-.preset-toilets,
-.preset-theatre,
-.preset-tennis,
-.preset-swimming,
-.preset-star,
-.preset-star-stroked,
-.preset-square,
-.preset-square-stroked,
-.preset-soccer,
-.preset-slaughterhouse,
-.preset-skiing,
-.preset-shop,
-.preset-school,
-.preset-roadblock,
-.preset-restaurant,
-.preset-religious-muslim,
-.preset-religious-jewish,
-.preset-religious-christian,
-.preset-rail,
-.preset-rail-underground,
-.preset-rail-above,
-.preset-prison,
-.preset-post,
-.preset-police,
-.preset-place-of-worship,
-.preset-pitch,
-.preset-pharmacy,
-.preset-parking,
-.preset-parking-garage,
-.preset-park2,
-.preset-park,
-.preset-oil-well,
-.preset-museum,
-.preset-monument,
-.preset-minefield,
-.preset-marker,
-.preset-marker-stroked,
-.preset-london-underground,
-.preset-logging,
-.preset-lodging,
-.preset-library,
-.preset-industrial,
-.preset-hospital,
-.preset-heliport,
-.preset-harbor,
-.preset-grocery,
-.preset-golf,
-.preset-garden,
-.preset-fuel,
-.preset-fire-station,
-.preset-ferry,
-.preset-fast-food,
-.preset-embassy,
-.preset-danger,
-.preset-dam,
-.preset-cross,
-.preset-cricket,
-.preset-commercial,
-.preset-college,
-.preset-circle,
-.preset-circle-stroked,
-.preset-cinema,
-.preset-cemetery,
-.preset-campsite,
-.preset-cafe,
-.preset-bus,
-.preset-bicycle,
-.preset-beer,
-.preset-basketball,
-.preset-baseball,
-.preset-bar,
-.preset-bank,
-.preset-art-gallery,
-.preset-america-football,
-.preset-alcohol-shop,
-.preset-airport,
-.preset-airfield{background-image:url('../img/preset-icons.png');background-repeat:no-repeat}
-.preset-waterway-river{background-position:0px 0px;width:100px;height:100px;}
-.preset-railway-rail{background-position:-100px 0px;width:100px;height:100px;}
-.preset-highway{background-position:0px -100px;width:100px;height:100px;}
-.preset-highway-trunk{background-position:-100px -100px;width:100px;height:100px;}
-.preset-highway-tertiary{background-position:-200px 0px;width:100px;height:100px;}
-.preset-highway-service{background-position:-200px -100px;width:100px;height:100px;}
-.preset-highway-secondary{background-position:0px -200px;width:100px;height:100px;}
-.preset-highway-residential{background-position:-100px -200px;width:100px;height:100px;}
-.preset-highway-primary{background-position:-200px -200px;width:100px;height:100px;}
-.preset-highway-motorway{background-position:-300px 0px;width:100px;height:100px;}
-.preset-highway-footway{background-position:-300px -100px;width:100px;height:100px;}
-.preset-highway-cycleway{background-position:-300px -200px;width:100px;height:100px;}
-.preset-zoo{background-position:0px -300px;width:24px;height:24px;}
-.preset-x{background-position:-24px -300px;width:24px;height:24px;}
-.preset-waste-basket{background-position:-48px -300px;width:24px;height:24px;}
-.preset-warehouse{background-position:-72px -300px;width:24px;height:24px;}
-.preset-triangle{background-position:-96px -300px;width:24px;height:24px;}
-.preset-triangle-stroked{background-position:-120px -300px;width:24px;height:24px;}
-.preset-town-hall{background-position:-144px -300px;width:24px;height:24px;}
-.preset-toilets{background-position:-168px -300px;width:24px;height:24px;}
-.preset-theatre{background-position:-192px -300px;width:24px;height:24px;}
-.preset-tennis{background-position:-216px -300px;width:24px;height:24px;}
-.preset-swimming{background-position:-240px -300px;width:24px;height:24px;}
-.preset-star{background-position:-264px -300px;width:24px;height:24px;}
-.preset-star-stroked{background-position:-288px -300px;width:24px;height:24px;}
-.preset-square{background-position:-312px -300px;width:24px;height:24px;}
-.preset-square-stroked{background-position:-336px -300px;width:24px;height:24px;}
-.preset-soccer{background-position:-360px -300px;width:24px;height:24px;}
-.preset-slaughterhouse{background-position:0px -324px;width:24px;height:24px;}
-.preset-skiing{background-position:-24px -324px;width:24px;height:24px;}
-.preset-shop{background-position:-48px -324px;width:24px;height:24px;}
-.preset-school{background-position:-72px -324px;width:24px;height:24px;}
-.preset-roadblock{background-position:-96px -324px;width:24px;height:24px;}
-.preset-restaurant{background-position:-120px -324px;width:24px;height:24px;}
-.preset-religious-muslim{background-position:-144px -324px;width:24px;height:24px;}
-.preset-religious-jewish{background-position:-168px -324px;width:24px;height:24px;}
-.preset-religious-christian{background-position:-192px -324px;width:24px;height:24px;}
-.preset-rail{background-position:-216px -324px;width:24px;height:24px;}
-.preset-rail-underground{background-position:-240px -324px;width:24px;height:24px;}
-.preset-rail-above{background-position:-264px -324px;width:24px;height:24px;}
-.preset-prison{background-position:-288px -324px;width:24px;height:24px;}
-.preset-post{background-position:-312px -324px;width:24px;height:24px;}
-.preset-police{background-position:-336px -324px;width:24px;height:24px;}
-.preset-place-of-worship{background-position:-360px -324px;width:24px;height:24px;}
-.preset-pitch{background-position:0px -348px;width:24px;height:24px;}
-.preset-pharmacy{background-position:-24px -348px;width:24px;height:24px;}
-.preset-parking{background-position:-48px -348px;width:24px;height:24px;}
-.preset-parking-garage{background-position:-72px -348px;width:24px;height:24px;}
-.preset-park2{background-position:-96px -348px;width:24px;height:24px;}
-.preset-park{background-position:-120px -348px;width:24px;height:24px;}
-.preset-oil-well{background-position:-144px -348px;width:24px;height:24px;}
-.preset-museum{background-position:-168px -348px;width:24px;height:24px;}
-.preset-monument{background-position:-192px -348px;width:24px;height:24px;}
-.preset-minefield{background-position:-216px -348px;width:24px;height:24px;}
-.preset-marker{background-position:-240px -348px;width:24px;height:24px;}
-.preset-marker-stroked{background-position:-264px -348px;width:24px;height:24px;}
-.preset-london-underground{background-position:-288px -348px;width:24px;height:24px;}
-.preset-logging{background-position:-312px -348px;width:24px;height:24px;}
-.preset-lodging{background-position:-336px -348px;width:24px;height:24px;}
-.preset-library{background-position:-360px -348px;width:24px;height:24px;}
-.preset-industrial{background-position:0px -372px;width:24px;height:24px;}
-.preset-hospital{background-position:-24px -372px;width:24px;height:24px;}
-.preset-heliport{background-position:-48px -372px;width:24px;height:24px;}
-.preset-harbor{background-position:-72px -372px;width:24px;height:24px;}
-.preset-grocery{background-position:-96px -372px;width:24px;height:24px;}
-.preset-golf{background-position:-120px -372px;width:24px;height:24px;}
-.preset-garden{background-position:-144px -372px;width:24px;height:24px;}
-.preset-fuel{background-position:-168px -372px;width:24px;height:24px;}
-.preset-fire-station{background-position:-192px -372px;width:24px;height:24px;}
-.preset-ferry{background-position:-216px -372px;width:24px;height:24px;}
-.preset-fast-food{background-position:-240px -372px;width:24px;height:24px;}
-.preset-embassy{background-position:-264px -372px;width:24px;height:24px;}
-.preset-danger{background-position:-288px -372px;width:24px;height:24px;}
-.preset-dam{background-position:-312px -372px;width:24px;height:24px;}
-.preset-cross{background-position:-336px -372px;width:24px;height:24px;}
-.preset-cricket{background-position:-360px -372px;width:24px;height:24px;}
-.preset-commercial{background-position:-400px 0px;width:24px;height:24px;}
-.preset-college{background-position:-400px -24px;width:24px;height:24px;}
-.preset-circle{background-position:-400px -48px;width:24px;height:24px;}
-.preset-circle-stroked{background-position:-400px -72px;width:24px;height:24px;}
-.preset-cinema{background-position:-400px -96px;width:24px;height:24px;}
-.preset-cemetery{background-position:-400px -120px;width:24px;height:24px;}
-.preset-campsite{background-position:-400px -144px;width:24px;height:24px;}
-.preset-cafe{background-position:-400px -168px;width:24px;height:24px;}
-.preset-bus{background-position:-400px -192px;width:24px;height:24px;}
-.preset-bicycle{background-position:-400px -216px;width:24px;height:24px;}
-.preset-beer{background-position:-400px -240px;width:24px;height:24px;}
-.preset-basketball{background-position:-400px -264px;width:24px;height:24px;}
-.preset-baseball{background-position:-400px -288px;width:24px;height:24px;}
-.preset-bar{background-position:-400px -312px;width:24px;height:24px;}
-.preset-bank{background-position:-400px -336px;width:24px;height:24px;}
-.preset-art-gallery{background-position:-400px -360px;width:24px;height:24px;}
-.preset-america-football{background-position:0px -396px;width:24px;height:24px;}
-.preset-alcohol-shop{background-position:-24px -396px;width:24px;height:24px;}
-.preset-airport{background-position:-48px -396px;width:24px;height:24px;}
-.preset-airfield{background-position:-72px -396px;width:24px;height:24px;}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 15b44a5ab..abf10b544 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1725,6 +1725,7 @@
     },
     {
         "name": "wetland",
+        "icon": "wetland",
         "fields": [
             "wetland"
         ],
diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json
index d198ff32b..6b2283e90 100644
--- a/data/presets/presets/natural/wetland.json
+++ b/data/presets/presets/natural/wetland.json
@@ -1,5 +1,6 @@
 {
     "name": "wetland",
+    "icon": "wetland",
     "fields": [
         "wetland"
     ],
@@ -11,4 +12,4 @@
         "natural": "wetland"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/img/feature-icons.png b/img/feature-icons.png
new file mode 100644
index 000000000..6e61b7d6e
Binary files /dev/null and b/img/feature-icons.png differ
diff --git a/img/maki.png b/img/maki.png
deleted file mode 100644
index b9fbad194..000000000
Binary files a/img/maki.png and /dev/null differ
diff --git a/img/preset-icons.png b/img/preset-icons.png
deleted file mode 100644
index 5623a7b51..000000000
Binary files a/img/preset-icons.png and /dev/null differ
diff --git a/img/source/makesprite b/img/source/makesprite
index 90a6c110b..224029b5d 100755
--- a/img/source/makesprite
+++ b/img/source/makesprite
@@ -19,18 +19,17 @@ img="$dir/.."
 css="$dir/../../css"
 
 cd $dir
-mkdir preset-icons
+mkdir feature-icons
 
-cp $MAKIPATH/renders/* preset-icons
-rm preset-icons/*-18.png
-rm preset-icons/*-12.png
-for x in preset-icons/*.png; do
+cp $MAKIPATH/renders/*-24.png feature-icons 
+for x in feature-icons/*.png; do
     mv $x `echo $x | sed "s/-24//"`
 done
-cp renders/line-presets/* preset-icons
+cp $MAKIPATH/renders/*-{12,18}.png feature-icons 
+cp renders/line-presets/* feature-icons
 
 
-glue --namespace=preset --sprite-namespace= preset-icons --css=$css --img=$img
+glue --namespace=feature --sprite-namespace= feature-icons --css=$css --img=$img
 
-rm preset-icons/*
-rmdir preset-icons
+rm feature-icons/*
+rmdir feature-icons
diff --git a/index.html b/index.html
index eefd86824..e6eef2e0a 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
         <link rel='stylesheet' href='css/reset.css'>
         <link rel='stylesheet' href='css/map.css'>
         <link rel='stylesheet' href='css/app.css'>
-        <link rel='stylesheet' href='css/preset-icons.css'>
+        <link rel='stylesheet' href='css/feature-icons.css'>
         <link rel='stylesheet' href='css/maki.css'>
 
         <!-- mobile devices -->
diff --git a/js/id/svg/surface.js b/js/id/svg/surface.js
index d5a1bf05c..0c93aa24a 100644
--- a/js/id/svg/surface.js
+++ b/js/id/svg/surface.js
@@ -17,7 +17,7 @@ iD.svg.Surface = function() {
             var klass = rule.selectorText,
                 match = klass && klass.match(selectorRegexp);
             if (match) {
-                var id = match[1];
+                var id = match[1].replace('feature', 'maki');
                 match = rule.style.backgroundPosition.match(/(-?\d+)px (-?\d+)px/);
                 sprites.push({id: id, x: match[1], y: match[2]});
             }
@@ -107,13 +107,13 @@ iD.svg.Surface = function() {
         defs.append('image')
             .attr({
                 id: 'maki-sprite',
-                width: 306,
-                height: 294,
-                'xlink:href': 'img/maki.png'
+                width: 472,
+                height: 462,
+                'xlink:href': 'img/feature-icons.png'
             });
 
         defs.selectAll()
-            .data(sprites("maki.css", /^\.(maki-[a-z0-9-]+-12)$/))
+            .data(sprites("feature-icons.css", /^\.(feature-[a-z0-9-]+-12)$/))
             .enter().append('use')
             .attr('id', function(d) { return d.id; })
             .attr('transform', function(d) { return "translate(" + d.x + "," + d.y + ")"; })
diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js
index a10a6e2ab..e7aadf373 100644
--- a/js/id/ui/preset_grid.js
+++ b/js/id/ui/preset_grid.js
@@ -114,7 +114,7 @@ iD.ui.PresetGrid = function(context) {
                 });
 
             entered.append('div')
-                .attr('class', function(d) { return 'preset-' + (d.icon || 'marker-stroked') + ' icon'; });
+                .attr('class', function(d) { return 'feature-' + (d.icon || 'marker-stroked') + ' icon'; });
 
             var presetinspect;
 
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index 1fe3bc665..0e41c170b 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -59,7 +59,7 @@ iD.ui.TagEditor = function(context) {
                 .attr('class','col12 grid-entry fillL');
 
         typebutton.append('div')
-            .attr('class', 'icon' + (preset ?  ' preset-' + (preset.icon || 'marker-stroked') : ''));
+            .attr('class', 'icon' + (preset ?  ' feature-' + (preset.icon || 'marker-stroked') : ''));
 
         typebutton.node().focus();