diff --git a/css/feature-icons.css b/css/feature-icons.css
index 7a7bbe89a..8f238ce63 100644
--- a/css/feature-icons.css
+++ b/css/feature-icons.css
@@ -21,75 +21,80 @@
 .feature-cinema{background-position:-0px -994px;}
 .feature-circle{background-position:-0px -1054px;}
 .feature-circle-stroked{background-position:-0px -1114px;}
-.feature-college{background-position:-0px -1174px;}
-.feature-commercial{background-position:-0px -1234px;}
-.feature-cricket{background-position:-0px -1294px;}
-.feature-cross{background-position:-0px -1354px;}
-.feature-dam{background-position:-0px -1414px;}
-.feature-danger{background-position:-0px -1474px;}
-.feature-disability{background-position:-0px -1534px;}
-.feature-embassy{background-position:-0px -1594px;}
-.feature-emergency-telephone{background-position:-0px -1654px;}
-.feature-fast-food{background-position:-0px -1714px;}
-.feature-ferry{background-position:-0px -1774px;}
-.feature-fire-station{background-position:-0px -1834px;}
-.feature-fuel{background-position:-0px -1894px;}
-.feature-garden{background-position:-0px -1954px;}
-.feature-golf{background-position:-0px -2014px;}
-.feature-grocery{background-position:-0px -2074px;}
-.feature-harbor{background-position:-0px -2134px;}
-.feature-heliport{background-position:-0px -2194px;}
-.feature-hospital{background-position:-0px -2254px;}
-.feature-industrial{background-position:-0px -2314px;}
-.feature-library{background-position:-0px -2374px;}
-.feature-lodging{background-position:-0px -2434px;}
-.feature-logging{background-position:-0px -2494px;}
-.feature-marker{background-position:-0px -2554px;}
-.feature-marker-stroked{background-position:-0px -2614px;}
-.feature-monument{background-position:-0px -2674px;}
-.feature-museum{background-position:-0px -2734px;}
-.feature-music{background-position:-0px -2794px;}
-.feature-oil-well{background-position:-0px -2854px;}
-.feature-park{background-position:-0px -2914px;}
-.feature-park2{background-position:-0px -2974px;}
-.feature-parking{background-position:-0px -3034px;}
-.feature-parking-garage{background-position:-0px -3094px;}
-.feature-pharmacy{background-position:-0px -3154px;}
-.feature-pitch{background-position:-0px -3214px;}
-.feature-place-of-worship{background-position:-0px -3274px;}
-.feature-police{background-position:-0px -3334px;}
-.feature-post{background-position:-0px -3394px;}
-.feature-prison{background-position:-0px -3454px;}
-.feature-rail{background-position:-0px -3514px;}
-.feature-rail-above{background-position:-0px -3574px;}
-.feature-rail-underground{background-position:-0px -3634px;}
-.feature-religious-christian{background-position:-0px -3694px;}
-.feature-religious-jewish{background-position:-0px -3754px;}
-.feature-religious-muslim{background-position:-0px -3814px;}
-.feature-restaurant{background-position:-0px -3874px;}
-.feature-roadblock{background-position:-0px -3934px;}
-.feature-school{background-position:-0px -3994px;}
-.feature-shop{background-position:-0px -4054px;}
-.feature-skiing{background-position:-0px -4114px;}
-.feature-slaughterhouse{background-position:-0px -4174px;}
-.feature-soccer{background-position:-0px -4234px;}
-.feature-square{background-position:-0px -4294px;}
-.feature-square-stroked{background-position:-0px -4354px;}
-.feature-star{background-position:-0px -4414px;}
-.feature-star-stroked{background-position:-0px -4474px;}
-.feature-swimming{background-position:-0px -4534px;}
-.feature-telephone{background-position:-0px -4594px;}
-.feature-tennis{background-position:-0px -4654px;}
-.feature-theatre{background-position:-0px -4714px;}
-.feature-toilets{background-position:-0px -4774px;}
-.feature-town-hall{background-position:-0px -4834px;}
-.feature-triangle{background-position:-0px -4894px;}
-.feature-triangle-stroked{background-position:-0px -4954px;}
-.feature-warehouse{background-position:-0px -5014px;}
-.feature-waste-basket{background-position:-0px -5074px;}
-.feature-water{background-position:-0px -5134px;}
-.feature-wetland{background-position:-0px -5194px;}
-.feature-zoo{background-position:-0px -5254px;}
+.feature-city{background-position:-0px -1174px;}
+.feature-college{background-position:-0px -1234px;}
+.feature-commercial{background-position:-0px -1294px;}
+.feature-cricket{background-position:-0px -1354px;}
+.feature-cross{background-position:-0px -1414px;}
+.feature-dam{background-position:-0px -1474px;}
+.feature-danger{background-position:-0px -1534px;}
+.feature-disability{background-position:-0px -1594px;}
+.feature-embassy{background-position:-0px -1654px;}
+.feature-emergency-telephone{background-position:-0px -1714px;}
+.feature-farm{background-position:-0px -1774px;}
+.feature-fast-food{background-position:-0px -1834px;}
+.feature-ferry{background-position:-0px -1894px;}
+.feature-fire-station{background-position:-0px -1954px;}
+.feature-fuel{background-position:-0px -2014px;}
+.feature-garden{background-position:-0px -2074px;}
+.feature-golf{background-position:-0px -2134px;}
+.feature-grocery{background-position:-0px -2194px;}
+.feature-harbor{background-position:-0px -2254px;}
+.feature-heliport{background-position:-0px -2314px;}
+.feature-hospital{background-position:-0px -2374px;}
+.feature-industrial{background-position:-0px -2434px;}
+.feature-land-use{background-position:-0px -2494px;}
+.feature-library{background-position:-0px -2554px;}
+.feature-lodging{background-position:-0px -2614px;}
+.feature-logging{background-position:-0px -2674px;}
+.feature-marker{background-position:-0px -2734px;}
+.feature-marker-stroked{background-position:-0px -2794px;}
+.feature-monument{background-position:-0px -2854px;}
+.feature-museum{background-position:-0px -2914px;}
+.feature-music{background-position:-0px -2974px;}
+.feature-oil-well{background-position:-0px -3034px;}
+.feature-park{background-position:-0px -3094px;}
+.feature-park2{background-position:-0px -3154px;}
+.feature-parking{background-position:-0px -3214px;}
+.feature-parking-garage{background-position:-0px -3274px;}
+.feature-pharmacy{background-position:-0px -3334px;}
+.feature-pitch{background-position:-0px -3394px;}
+.feature-place-of-worship{background-position:-0px -3454px;}
+.feature-police{background-position:-0px -3514px;}
+.feature-post{background-position:-0px -3574px;}
+.feature-prison{background-position:-0px -3634px;}
+.feature-rail{background-position:-0px -3694px;}
+.feature-rail-above{background-position:-0px -3754px;}
+.feature-rail-underground{background-position:-0px -3814px;}
+.feature-religious-christian{background-position:-0px -3874px;}
+.feature-religious-jewish{background-position:-0px -3934px;}
+.feature-religious-muslim{background-position:-0px -3994px;}
+.feature-restaurant{background-position:-0px -4054px;}
+.feature-roadblock{background-position:-0px -4114px;}
+.feature-school{background-position:-0px -4174px;}
+.feature-shop{background-position:-0px -4234px;}
+.feature-skiing{background-position:-0px -4294px;}
+.feature-slaughterhouse{background-position:-0px -4354px;}
+.feature-soccer{background-position:-0px -4414px;}
+.feature-square{background-position:-0px -4474px;}
+.feature-square-stroked{background-position:-0px -4534px;}
+.feature-star{background-position:-0px -4594px;}
+.feature-star-stroked{background-position:-0px -4654px;}
+.feature-swimming{background-position:-0px -4714px;}
+.feature-telephone{background-position:-0px -4774px;}
+.feature-tennis{background-position:-0px -4834px;}
+.feature-theatre{background-position:-0px -4894px;}
+.feature-toilets{background-position:-0px -4954px;}
+.feature-town{background-position:-0px -5014px;}
+.feature-town-hall{background-position:-0px -5074px;}
+.feature-triangle{background-position:-0px -5134px;}
+.feature-triangle-stroked{background-position:-0px -5194px;}
+.feature-village{background-position:-0px -5254px;}
+.feature-warehouse{background-position:-0px -5314px;}
+.feature-waste-basket{background-position:-0px -5374px;}
+.feature-water{background-position:-0px -5434px;}
+.feature-wetland{background-position:-0px -5494px;}
+.feature-zoo{background-position:-0px -5554px;}
 .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
 .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
 .preset-icon-line.feature-highway-primary{background-position:-140px -25px;}
diff --git a/data/feature-icons.json b/data/feature-icons.json
index 12a63fa5a..d4df1d4e2 100644
--- a/data/feature-icons.json
+++ b/data/feature-icons.json
@@ -1 +1 @@
-{"airfield":{"12":[0,0],"18":[0,14],"24":[0,34]},"airport":{"12":[0,60],"18":[0,74],"24":[0,94]},"alcohol-shop":{"12":[0,120],"18":[0,134],"24":[0,154]},"america-football":{"12":[0,180],"18":[0,194],"24":[0,214]},"art-gallery":{"12":[0,240],"18":[0,254],"24":[0,274]},"bank":{"12":[0,300],"18":[0,314],"24":[0,334]},"bar":{"12":[0,360],"18":[0,374],"24":[0,394]},"baseball":{"12":[0,420],"18":[0,434],"24":[0,454]},"basketball":{"12":[0,480],"18":[0,494],"24":[0,514]},"beer":{"12":[0,540],"18":[0,554],"24":[0,574]},"bicycle":{"12":[0,600],"18":[0,614],"24":[0,634]},"building":{"12":[0,660],"18":[0,674],"24":[0,694]},"bus":{"12":[0,720],"18":[0,734],"24":[0,754]},"cafe":{"12":[0,780],"18":[0,794],"24":[0,814]},"campsite":{"12":[0,840],"18":[0,854],"24":[0,874]},"cemetery":{"12":[0,900],"18":[0,914],"24":[0,934]},"cinema":{"12":[0,960],"18":[0,974],"24":[0,994]},"circle":{"12":[0,1020],"18":[0,1034],"24":[0,1054]},"circle-stroked":{"12":[0,1080],"18":[0,1094],"24":[0,1114]},"college":{"12":[0,1140],"18":[0,1154],"24":[0,1174]},"commercial":{"12":[0,1200],"18":[0,1214],"24":[0,1234]},"cricket":{"12":[0,1260],"18":[0,1274],"24":[0,1294]},"cross":{"12":[0,1320],"18":[0,1334],"24":[0,1354]},"dam":{"12":[0,1380],"18":[0,1394],"24":[0,1414]},"danger":{"12":[0,1440],"18":[0,1454],"24":[0,1474]},"disability":{"12":[0,1500],"18":[0,1514],"24":[0,1534]},"embassy":{"12":[0,1560],"18":[0,1574],"24":[0,1594]},"emergency-telephone":{"12":[0,1620],"18":[0,1634],"24":[0,1654]},"fast-food":{"12":[0,1680],"18":[0,1694],"24":[0,1714]},"ferry":{"12":[0,1740],"18":[0,1754],"24":[0,1774]},"fire-station":{"12":[0,1800],"18":[0,1814],"24":[0,1834]},"fuel":{"12":[0,1860],"18":[0,1874],"24":[0,1894]},"garden":{"12":[0,1920],"18":[0,1934],"24":[0,1954]},"golf":{"12":[0,1980],"18":[0,1994],"24":[0,2014]},"grocery":{"12":[0,2040],"18":[0,2054],"24":[0,2074]},"harbor":{"12":[0,2100],"18":[0,2114],"24":[0,2134]},"heliport":{"12":[0,2160],"18":[0,2174],"24":[0,2194]},"hospital":{"12":[0,2220],"18":[0,2234],"24":[0,2254]},"industrial":{"12":[0,2280],"18":[0,2294],"24":[0,2314]},"library":{"12":[0,2340],"18":[0,2354],"24":[0,2374]},"lodging":{"12":[0,2400],"18":[0,2414],"24":[0,2434]},"logging":{"12":[0,2460],"18":[0,2474],"24":[0,2494]},"marker":{"12":[0,2520],"18":[0,2534],"24":[0,2554]},"marker-stroked":{"12":[0,2580],"18":[0,2594],"24":[0,2614]},"monument":{"12":[0,2640],"18":[0,2654],"24":[0,2674]},"museum":{"12":[0,2700],"18":[0,2714],"24":[0,2734]},"music":{"12":[0,2760],"18":[0,2774],"24":[0,2794]},"oil-well":{"12":[0,2820],"18":[0,2834],"24":[0,2854]},"park":{"12":[0,2880],"18":[0,2894],"24":[0,2914]},"park2":{"12":[0,2940],"18":[0,2954],"24":[0,2974]},"parking":{"12":[0,3000],"18":[0,3014],"24":[0,3034]},"parking-garage":{"12":[0,3060],"18":[0,3074],"24":[0,3094]},"pharmacy":{"12":[0,3120],"18":[0,3134],"24":[0,3154]},"pitch":{"12":[0,3180],"18":[0,3194],"24":[0,3214]},"place-of-worship":{"12":[0,3240],"18":[0,3254],"24":[0,3274]},"police":{"12":[0,3300],"18":[0,3314],"24":[0,3334]},"post":{"12":[0,3360],"18":[0,3374],"24":[0,3394]},"prison":{"12":[0,3420],"18":[0,3434],"24":[0,3454]},"rail":{"12":[0,3480],"18":[0,3494],"24":[0,3514]},"rail-above":{"12":[0,3540],"18":[0,3554],"24":[0,3574]},"rail-underground":{"12":[0,3600],"18":[0,3614],"24":[0,3634]},"religious-christian":{"12":[0,3660],"18":[0,3674],"24":[0,3694]},"religious-jewish":{"12":[0,3720],"18":[0,3734],"24":[0,3754]},"religious-muslim":{"12":[0,3780],"18":[0,3794],"24":[0,3814]},"restaurant":{"12":[0,3840],"18":[0,3854],"24":[0,3874]},"roadblock":{"12":[0,3900],"18":[0,3914],"24":[0,3934]},"school":{"12":[0,3960],"18":[0,3974],"24":[0,3994]},"shop":{"12":[0,4020],"18":[0,4034],"24":[0,4054]},"skiing":{"12":[0,4080],"18":[0,4094],"24":[0,4114]},"slaughterhouse":{"12":[0,4140],"18":[0,4154],"24":[0,4174]},"soccer":{"12":[0,4200],"18":[0,4214],"24":[0,4234]},"square":{"12":[0,4260],"18":[0,4274],"24":[0,4294]},"square-stroked":{"12":[0,4320],"18":[0,4334],"24":[0,4354]},"star":{"12":[0,4380],"18":[0,4394],"24":[0,4414]},"star-stroked":{"12":[0,4440],"18":[0,4454],"24":[0,4474]},"swimming":{"12":[0,4500],"18":[0,4514],"24":[0,4534]},"telephone":{"12":[0,4560],"18":[0,4574],"24":[0,4594]},"tennis":{"12":[0,4620],"18":[0,4634],"24":[0,4654]},"theatre":{"12":[0,4680],"18":[0,4694],"24":[0,4714]},"toilets":{"12":[0,4740],"18":[0,4754],"24":[0,4774]},"town-hall":{"12":[0,4800],"18":[0,4814],"24":[0,4834]},"triangle":{"12":[0,4860],"18":[0,4874],"24":[0,4894]},"triangle-stroked":{"12":[0,4920],"18":[0,4934],"24":[0,4954]},"warehouse":{"12":[0,4980],"18":[0,4994],"24":[0,5014]},"waste-basket":{"12":[0,5040],"18":[0,5054],"24":[0,5074]},"water":{"12":[0,5100],"18":[0,5114],"24":[0,5134]},"wetland":{"12":[0,5160],"18":[0,5174],"24":[0,5194]},"zoo":{"12":[0,5220],"18":[0,5234],"24":[0,5254]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]}}
\ No newline at end of file
+{"airfield":{"12":[0,0],"18":[0,14],"24":[0,34]},"airport":{"12":[0,60],"18":[0,74],"24":[0,94]},"alcohol-shop":{"12":[0,120],"18":[0,134],"24":[0,154]},"america-football":{"12":[0,180],"18":[0,194],"24":[0,214]},"art-gallery":{"12":[0,240],"18":[0,254],"24":[0,274]},"bank":{"12":[0,300],"18":[0,314],"24":[0,334]},"bar":{"12":[0,360],"18":[0,374],"24":[0,394]},"baseball":{"12":[0,420],"18":[0,434],"24":[0,454]},"basketball":{"12":[0,480],"18":[0,494],"24":[0,514]},"beer":{"12":[0,540],"18":[0,554],"24":[0,574]},"bicycle":{"12":[0,600],"18":[0,614],"24":[0,634]},"building":{"12":[0,660],"18":[0,674],"24":[0,694]},"bus":{"12":[0,720],"18":[0,734],"24":[0,754]},"cafe":{"12":[0,780],"18":[0,794],"24":[0,814]},"campsite":{"12":[0,840],"18":[0,854],"24":[0,874]},"cemetery":{"12":[0,900],"18":[0,914],"24":[0,934]},"cinema":{"12":[0,960],"18":[0,974],"24":[0,994]},"circle":{"12":[0,1020],"18":[0,1034],"24":[0,1054]},"circle-stroked":{"12":[0,1080],"18":[0,1094],"24":[0,1114]},"city":{"12":[0,1140],"18":[0,1154],"24":[0,1174]},"college":{"12":[0,1200],"18":[0,1214],"24":[0,1234]},"commercial":{"12":[0,1260],"18":[0,1274],"24":[0,1294]},"cricket":{"12":[0,1320],"18":[0,1334],"24":[0,1354]},"cross":{"12":[0,1380],"18":[0,1394],"24":[0,1414]},"dam":{"12":[0,1440],"18":[0,1454],"24":[0,1474]},"danger":{"12":[0,1500],"18":[0,1514],"24":[0,1534]},"disability":{"12":[0,1560],"18":[0,1574],"24":[0,1594]},"embassy":{"12":[0,1620],"18":[0,1634],"24":[0,1654]},"emergency-telephone":{"12":[0,1680],"18":[0,1694],"24":[0,1714]},"farm":{"12":[0,1740],"18":[0,1754],"24":[0,1774]},"fast-food":{"12":[0,1800],"18":[0,1814],"24":[0,1834]},"ferry":{"12":[0,1860],"18":[0,1874],"24":[0,1894]},"fire-station":{"12":[0,1920],"18":[0,1934],"24":[0,1954]},"fuel":{"12":[0,1980],"18":[0,1994],"24":[0,2014]},"garden":{"12":[0,2040],"18":[0,2054],"24":[0,2074]},"golf":{"12":[0,2100],"18":[0,2114],"24":[0,2134]},"grocery":{"12":[0,2160],"18":[0,2174],"24":[0,2194]},"harbor":{"12":[0,2220],"18":[0,2234],"24":[0,2254]},"heliport":{"12":[0,2280],"18":[0,2294],"24":[0,2314]},"hospital":{"12":[0,2340],"18":[0,2354],"24":[0,2374]},"industrial":{"12":[0,2400],"18":[0,2414],"24":[0,2434]},"land-use":{"12":[0,2460],"18":[0,2474],"24":[0,2494]},"library":{"12":[0,2520],"18":[0,2534],"24":[0,2554]},"lodging":{"12":[0,2580],"18":[0,2594],"24":[0,2614]},"logging":{"12":[0,2640],"18":[0,2654],"24":[0,2674]},"marker":{"12":[0,2700],"18":[0,2714],"24":[0,2734]},"marker-stroked":{"12":[0,2760],"18":[0,2774],"24":[0,2794]},"monument":{"12":[0,2820],"18":[0,2834],"24":[0,2854]},"museum":{"12":[0,2880],"18":[0,2894],"24":[0,2914]},"music":{"12":[0,2940],"18":[0,2954],"24":[0,2974]},"oil-well":{"12":[0,3000],"18":[0,3014],"24":[0,3034]},"park":{"12":[0,3060],"18":[0,3074],"24":[0,3094]},"park2":{"12":[0,3120],"18":[0,3134],"24":[0,3154]},"parking":{"12":[0,3180],"18":[0,3194],"24":[0,3214]},"parking-garage":{"12":[0,3240],"18":[0,3254],"24":[0,3274]},"pharmacy":{"12":[0,3300],"18":[0,3314],"24":[0,3334]},"pitch":{"12":[0,3360],"18":[0,3374],"24":[0,3394]},"place-of-worship":{"12":[0,3420],"18":[0,3434],"24":[0,3454]},"police":{"12":[0,3480],"18":[0,3494],"24":[0,3514]},"post":{"12":[0,3540],"18":[0,3554],"24":[0,3574]},"prison":{"12":[0,3600],"18":[0,3614],"24":[0,3634]},"rail":{"12":[0,3660],"18":[0,3674],"24":[0,3694]},"rail-above":{"12":[0,3720],"18":[0,3734],"24":[0,3754]},"rail-underground":{"12":[0,3780],"18":[0,3794],"24":[0,3814]},"religious-christian":{"12":[0,3840],"18":[0,3854],"24":[0,3874]},"religious-jewish":{"12":[0,3900],"18":[0,3914],"24":[0,3934]},"religious-muslim":{"12":[0,3960],"18":[0,3974],"24":[0,3994]},"restaurant":{"12":[0,4020],"18":[0,4034],"24":[0,4054]},"roadblock":{"12":[0,4080],"18":[0,4094],"24":[0,4114]},"school":{"12":[0,4140],"18":[0,4154],"24":[0,4174]},"shop":{"12":[0,4200],"18":[0,4214],"24":[0,4234]},"skiing":{"12":[0,4260],"18":[0,4274],"24":[0,4294]},"slaughterhouse":{"12":[0,4320],"18":[0,4334],"24":[0,4354]},"soccer":{"12":[0,4380],"18":[0,4394],"24":[0,4414]},"square":{"12":[0,4440],"18":[0,4454],"24":[0,4474]},"square-stroked":{"12":[0,4500],"18":[0,4514],"24":[0,4534]},"star":{"12":[0,4560],"18":[0,4574],"24":[0,4594]},"star-stroked":{"12":[0,4620],"18":[0,4634],"24":[0,4654]},"swimming":{"12":[0,4680],"18":[0,4694],"24":[0,4714]},"telephone":{"12":[0,4740],"18":[0,4754],"24":[0,4774]},"tennis":{"12":[0,4800],"18":[0,4814],"24":[0,4834]},"theatre":{"12":[0,4860],"18":[0,4874],"24":[0,4894]},"toilets":{"12":[0,4920],"18":[0,4934],"24":[0,4954]},"town":{"12":[0,4980],"18":[0,4994],"24":[0,5014]},"town-hall":{"12":[0,5040],"18":[0,5054],"24":[0,5074]},"triangle":{"12":[0,5100],"18":[0,5114],"24":[0,5134]},"triangle-stroked":{"12":[0,5160],"18":[0,5174],"24":[0,5194]},"village":{"12":[0,5220],"18":[0,5234],"24":[0,5254]},"warehouse":{"12":[0,5280],"18":[0,5294],"24":[0,5314]},"waste-basket":{"12":[0,5340],"18":[0,5354],"24":[0,5374]},"water":{"12":[0,5400],"18":[0,5414],"24":[0,5434]},"wetland":{"12":[0,5460],"18":[0,5474],"24":[0,5494]},"zoo":{"12":[0,5520],"18":[0,5534],"24":[0,5554]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]}}
\ No newline at end of file
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 2829081e6..d1ccc3a75 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -2,7 +2,7 @@
     "category-landuse": {
         "geometry": "area",
         "name": "Land Use",
-        "icon": "category-landuse",
+        "icon": "land-use",
         "members": [
             "landuse/residential",
             "landuse/industrial",
diff --git a/data/presets/categories/landuse.json b/data/presets/categories/landuse.json
index 0467bbd14..206ca7110 100644
--- a/data/presets/categories/landuse.json
+++ b/data/presets/categories/landuse.json
@@ -1,7 +1,7 @@
 {
     "geometry": "area",
     "name": "Land Use",
-    "icon": "category-landuse",
+    "icon": "land-use",
     "members": [
         "landuse/residential",
         "landuse/industrial",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e2536b68c..5ef1b9b09 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2147,7 +2147,8 @@
             "landuse": "farm"
         },
         "terms": [],
-        "name": "Farm"
+        "name": "Farm",
+        "icon": "farm"
     },
     "landuse/farmyard": {
         "geometry": [
@@ -2952,7 +2953,7 @@
         "name": "Place"
     },
     "place/city": {
-        "icon": "square",
+        "icon": "city",
         "geometry": [
             "point",
             "area"
@@ -3015,7 +3016,7 @@
         "name": "Locality"
     },
     "place/town": {
-        "icon": "square-stroked",
+        "icon": "town",
         "geometry": [
             "point",
             "area"
@@ -3026,7 +3027,7 @@
         "name": "Town"
     },
     "place/village": {
-        "icon": "triangle",
+        "icon": "village",
         "geometry": [
             "point",
             "area"
diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json
index 8d73f1146..e10908e5d 100644
--- a/data/presets/presets/landuse/farm.json
+++ b/data/presets/presets/landuse/farm.json
@@ -7,5 +7,6 @@
         "landuse": "farm"
     },
     "terms": [],
-    "name": "Farm"
+    "name": "Farm",
+    "icon": "farm"
 }
\ No newline at end of file
diff --git a/data/presets/presets/place/city.json b/data/presets/presets/place/city.json
index 3c9684620..0ddbd6e7e 100644
--- a/data/presets/presets/place/city.json
+++ b/data/presets/presets/place/city.json
@@ -1,5 +1,5 @@
 {
-    "icon": "square",
+    "icon": "city",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/place/town.json b/data/presets/presets/place/town.json
index 66ad69a44..f742e6631 100644
--- a/data/presets/presets/place/town.json
+++ b/data/presets/presets/place/town.json
@@ -1,5 +1,5 @@
 {
-    "icon": "square-stroked",
+    "icon": "town",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/place/village.json b/data/presets/presets/place/village.json
index 14e3c635c..5657ca919 100644
--- a/data/presets/presets/place/village.json
+++ b/data/presets/presets/place/village.json
@@ -1,5 +1,5 @@
 {
-    "icon": "triangle",
+    "icon": "village",
     "geometry": [
         "point",
         "area"
diff --git a/dist/img/maki-sprite.png b/dist/img/maki-sprite.png
index debd6e1b6..0f17c345f 100644
Binary files a/dist/img/maki-sprite.png and b/dist/img/maki-sprite.png differ
diff --git a/package.json b/package.json
index 5faff4f34..a2dcb5bc6 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "d3": "3",
     "smash": "0.0",
     "uglify-js": "~2.2.5",
-    "maki": "git://github.com/mapbox/maki.git#0001ab8a8a03e2517fab0f76f44422dd08f6faa3",
+    "maki": "0.1",
     "mocha": "~1.9",
     "mocha-phantomjs": "~1.1.1",
     "chai": "~1.4",