diff --git a/css/feature-icons.css b/css/feature-icons.css
index eb162bbab..1ecc54914 100644
--- a/css/feature-icons.css
+++ b/css/feature-icons.css
@@ -1,29 +1,35 @@
-/* glue: 0.3 hash: ee946d1590 */
-.feature-highway-trunk-link,
-.feature-highway-secondary-link,
-.feature-highway-primary-link,
-.feature-highway-motorway-link,
+/* glue: 0.3 hash: efe68f0007 */
 .feature-waterway-stream,
 .feature-waterway-river,
+.feature-waterway-ditch,
+.feature-waterway-canal,
 .feature-railway-rail,
+.feature-railway-monorail,
+.feature-railway-light_rail,
+.feature-railway-disused,
 .feature-railway-abandoned,
 .feature-power-line,
 .feature-highway-unclassified,
 .feature-highway-trunk,
+.feature-highway-trunk-link,
 .feature-highway-tertiary,
 .feature-highway-steps,
 .feature-highway-service,
 .feature-highway-secondary,
+.feature-highway-secondary-link,
 .feature-highway-road,
 .feature-highway-residential,
 .feature-highway-primary,
+.feature-highway-primary-link,
 .feature-highway-path,
 .feature-highway-motorway,
+.feature-highway-motorway-link,
 .feature-highway-living_street,
 .feature-highway-footway,
 .feature-highway-cycleway,
 .feature-highway-bridleway,
 .feature-waterway-riverdsads,
+.feature-waterway-riverdsads-8,
 .feature-zoo,
 .feature-x,
 .feature-wetland,
@@ -282,287 +288,293 @@
 .feature-alcohol-shop-12,
 .feature-airport-12,
 .feature-airfield-12{background-image:url('../img/feature-icons.png');background-repeat:no-repeat}
-.feature-highway-trunk-link{background-position:0px 0px;width:50px;height:56px;}
-.feature-highway-tertiary:link{background-position:-50px 0px;width:50px;height:56px;}
-.feature-highway-secondary-link{background-position:-100px 0px;width:50px;height:56px;}
-.feature-highway-primary-link{background-position:0px -56px;width:50px;height:56px;}
-.feature-highway-motorway-link{background-position:-50px -56px;width:50px;height:56px;}
-.feature-waterway-stream{background-position:-100px -56px;width:50px;height:50px;}
-.feature-waterway-river{background-position:-150px 0px;width:50px;height:50px;}
-.feature-railway-rail{background-position:-150px -50px;width:50px;height:50px;}
-.feature-railway-abandoned{background-position:0px -112px;width:50px;height:50px;}
-.feature-power-line{background-position:-50px -112px;width:50px;height:50px;}
-.feature-highway-unclassified{background-position:-100px -112px;width:50px;height:50px;}
-.feature-highway-trunk{background-position:-150px -112px;width:50px;height:50px;}
-.feature-highway-tertiary{background-position:-200px 0px;width:50px;height:50px;}
-.feature-highway-steps{background-position:-200px -50px;width:50px;height:50px;}
-.feature-highway-service{background-position:-200px -100px;width:50px;height:50px;}
-.feature-highway-secondary{background-position:0px -162px;width:50px;height:50px;}
-.feature-highway-road{background-position:-50px -162px;width:50px;height:50px;}
-.feature-highway-residential{background-position:-100px -162px;width:50px;height:50px;}
-.feature-highway-primary{background-position:-150px -162px;width:50px;height:50px;}
-.feature-highway-path{background-position:-200px -162px;width:50px;height:50px;}
-.feature-highway-motorway{background-position:-250px 0px;width:50px;height:50px;}
-.feature-highway-living_street{background-position:-250px -50px;width:50px;height:50px;}
-.feature-highway-footway{background-position:-250px -100px;width:50px;height:50px;}
-.feature-highway-cycleway{background-position:-250px -150px;width:50px;height:50px;}
-.feature-highway-bridleway{background-position:0px -212px;width:50px;height:50px;}
-.feature-waterway-riverdsads{background-position:-50px -212px;width:27px;height:22px;}
-.feature-zoo{background-position:-50px -234px;width:24px;height:24px;}
-.feature-x{background-position:-74px -234px;width:24px;height:24px;}
-.feature-wetland{background-position:-98px -234px;width:24px;height:24px;}
-.feature-water{background-position:-122px -234px;width:24px;height:24px;}
-.feature-waste-basket{background-position:-146px -234px;width:24px;height:24px;}
-.feature-warehouse{background-position:-170px -234px;width:24px;height:24px;}
-.feature-triangle{background-position:-194px -234px;width:24px;height:24px;}
-.feature-triangle-stroked{background-position:-218px -234px;width:24px;height:24px;}
-.feature-town-hall{background-position:-242px -234px;width:24px;height:24px;}
-.feature-toilets{background-position:-266px -234px;width:24px;height:24px;}
-.feature-theatre{background-position:0px -262px;width:24px;height:24px;}
-.feature-tennis{background-position:-24px -262px;width:24px;height:24px;}
-.feature-swimming{background-position:-48px -262px;width:24px;height:24px;}
-.feature-star{background-position:-72px -262px;width:24px;height:24px;}
-.feature-star-stroked{background-position:-96px -262px;width:24px;height:24px;}
-.feature-square{background-position:-120px -262px;width:24px;height:24px;}
-.feature-square-stroked{background-position:-144px -262px;width:24px;height:24px;}
-.feature-soccer{background-position:-168px -262px;width:24px;height:24px;}
-.feature-slaughterhouse{background-position:-192px -262px;width:24px;height:24px;}
-.feature-skiing{background-position:-216px -262px;width:24px;height:24px;}
-.feature-shop{background-position:-240px -262px;width:24px;height:24px;}
-.feature-school{background-position:-264px -262px;width:24px;height:24px;}
-.feature-roadblock{background-position:-300px 0px;width:24px;height:24px;}
-.feature-restaurant{background-position:-300px -24px;width:24px;height:24px;}
-.feature-religious-muslim{background-position:-300px -48px;width:24px;height:24px;}
-.feature-religious-jewish{background-position:-300px -72px;width:24px;height:24px;}
-.feature-religious-christian{background-position:-300px -96px;width:24px;height:24px;}
-.feature-rail{background-position:-300px -120px;width:24px;height:24px;}
-.feature-rail-underground{background-position:-300px -144px;width:24px;height:24px;}
-.feature-rail-above{background-position:-300px -168px;width:24px;height:24px;}
-.feature-prison{background-position:-300px -192px;width:24px;height:24px;}
-.feature-post{background-position:-300px -216px;width:24px;height:24px;}
-.feature-police{background-position:-300px -240px;width:24px;height:24px;}
-.feature-place-of-worship{background-position:0px -286px;width:24px;height:24px;}
-.feature-pitch{background-position:-24px -286px;width:24px;height:24px;}
-.feature-pharmacy{background-position:-48px -286px;width:24px;height:24px;}
-.feature-parking{background-position:-72px -286px;width:24px;height:24px;}
-.feature-parking-garage{background-position:-96px -286px;width:24px;height:24px;}
-.feature-park2{background-position:-120px -286px;width:24px;height:24px;}
-.feature-park{background-position:-144px -286px;width:24px;height:24px;}
-.feature-oil-well{background-position:-168px -286px;width:24px;height:24px;}
-.feature-museum{background-position:-192px -286px;width:24px;height:24px;}
-.feature-monument{background-position:-216px -286px;width:24px;height:24px;}
-.feature-minefield{background-position:-240px -286px;width:24px;height:24px;}
-.feature-marker{background-position:-264px -286px;width:24px;height:24px;}
-.feature-marker-stroked{background-position:-288px -286px;width:24px;height:24px;}
-.feature-london-underground{background-position:-324px 0px;width:24px;height:24px;}
-.feature-logging{background-position:-324px -24px;width:24px;height:24px;}
-.feature-lodging{background-position:-324px -48px;width:24px;height:24px;}
-.feature-library{background-position:-324px -72px;width:24px;height:24px;}
-.feature-industrial{background-position:-324px -96px;width:24px;height:24px;}
-.feature-hospital{background-position:-324px -120px;width:24px;height:24px;}
-.feature-heliport{background-position:-324px -144px;width:24px;height:24px;}
-.feature-harbor{background-position:-324px -168px;width:24px;height:24px;}
-.feature-grocery{background-position:-324px -192px;width:24px;height:24px;}
-.feature-golf{background-position:-324px -216px;width:24px;height:24px;}
-.feature-garden{background-position:-324px -240px;width:24px;height:24px;}
-.feature-fuel{background-position:-324px -264px;width:24px;height:24px;}
-.feature-fire-station{background-position:0px -310px;width:24px;height:24px;}
-.feature-ferry{background-position:-24px -310px;width:24px;height:24px;}
-.feature-fast-food{background-position:-48px -310px;width:24px;height:24px;}
-.feature-embassy{background-position:-72px -310px;width:24px;height:24px;}
-.feature-danger{background-position:-96px -310px;width:24px;height:24px;}
-.feature-dam{background-position:-120px -310px;width:24px;height:24px;}
-.feature-cross{background-position:-144px -310px;width:24px;height:24px;}
-.feature-cricket{background-position:-168px -310px;width:24px;height:24px;}
-.feature-commercial{background-position:-192px -310px;width:24px;height:24px;}
-.feature-college{background-position:-216px -310px;width:24px;height:24px;}
-.feature-circle{background-position:-240px -310px;width:24px;height:24px;}
-.feature-circle-stroked{background-position:-264px -310px;width:24px;height:24px;}
-.feature-cinema{background-position:-288px -310px;width:24px;height:24px;}
-.feature-cemetery{background-position:-312px -310px;width:24px;height:24px;}
-.feature-campsite{background-position:-348px 0px;width:24px;height:24px;}
-.feature-cafe{background-position:-348px -24px;width:24px;height:24px;}
-.feature-bus{background-position:-348px -48px;width:24px;height:24px;}
-.feature-bicycle{background-position:-348px -72px;width:24px;height:24px;}
-.feature-beer{background-position:-348px -96px;width:24px;height:24px;}
-.feature-basketball{background-position:-348px -120px;width:24px;height:24px;}
-.feature-baseball{background-position:-348px -144px;width:24px;height:24px;}
-.feature-bar{background-position:-348px -168px;width:24px;height:24px;}
-.feature-bank{background-position:-348px -192px;width:24px;height:24px;}
-.feature-art-gallery{background-position:-348px -216px;width:24px;height:24px;}
-.feature-america-football{background-position:-348px -240px;width:24px;height:24px;}
-.feature-alcohol-shop{background-position:-348px -264px;width:24px;height:24px;}
-.feature-airport{background-position:-348px -288px;width:24px;height:24px;}
-.feature-airfield{background-position:0px -334px;width:24px;height:24px;}
-.feature-zoo-18{background-position:-348px -312px;width:18px;height:18px;}
-.feature-x-18{background-position:-324px -288px;width:18px;height:18px;}
-.feature-wetland-18{background-position:-300px -264px;width:18px;height:18px;}
-.feature-water-18{background-position:-77px -212px;width:18px;height:18px;}
-.feature-waste-basket-18{background-position:-95px -212px;width:18px;height:18px;}
-.feature-warehouse-18{background-position:-113px -212px;width:18px;height:18px;}
-.feature-triangle-stroked-18{background-position:-131px -212px;width:18px;height:18px;}
-.feature-triangle-18{background-position:-149px -212px;width:18px;height:18px;}
-.feature-town-hall-18{background-position:-167px -212px;width:18px;height:18px;}
-.feature-toilets-18{background-position:-185px -212px;width:18px;height:18px;}
-.feature-theatre-18{background-position:-203px -212px;width:18px;height:18px;}
-.feature-tennis-18{background-position:-221px -212px;width:18px;height:18px;}
-.feature-swimming-18{background-position:-239px -212px;width:18px;height:18px;}
-.feature-star-stroked-18{background-position:-257px -212px;width:18px;height:18px;}
-.feature-star-18{background-position:-275px -212px;width:18px;height:18px;}
-.feature-square-stroked-18{background-position:-24px -334px;width:18px;height:18px;}
-.feature-square-18{background-position:-42px -334px;width:18px;height:18px;}
-.feature-soccer-18{background-position:-60px -334px;width:18px;height:18px;}
-.feature-slaughterhouse-18{background-position:-78px -334px;width:18px;height:18px;}
-.feature-skiing-18{background-position:-96px -334px;width:18px;height:18px;}
-.feature-shop-18{background-position:-114px -334px;width:18px;height:18px;}
-.feature-school-18{background-position:-132px -334px;width:18px;height:18px;}
-.feature-roadblock-18{background-position:-150px -334px;width:18px;height:18px;}
-.feature-restaurant-18{background-position:-168px -334px;width:18px;height:18px;}
-.feature-religious-muslim-18{background-position:-186px -334px;width:18px;height:18px;}
-.feature-religious-jewish-18{background-position:-204px -334px;width:18px;height:18px;}
-.feature-religious-christian-18{background-position:-222px -334px;width:18px;height:18px;}
-.feature-rail-underground-18{background-position:-240px -334px;width:18px;height:18px;}
-.feature-rail-above-18{background-position:-258px -334px;width:18px;height:18px;}
-.feature-rail-18{background-position:-276px -334px;width:18px;height:18px;}
-.feature-prison-18{background-position:-294px -334px;width:18px;height:18px;}
-.feature-post-18{background-position:-312px -334px;width:18px;height:18px;}
-.feature-police-18{background-position:-330px -334px;width:18px;height:18px;}
-.feature-place-of-worship-18{background-position:-348px -334px;width:18px;height:18px;}
-.feature-pitch-18{background-position:-372px 0px;width:18px;height:18px;}
-.feature-pharmacy-18{background-position:-372px -18px;width:18px;height:18px;}
-.feature-parking-garage-18{background-position:-372px -36px;width:18px;height:18px;}
-.feature-parking-18{background-position:-372px -54px;width:18px;height:18px;}
-.feature-park2-18{background-position:-372px -72px;width:18px;height:18px;}
-.feature-park-18{background-position:-372px -90px;width:18px;height:18px;}
-.feature-oil-well-18{background-position:-372px -108px;width:18px;height:18px;}
-.feature-museum-18{background-position:-372px -126px;width:18px;height:18px;}
-.feature-monument-18{background-position:-372px -144px;width:18px;height:18px;}
-.feature-minefield-18{background-position:-372px -162px;width:18px;height:18px;}
-.feature-marker-stroked-18{background-position:-372px -180px;width:18px;height:18px;}
-.feature-marker-18{background-position:-372px -198px;width:18px;height:18px;}
-.feature-london-underground-18{background-position:-372px -216px;width:18px;height:18px;}
-.feature-logging-18{background-position:-372px -234px;width:18px;height:18px;}
-.feature-lodging-18{background-position:-372px -252px;width:18px;height:18px;}
-.feature-library-18{background-position:-372px -270px;width:18px;height:18px;}
-.feature-industrial-18{background-position:-372px -288px;width:18px;height:18px;}
-.feature-hospital-18{background-position:-372px -306px;width:18px;height:18px;}
-.feature-heliport-18{background-position:-372px -324px;width:18px;height:18px;}
-.feature-harbor-18{background-position:0px -358px;width:18px;height:18px;}
-.feature-grocery-18{background-position:-18px -358px;width:18px;height:18px;}
-.feature-golf-18{background-position:-36px -358px;width:18px;height:18px;}
-.feature-garden-18{background-position:-54px -358px;width:18px;height:18px;}
-.feature-fuel-18{background-position:-72px -358px;width:18px;height:18px;}
-.feature-fire-station-18{background-position:-90px -358px;width:18px;height:18px;}
-.feature-ferry-18{background-position:-108px -358px;width:18px;height:18px;}
-.feature-fast-food-18{background-position:-126px -358px;width:18px;height:18px;}
-.feature-embassy-18{background-position:-144px -358px;width:18px;height:18px;}
-.feature-danger-18{background-position:-162px -358px;width:18px;height:18px;}
-.feature-dam-18{background-position:-180px -358px;width:18px;height:18px;}
-.feature-cross-18{background-position:-198px -358px;width:18px;height:18px;}
-.feature-cricket-18{background-position:-216px -358px;width:18px;height:18px;}
-.feature-commercial-18{background-position:-234px -358px;width:18px;height:18px;}
-.feature-college-18{background-position:-252px -358px;width:18px;height:18px;}
-.feature-circle-stroked-18{background-position:-270px -358px;width:18px;height:18px;}
-.feature-circle-18{background-position:-288px -358px;width:18px;height:18px;}
-.feature-cinema-18{background-position:-306px -358px;width:18px;height:18px;}
-.feature-cemetery-18{background-position:-324px -358px;width:18px;height:18px;}
-.feature-campsite-18{background-position:-342px -358px;width:18px;height:18px;}
-.feature-cafe-18{background-position:-360px -358px;width:18px;height:18px;}
-.feature-bus-18{background-position:-390px 0px;width:18px;height:18px;}
-.feature-bicycle-18{background-position:-390px -18px;width:18px;height:18px;}
-.feature-beer-18{background-position:-390px -36px;width:18px;height:18px;}
-.feature-basketball-18{background-position:-390px -54px;width:18px;height:18px;}
-.feature-baseball-18{background-position:-390px -72px;width:18px;height:18px;}
-.feature-bar-18{background-position:-390px -90px;width:18px;height:18px;}
-.feature-bank-18{background-position:-390px -108px;width:18px;height:18px;}
-.feature-art-gallery-18{background-position:-390px -126px;width:18px;height:18px;}
-.feature-america-football-18{background-position:-390px -144px;width:18px;height:18px;}
-.feature-alcohol-shop-18{background-position:-390px -162px;width:18px;height:18px;}
-.feature-airport-18{background-position:-390px -180px;width:18px;height:18px;}
-.feature-airfield-18{background-position:-390px -198px;width:18px;height:18px;}
-.feature-zoo-12{background-position:-390px -216px;width:12px;height:12px;}
-.feature-x-12{background-position:-390px -228px;width:12px;height:12px;}
-.feature-wetland-12{background-position:-390px -240px;width:12px;height:12px;}
-.feature-water-12{background-position:-390px -252px;width:12px;height:12px;}
-.feature-waste-basket-12{background-position:-390px -264px;width:12px;height:12px;}
-.feature-warehouse-12{background-position:-390px -276px;width:12px;height:12px;}
-.feature-triangle-stroked-12{background-position:-390px -288px;width:12px;height:12px;}
-.feature-triangle-12{background-position:-390px -300px;width:12px;height:12px;}
-.feature-town-hall-12{background-position:-390px -312px;width:12px;height:12px;}
-.feature-toilets-12{background-position:-390px -324px;width:12px;height:12px;}
-.feature-theatre-12{background-position:-390px -336px;width:12px;height:12px;}
-.feature-tennis-12{background-position:-390px -348px;width:12px;height:12px;}
-.feature-swimming-12{background-position:-390px -360px;width:12px;height:12px;}
-.feature-star-stroked-12{background-position:-372px -342px;width:12px;height:12px;}
-.feature-star-12{background-position:-250px -200px;width:12px;height:12px;}
-.feature-square-stroked-12{background-position:-262px -200px;width:12px;height:12px;}
-.feature-square-12{background-position:-274px -200px;width:12px;height:12px;}
-.feature-soccer-12{background-position:-286px -200px;width:12px;height:12px;}
-.feature-slaughterhouse-12{background-position:-200px -150px;width:12px;height:12px;}
-.feature-skiing-12{background-position:-212px -150px;width:12px;height:12px;}
-.feature-shop-12{background-position:-224px -150px;width:12px;height:12px;}
-.feature-school-12{background-position:-236px -150px;width:12px;height:12px;}
-.feature-roadblock-12{background-position:-150px -100px;width:12px;height:12px;}
-.feature-restaurant-12{background-position:-162px -100px;width:12px;height:12px;}
-.feature-religious-muslim-12{background-position:-174px -100px;width:12px;height:12px;}
-.feature-religious-jewish-12{background-position:-186px -100px;width:12px;height:12px;}
-.feature-religious-christian-12{background-position:-288px -262px;width:12px;height:12px;}
-.feature-rail-underground-12{background-position:-288px -274px;width:12px;height:12px;}
-.feature-rail-above-12{background-position:-312px -286px;width:12px;height:12px;}
-.feature-rail-12{background-position:-312px -298px;width:12px;height:12px;}
-.feature-prison-12{background-position:-336px -310px;width:12px;height:12px;}
-.feature-post-12{background-position:-336px -322px;width:12px;height:12px;}
-.feature-police-12{background-position:-378px -358px;width:12px;height:12px;}
-.feature-place-of-worship-12{background-position:0px -376px;width:12px;height:12px;}
-.feature-pitch-12{background-position:-12px -376px;width:12px;height:12px;}
-.feature-pharmacy-12{background-position:-24px -376px;width:12px;height:12px;}
-.feature-parking-garage-12{background-position:-36px -376px;width:12px;height:12px;}
-.feature-parking-12{background-position:-48px -376px;width:12px;height:12px;}
-.feature-park2-12{background-position:-60px -376px;width:12px;height:12px;}
-.feature-park-12{background-position:-72px -376px;width:12px;height:12px;}
-.feature-oil-well-12{background-position:-84px -376px;width:12px;height:12px;}
-.feature-museum-12{background-position:-96px -376px;width:12px;height:12px;}
-.feature-monument-12{background-position:-108px -376px;width:12px;height:12px;}
-.feature-minefield-12{background-position:-120px -376px;width:12px;height:12px;}
-.feature-marker-stroked-12{background-position:-132px -376px;width:12px;height:12px;}
-.feature-marker-12{background-position:-144px -376px;width:12px;height:12px;}
-.feature-london-underground-12{background-position:-156px -376px;width:12px;height:12px;}
-.feature-logging-12{background-position:-168px -376px;width:12px;height:12px;}
-.feature-lodging-12{background-position:-180px -376px;width:12px;height:12px;}
-.feature-library-12{background-position:-192px -376px;width:12px;height:12px;}
-.feature-industrial-12{background-position:-204px -376px;width:12px;height:12px;}
-.feature-hospital-12{background-position:-216px -376px;width:12px;height:12px;}
-.feature-heliport-12{background-position:-228px -376px;width:12px;height:12px;}
-.feature-harbor-12{background-position:-240px -376px;width:12px;height:12px;}
-.feature-grocery-12{background-position:-252px -376px;width:12px;height:12px;}
-.feature-golf-12{background-position:-264px -376px;width:12px;height:12px;}
-.feature-garden-12{background-position:-276px -376px;width:12px;height:12px;}
-.feature-fuel-12{background-position:-288px -376px;width:12px;height:12px;}
-.feature-fire-station-12{background-position:-300px -376px;width:12px;height:12px;}
-.feature-ferry-12{background-position:-312px -376px;width:12px;height:12px;}
-.feature-fast-food-12{background-position:-324px -376px;width:12px;height:12px;}
-.feature-embassy-12{background-position:-336px -376px;width:12px;height:12px;}
-.feature-danger-12{background-position:-348px -376px;width:12px;height:12px;}
-.feature-dam-12{background-position:-360px -376px;width:12px;height:12px;}
-.feature-cross-12{background-position:-372px -376px;width:12px;height:12px;}
-.feature-cricket-12{background-position:-384px -376px;width:12px;height:12px;}
-.feature-commercial-12{background-position:-396px -376px;width:12px;height:12px;}
-.feature-college-12{background-position:0px -388px;width:12px;height:12px;}
-.feature-circle-stroked-12{background-position:-12px -388px;width:12px;height:12px;}
-.feature-circle-12{background-position:-24px -388px;width:12px;height:12px;}
-.feature-cinema-12{background-position:-36px -388px;width:12px;height:12px;}
-.feature-cemetery-12{background-position:-48px -388px;width:12px;height:12px;}
-.feature-campsite-12{background-position:-60px -388px;width:12px;height:12px;}
-.feature-cafe-12{background-position:-72px -388px;width:12px;height:12px;}
-.feature-bus-12{background-position:-84px -388px;width:12px;height:12px;}
-.feature-bicycle-12{background-position:-96px -388px;width:12px;height:12px;}
-.feature-beer-12{background-position:-108px -388px;width:12px;height:12px;}
-.feature-basketball-12{background-position:-120px -388px;width:12px;height:12px;}
-.feature-baseball-12{background-position:-132px -388px;width:12px;height:12px;}
-.feature-bar-12{background-position:-144px -388px;width:12px;height:12px;}
-.feature-bank-12{background-position:-156px -388px;width:12px;height:12px;}
-.feature-art-gallery-12{background-position:-168px -388px;width:12px;height:12px;}
-.feature-america-football-12{background-position:-180px -388px;width:12px;height:12px;}
-.feature-alcohol-shop-12{background-position:-192px -388px;width:12px;height:12px;}
-.feature-airport-12{background-position:-204px -388px;width:12px;height:12px;}
-.feature-airfield-12{background-position:-216px -388px;width:12px;height:12px;}
+.feature-waterway-stream{background-position:0px 0px;width:60px;height:60px;}
+.feature-waterway-river{background-position:-60px 0px;width:60px;height:60px;}
+.feature-waterway-ditch{background-position:0px -60px;width:60px;height:60px;}
+.feature-waterway-canal{background-position:-60px -60px;width:60px;height:60px;}
+.feature-railway-rail{background-position:-120px 0px;width:60px;height:60px;}
+.feature-railway-monorail{background-position:-120px -60px;width:60px;height:60px;}
+.feature-railway-light_rail{background-position:0px -120px;width:60px;height:60px;}
+.feature-railway-disused{background-position:-60px -120px;width:60px;height:60px;}
+.feature-railway-abandoned{background-position:-120px -120px;width:60px;height:60px;}
+.feature-power-line{background-position:-180px 0px;width:60px;height:60px;}
+.feature-highway-unclassified{background-position:-180px -60px;width:60px;height:60px;}
+.feature-highway-trunk{background-position:-180px -120px;width:60px;height:60px;}
+.feature-highway-trunk-link{background-position:0px -180px;width:60px;height:60px;}
+.feature-highway-tertiary:link{background-position:-60px -180px;width:60px;height:60px;}
+.feature-highway-tertiary{background-position:-120px -180px;width:60px;height:60px;}
+.feature-highway-steps{background-position:-180px -180px;width:60px;height:60px;}
+.feature-highway-service{background-position:-240px 0px;width:60px;height:60px;}
+.feature-highway-secondary{background-position:-240px -60px;width:60px;height:60px;}
+.feature-highway-secondary-link{background-position:-240px -120px;width:60px;height:60px;}
+.feature-highway-road{background-position:-240px -180px;width:60px;height:60px;}
+.feature-highway-residential{background-position:0px -240px;width:60px;height:60px;}
+.feature-highway-primary{background-position:-60px -240px;width:60px;height:60px;}
+.feature-highway-primary-link{background-position:-120px -240px;width:60px;height:60px;}
+.feature-highway-path{background-position:-180px -240px;width:60px;height:60px;}
+.feature-highway-motorway{background-position:-240px -240px;width:60px;height:60px;}
+.feature-highway-motorway-link{background-position:-300px 0px;width:60px;height:60px;}
+.feature-highway-living_street{background-position:-300px -60px;width:60px;height:60px;}
+.feature-highway-footway{background-position:-300px -120px;width:60px;height:60px;}
+.feature-highway-cycleway{background-position:-300px -180px;width:60px;height:60px;}
+.feature-highway-bridleway{background-position:-300px -240px;width:60px;height:60px;}
+.feature-waterway-riverdsads{background-position:0px -300px;width:27px;height:22px;}
+.feature-waterway-riverdsads-8{background-position:-27px -300px;width:27px;height:22px;}
+.feature-zoo{background-position:0px -322px;width:24px;height:24px;}
+.feature-x{background-position:-24px -322px;width:24px;height:24px;}
+.feature-wetland{background-position:-48px -322px;width:24px;height:24px;}
+.feature-water{background-position:-72px -322px;width:24px;height:24px;}
+.feature-waste-basket{background-position:-96px -322px;width:24px;height:24px;}
+.feature-warehouse{background-position:-120px -322px;width:24px;height:24px;}
+.feature-triangle{background-position:-144px -322px;width:24px;height:24px;}
+.feature-triangle-stroked{background-position:-168px -322px;width:24px;height:24px;}
+.feature-town-hall{background-position:-192px -322px;width:24px;height:24px;}
+.feature-toilets{background-position:-216px -322px;width:24px;height:24px;}
+.feature-theatre{background-position:-240px -322px;width:24px;height:24px;}
+.feature-tennis{background-position:-264px -322px;width:24px;height:24px;}
+.feature-swimming{background-position:-288px -322px;width:24px;height:24px;}
+.feature-star{background-position:-312px -322px;width:24px;height:24px;}
+.feature-star-stroked{background-position:-336px -322px;width:24px;height:24px;}
+.feature-square{background-position:-360px 0px;width:24px;height:24px;}
+.feature-square-stroked{background-position:-360px -24px;width:24px;height:24px;}
+.feature-soccer{background-position:-360px -48px;width:24px;height:24px;}
+.feature-slaughterhouse{background-position:-360px -72px;width:24px;height:24px;}
+.feature-skiing{background-position:-360px -96px;width:24px;height:24px;}
+.feature-shop{background-position:-360px -120px;width:24px;height:24px;}
+.feature-school{background-position:-360px -144px;width:24px;height:24px;}
+.feature-roadblock{background-position:-360px -168px;width:24px;height:24px;}
+.feature-restaurant{background-position:-360px -192px;width:24px;height:24px;}
+.feature-religious-muslim{background-position:-360px -216px;width:24px;height:24px;}
+.feature-religious-jewish{background-position:-360px -240px;width:24px;height:24px;}
+.feature-religious-christian{background-position:-360px -264px;width:24px;height:24px;}
+.feature-rail{background-position:-360px -288px;width:24px;height:24px;}
+.feature-rail-underground{background-position:-360px -312px;width:24px;height:24px;}
+.feature-rail-above{background-position:0px -346px;width:24px;height:24px;}
+.feature-prison{background-position:-24px -346px;width:24px;height:24px;}
+.feature-post{background-position:-48px -346px;width:24px;height:24px;}
+.feature-police{background-position:-72px -346px;width:24px;height:24px;}
+.feature-place-of-worship{background-position:-96px -346px;width:24px;height:24px;}
+.feature-pitch{background-position:-120px -346px;width:24px;height:24px;}
+.feature-pharmacy{background-position:-144px -346px;width:24px;height:24px;}
+.feature-parking{background-position:-168px -346px;width:24px;height:24px;}
+.feature-parking-garage{background-position:-192px -346px;width:24px;height:24px;}
+.feature-park2{background-position:-216px -346px;width:24px;height:24px;}
+.feature-park{background-position:-240px -346px;width:24px;height:24px;}
+.feature-oil-well{background-position:-264px -346px;width:24px;height:24px;}
+.feature-museum{background-position:-288px -346px;width:24px;height:24px;}
+.feature-monument{background-position:-312px -346px;width:24px;height:24px;}
+.feature-minefield{background-position:-336px -346px;width:24px;height:24px;}
+.feature-marker{background-position:-360px -346px;width:24px;height:24px;}
+.feature-marker-stroked{background-position:-384px 0px;width:24px;height:24px;}
+.feature-london-underground{background-position:-384px -24px;width:24px;height:24px;}
+.feature-logging{background-position:-384px -48px;width:24px;height:24px;}
+.feature-lodging{background-position:-384px -72px;width:24px;height:24px;}
+.feature-library{background-position:-384px -96px;width:24px;height:24px;}
+.feature-industrial{background-position:-384px -120px;width:24px;height:24px;}
+.feature-hospital{background-position:-384px -144px;width:24px;height:24px;}
+.feature-heliport{background-position:-384px -168px;width:24px;height:24px;}
+.feature-harbor{background-position:-384px -192px;width:24px;height:24px;}
+.feature-grocery{background-position:-384px -216px;width:24px;height:24px;}
+.feature-golf{background-position:-384px -240px;width:24px;height:24px;}
+.feature-garden{background-position:-384px -264px;width:24px;height:24px;}
+.feature-fuel{background-position:-384px -288px;width:24px;height:24px;}
+.feature-fire-station{background-position:-384px -312px;width:24px;height:24px;}
+.feature-ferry{background-position:-384px -336px;width:24px;height:24px;}
+.feature-fast-food{background-position:0px -370px;width:24px;height:24px;}
+.feature-embassy{background-position:-24px -370px;width:24px;height:24px;}
+.feature-danger{background-position:-48px -370px;width:24px;height:24px;}
+.feature-dam{background-position:-72px -370px;width:24px;height:24px;}
+.feature-cross{background-position:-96px -370px;width:24px;height:24px;}
+.feature-cricket{background-position:-120px -370px;width:24px;height:24px;}
+.feature-commercial{background-position:-144px -370px;width:24px;height:24px;}
+.feature-college{background-position:-168px -370px;width:24px;height:24px;}
+.feature-circle{background-position:-192px -370px;width:24px;height:24px;}
+.feature-circle-stroked{background-position:-216px -370px;width:24px;height:24px;}
+.feature-cinema{background-position:-240px -370px;width:24px;height:24px;}
+.feature-cemetery{background-position:-264px -370px;width:24px;height:24px;}
+.feature-campsite{background-position:-288px -370px;width:24px;height:24px;}
+.feature-cafe{background-position:-312px -370px;width:24px;height:24px;}
+.feature-bus{background-position:-336px -370px;width:24px;height:24px;}
+.feature-bicycle{background-position:-360px -370px;width:24px;height:24px;}
+.feature-beer{background-position:-384px -370px;width:24px;height:24px;}
+.feature-basketball{background-position:-408px 0px;width:24px;height:24px;}
+.feature-baseball{background-position:-408px -24px;width:24px;height:24px;}
+.feature-bar{background-position:-408px -48px;width:24px;height:24px;}
+.feature-bank{background-position:-408px -72px;width:24px;height:24px;}
+.feature-art-gallery{background-position:-408px -96px;width:24px;height:24px;}
+.feature-america-football{background-position:-408px -120px;width:24px;height:24px;}
+.feature-alcohol-shop{background-position:-408px -144px;width:24px;height:24px;}
+.feature-airport{background-position:-408px -168px;width:24px;height:24px;}
+.feature-airfield{background-position:-408px -192px;width:24px;height:24px;}
+.feature-zoo-18{background-position:-408px -216px;width:18px;height:18px;}
+.feature-x-18{background-position:-408px -234px;width:18px;height:18px;}
+.feature-wetland-18{background-position:-408px -252px;width:18px;height:18px;}
+.feature-water-18{background-position:-408px -270px;width:18px;height:18px;}
+.feature-waste-basket-18{background-position:-408px -288px;width:18px;height:18px;}
+.feature-warehouse-18{background-position:-408px -306px;width:18px;height:18px;}
+.feature-triangle-stroked-18{background-position:-408px -324px;width:18px;height:18px;}
+.feature-triangle-18{background-position:-408px -342px;width:18px;height:18px;}
+.feature-town-hall-18{background-position:-408px -360px;width:18px;height:18px;}
+.feature-toilets-18{background-position:-54px -300px;width:18px;height:18px;}
+.feature-theatre-18{background-position:-72px -300px;width:18px;height:18px;}
+.feature-tennis-18{background-position:-90px -300px;width:18px;height:18px;}
+.feature-swimming-18{background-position:-108px -300px;width:18px;height:18px;}
+.feature-star-stroked-18{background-position:-126px -300px;width:18px;height:18px;}
+.feature-star-18{background-position:-144px -300px;width:18px;height:18px;}
+.feature-square-stroked-18{background-position:-162px -300px;width:18px;height:18px;}
+.feature-square-18{background-position:-180px -300px;width:18px;height:18px;}
+.feature-soccer-18{background-position:-198px -300px;width:18px;height:18px;}
+.feature-slaughterhouse-18{background-position:-216px -300px;width:18px;height:18px;}
+.feature-skiing-18{background-position:-234px -300px;width:18px;height:18px;}
+.feature-shop-18{background-position:-252px -300px;width:18px;height:18px;}
+.feature-school-18{background-position:-270px -300px;width:18px;height:18px;}
+.feature-roadblock-18{background-position:-288px -300px;width:18px;height:18px;}
+.feature-restaurant-18{background-position:-306px -300px;width:18px;height:18px;}
+.feature-religious-muslim-18{background-position:-324px -300px;width:18px;height:18px;}
+.feature-religious-jewish-18{background-position:-342px -300px;width:18px;height:18px;}
+.feature-religious-christian-18{background-position:0px -394px;width:18px;height:18px;}
+.feature-rail-underground-18{background-position:-18px -394px;width:18px;height:18px;}
+.feature-rail-above-18{background-position:-36px -394px;width:18px;height:18px;}
+.feature-rail-18{background-position:-54px -394px;width:18px;height:18px;}
+.feature-prison-18{background-position:-72px -394px;width:18px;height:18px;}
+.feature-post-18{background-position:-90px -394px;width:18px;height:18px;}
+.feature-police-18{background-position:-108px -394px;width:18px;height:18px;}
+.feature-place-of-worship-18{background-position:-126px -394px;width:18px;height:18px;}
+.feature-pitch-18{background-position:-144px -394px;width:18px;height:18px;}
+.feature-pharmacy-18{background-position:-162px -394px;width:18px;height:18px;}
+.feature-parking-garage-18{background-position:-180px -394px;width:18px;height:18px;}
+.feature-parking-18{background-position:-198px -394px;width:18px;height:18px;}
+.feature-park2-18{background-position:-216px -394px;width:18px;height:18px;}
+.feature-park-18{background-position:-234px -394px;width:18px;height:18px;}
+.feature-oil-well-18{background-position:-252px -394px;width:18px;height:18px;}
+.feature-museum-18{background-position:-270px -394px;width:18px;height:18px;}
+.feature-monument-18{background-position:-288px -394px;width:18px;height:18px;}
+.feature-minefield-18{background-position:-306px -394px;width:18px;height:18px;}
+.feature-marker-stroked-18{background-position:-324px -394px;width:18px;height:18px;}
+.feature-marker-18{background-position:-342px -394px;width:18px;height:18px;}
+.feature-london-underground-18{background-position:-360px -394px;width:18px;height:18px;}
+.feature-logging-18{background-position:-378px -394px;width:18px;height:18px;}
+.feature-lodging-18{background-position:-396px -394px;width:18px;height:18px;}
+.feature-library-18{background-position:-414px -394px;width:18px;height:18px;}
+.feature-industrial-18{background-position:0px -412px;width:18px;height:18px;}
+.feature-hospital-18{background-position:-18px -412px;width:18px;height:18px;}
+.feature-heliport-18{background-position:-36px -412px;width:18px;height:18px;}
+.feature-harbor-18{background-position:-54px -412px;width:18px;height:18px;}
+.feature-grocery-18{background-position:-72px -412px;width:18px;height:18px;}
+.feature-golf-18{background-position:-90px -412px;width:18px;height:18px;}
+.feature-garden-18{background-position:-108px -412px;width:18px;height:18px;}
+.feature-fuel-18{background-position:-126px -412px;width:18px;height:18px;}
+.feature-fire-station-18{background-position:-144px -412px;width:18px;height:18px;}
+.feature-ferry-18{background-position:-162px -412px;width:18px;height:18px;}
+.feature-fast-food-18{background-position:-180px -412px;width:18px;height:18px;}
+.feature-embassy-18{background-position:-198px -412px;width:18px;height:18px;}
+.feature-danger-18{background-position:-216px -412px;width:18px;height:18px;}
+.feature-dam-18{background-position:-234px -412px;width:18px;height:18px;}
+.feature-cross-18{background-position:-252px -412px;width:18px;height:18px;}
+.feature-cricket-18{background-position:-270px -412px;width:18px;height:18px;}
+.feature-commercial-18{background-position:-288px -412px;width:18px;height:18px;}
+.feature-college-18{background-position:-306px -412px;width:18px;height:18px;}
+.feature-circle-stroked-18{background-position:-324px -412px;width:18px;height:18px;}
+.feature-circle-18{background-position:-342px -412px;width:18px;height:18px;}
+.feature-cinema-18{background-position:-360px -412px;width:18px;height:18px;}
+.feature-cemetery-18{background-position:-378px -412px;width:18px;height:18px;}
+.feature-campsite-18{background-position:-396px -412px;width:18px;height:18px;}
+.feature-cafe-18{background-position:-414px -412px;width:18px;height:18px;}
+.feature-bus-18{background-position:-432px 0px;width:18px;height:18px;}
+.feature-bicycle-18{background-position:-432px -18px;width:18px;height:18px;}
+.feature-beer-18{background-position:-432px -36px;width:18px;height:18px;}
+.feature-basketball-18{background-position:-432px -54px;width:18px;height:18px;}
+.feature-baseball-18{background-position:-432px -72px;width:18px;height:18px;}
+.feature-bar-18{background-position:-432px -90px;width:18px;height:18px;}
+.feature-bank-18{background-position:-432px -108px;width:18px;height:18px;}
+.feature-art-gallery-18{background-position:-432px -126px;width:18px;height:18px;}
+.feature-america-football-18{background-position:-432px -144px;width:18px;height:18px;}
+.feature-alcohol-shop-18{background-position:-432px -162px;width:18px;height:18px;}
+.feature-airport-18{background-position:-432px -180px;width:18px;height:18px;}
+.feature-airfield-18{background-position:-432px -198px;width:18px;height:18px;}
+.feature-zoo-12{background-position:-432px -216px;width:12px;height:12px;}
+.feature-x-12{background-position:-432px -228px;width:12px;height:12px;}
+.feature-wetland-12{background-position:-432px -240px;width:12px;height:12px;}
+.feature-water-12{background-position:-432px -252px;width:12px;height:12px;}
+.feature-waste-basket-12{background-position:-432px -264px;width:12px;height:12px;}
+.feature-warehouse-12{background-position:-432px -276px;width:12px;height:12px;}
+.feature-triangle-stroked-12{background-position:-432px -288px;width:12px;height:12px;}
+.feature-triangle-12{background-position:-432px -300px;width:12px;height:12px;}
+.feature-town-hall-12{background-position:-432px -312px;width:12px;height:12px;}
+.feature-toilets-12{background-position:-432px -324px;width:12px;height:12px;}
+.feature-theatre-12{background-position:-432px -336px;width:12px;height:12px;}
+.feature-tennis-12{background-position:-432px -348px;width:12px;height:12px;}
+.feature-swimming-12{background-position:-432px -360px;width:12px;height:12px;}
+.feature-star-stroked-12{background-position:-432px -372px;width:12px;height:12px;}
+.feature-star-12{background-position:-432px -384px;width:12px;height:12px;}
+.feature-square-stroked-12{background-position:-432px -396px;width:12px;height:12px;}
+.feature-square-12{background-position:-432px -408px;width:12px;height:12px;}
+.feature-soccer-12{background-position:-408px -378px;width:12px;height:12px;}
+.feature-slaughterhouse-12{background-position:-420px -378px;width:12px;height:12px;}
+.feature-skiing-12{background-position:0px -430px;width:12px;height:12px;}
+.feature-shop-12{background-position:-12px -430px;width:12px;height:12px;}
+.feature-school-12{background-position:-24px -430px;width:12px;height:12px;}
+.feature-roadblock-12{background-position:-36px -430px;width:12px;height:12px;}
+.feature-restaurant-12{background-position:-48px -430px;width:12px;height:12px;}
+.feature-religious-muslim-12{background-position:-60px -430px;width:12px;height:12px;}
+.feature-religious-jewish-12{background-position:-72px -430px;width:12px;height:12px;}
+.feature-religious-christian-12{background-position:-84px -430px;width:12px;height:12px;}
+.feature-rail-underground-12{background-position:-96px -430px;width:12px;height:12px;}
+.feature-rail-above-12{background-position:-108px -430px;width:12px;height:12px;}
+.feature-rail-12{background-position:-120px -430px;width:12px;height:12px;}
+.feature-prison-12{background-position:-132px -430px;width:12px;height:12px;}
+.feature-post-12{background-position:-144px -430px;width:12px;height:12px;}
+.feature-police-12{background-position:-156px -430px;width:12px;height:12px;}
+.feature-place-of-worship-12{background-position:-168px -430px;width:12px;height:12px;}
+.feature-pitch-12{background-position:-180px -430px;width:12px;height:12px;}
+.feature-pharmacy-12{background-position:-192px -430px;width:12px;height:12px;}
+.feature-parking-garage-12{background-position:-204px -430px;width:12px;height:12px;}
+.feature-parking-12{background-position:-216px -430px;width:12px;height:12px;}
+.feature-park2-12{background-position:-228px -430px;width:12px;height:12px;}
+.feature-park-12{background-position:-240px -430px;width:12px;height:12px;}
+.feature-oil-well-12{background-position:-252px -430px;width:12px;height:12px;}
+.feature-museum-12{background-position:-264px -430px;width:12px;height:12px;}
+.feature-monument-12{background-position:-276px -430px;width:12px;height:12px;}
+.feature-minefield-12{background-position:-288px -430px;width:12px;height:12px;}
+.feature-marker-stroked-12{background-position:-300px -430px;width:12px;height:12px;}
+.feature-marker-12{background-position:-312px -430px;width:12px;height:12px;}
+.feature-london-underground-12{background-position:-324px -430px;width:12px;height:12px;}
+.feature-logging-12{background-position:-336px -430px;width:12px;height:12px;}
+.feature-lodging-12{background-position:-348px -430px;width:12px;height:12px;}
+.feature-library-12{background-position:-360px -430px;width:12px;height:12px;}
+.feature-industrial-12{background-position:-372px -430px;width:12px;height:12px;}
+.feature-hospital-12{background-position:-384px -430px;width:12px;height:12px;}
+.feature-heliport-12{background-position:-396px -430px;width:12px;height:12px;}
+.feature-harbor-12{background-position:-408px -430px;width:12px;height:12px;}
+.feature-grocery-12{background-position:-420px -430px;width:12px;height:12px;}
+.feature-golf-12{background-position:-432px -430px;width:12px;height:12px;}
+.feature-garden-12{background-position:-450px 0px;width:12px;height:12px;}
+.feature-fuel-12{background-position:-450px -12px;width:12px;height:12px;}
+.feature-fire-station-12{background-position:-450px -24px;width:12px;height:12px;}
+.feature-ferry-12{background-position:-450px -36px;width:12px;height:12px;}
+.feature-fast-food-12{background-position:-450px -48px;width:12px;height:12px;}
+.feature-embassy-12{background-position:-450px -60px;width:12px;height:12px;}
+.feature-danger-12{background-position:-450px -72px;width:12px;height:12px;}
+.feature-dam-12{background-position:-450px -84px;width:12px;height:12px;}
+.feature-cross-12{background-position:-450px -96px;width:12px;height:12px;}
+.feature-cricket-12{background-position:-450px -108px;width:12px;height:12px;}
+.feature-commercial-12{background-position:-450px -120px;width:12px;height:12px;}
+.feature-college-12{background-position:-450px -132px;width:12px;height:12px;}
+.feature-circle-stroked-12{background-position:-450px -144px;width:12px;height:12px;}
+.feature-circle-12{background-position:-450px -156px;width:12px;height:12px;}
+.feature-cinema-12{background-position:-450px -168px;width:12px;height:12px;}
+.feature-cemetery-12{background-position:-450px -180px;width:12px;height:12px;}
+.feature-campsite-12{background-position:-450px -192px;width:12px;height:12px;}
+.feature-cafe-12{background-position:-450px -204px;width:12px;height:12px;}
+.feature-bus-12{background-position:-450px -216px;width:12px;height:12px;}
+.feature-bicycle-12{background-position:-450px -228px;width:12px;height:12px;}
+.feature-beer-12{background-position:-450px -240px;width:12px;height:12px;}
+.feature-basketball-12{background-position:-450px -252px;width:12px;height:12px;}
+.feature-baseball-12{background-position:-450px -264px;width:12px;height:12px;}
+.feature-bar-12{background-position:-450px -276px;width:12px;height:12px;}
+.feature-bank-12{background-position:-450px -288px;width:12px;height:12px;}
+.feature-art-gallery-12{background-position:-450px -300px;width:12px;height:12px;}
+.feature-america-football-12{background-position:-450px -312px;width:12px;height:12px;}
+.feature-alcohol-shop-12{background-position:-450px -324px;width:12px;height:12px;}
+.feature-airport-12{background-position:-450px -336px;width:12px;height:12px;}
+.feature-airfield-12{background-position:-450px -348px;width:12px;height:12px;}
diff --git a/css/map.css b/css/map.css
index a5823d071..f144d71fa 100644
--- a/css/map.css
+++ b/css/map.css
@@ -798,28 +798,28 @@ text.point {
     cursor: url(../img/cursor-grabbing.png) 9 9, auto;
 }
 
-.mode-browse .point,
-.mode-select .point {
+.mode-browse #surface .point,
+.mode-select #surface .point {
     cursor: url(../img/cursor-select-point.png), pointer;
 }
 
-.mode-select .vertex,
-.mode-browse .vertex {
+.mode-select #surface .vertex,
+.mode-browse #surface .vertex {
     cursor: url(../img/cursor-select-vertex.png), pointer;
 }
 
-.mode-browse .line,
-.mode-select .line {
+.mode-browse #surface .line,
+.mode-select #surface .line {
     cursor: url(../img/cursor-select-line.png), pointer;
 }
 
-.mode-select .area,
-.mode-browse .area {
+.mode-select #surface .area,
+.mode-browse #surface .area {
     cursor: url(../img/cursor-select-area.png), pointer;
 }
 
-.mode-select .midpoint,
-.mode-browse .midpoint {
+.mode-select #surface .midpoint,
+.mode-browse #surface .midpoint {
     cursor: url(../img/cursor-select-split.png), pointer;
 }
 
diff --git a/img/feature-icons.png b/img/feature-icons.png
index 436348dbc..663180538 100644
Binary files a/img/feature-icons.png and b/img/feature-icons.png differ