Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10012)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10013)
@@ -15,4 +15,7 @@
 canvas {
     default-points: false;
+}
+node {
+    text: auto;
 }
 
@@ -154,5 +157,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -194,5 +196,4 @@
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[traffic_sign][bicycle?!] {
@@ -203,5 +204,4 @@
     icon-image: "vehicle/restriction/bicycle-designated.png";
     set icon_z17;
-    text: auto;
 }
 node[traffic_sign][foot?!] {
@@ -212,5 +212,4 @@
     icon-image: "vehicle/restriction/foot-designated.png";
     set icon_z17;
-    text: auto;
 }
 node[traffic_sign][goods?!],
@@ -282,5 +281,4 @@
     icon-image: "misc/housenumber.png";
     set icon_z17;
-    text: auto;
 }
 way["addr:interpolation"=odd] {
@@ -309,19 +307,16 @@
     icon-image: "misc/landmark/building.png";
     set icon_z17;
-    text: auto;
 }
 node[building=garage] {
     icon-image: "misc/landuse/garages.png";
     set icon_z17;
-    text: auto;
 }
 node[building=garages] {
     icon-image: "misc/landuse/garages.png";
     set icon_z17;
-    text: auto;
 }
 node[building=transformer_tower] {
     icon-image: "power/transformer_tower.svg";
-    text: auto;
+    set icon_z17;
 }
 node[entrance=yes],
@@ -329,25 +324,20 @@
     icon-image: "misc/entrance-yes.png";
     set icon_z17;
-    text: auto;
 }
 node[entrance=main] {
     icon-image: "misc/entrance-main.png";
     set icon_z17;
-    text: auto;
 }
 node[entrance=service] {
     icon-image: "misc/entrance-service.png";
     set icon_z17;
-    text: auto;
 }
 node[entrance=exit] {
     icon-image: "misc/entrance-exit.png";
     set icon_z17;
-    text: auto;
 }
 node[entrance=emergency] {
     icon-image: "misc/entrance-emergency.png";
     set icon_z17;
-    text: auto;
 }
 node[building=entrance],
@@ -355,5 +345,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -370,10 +359,8 @@
     icon-image: "presets/bollard.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=gate] {
     icon-image: "vehicle/gate.png";
     set icon_z17;
-    text: auto;
 }
 way[barrier=yes],
@@ -405,45 +392,36 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=kerb] {
     icon-image: "vehicle/kerb.svg";
     set icon_z17;
-    text: auto;
 }
 node[barrier=block] {
     icon-image: "vehicle/block.svg";
     set icon_z17;
-    text: auto;
 }
 node[barrier=chain] {
     icon-image: "vehicle/chain.svg";
     set icon_z17;
-    text: auto;
 }
 node[barrier=stile] {
     icon-image: "vehicle/stile.svg";
     set icon_z17;
-    text: auto;
 }
 node[barrier=turnstile] {
     icon-image: "vehicle/turnstile.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=cycle_barrier] {
     icon-image: "vehicle/cycle_barrier.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=lift_gate] {
     icon-image: "vehicle/lift_gate.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=swing_gate] {
     icon-image: "vehicle/swing_gate.png";
     set icon_z17;
-    text: auto;
 }
 area[barrier=toll_booth]:closed {
@@ -453,30 +431,24 @@
     icon-image: "vehicle/toll_booth.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=entrance] {
     icon-image: "vehicle/entrance.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=cattle_grid] {
     icon-image: "vehicle/cattle_grid.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=border_control] {
     icon-image: "vehicle/border_control.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=sally_port] {
     icon-image: "vehicle/sally_port.png";
     set icon_z17;
-    text: auto;
 }
 node[barrier=spikes] {
     icon-image: "vehicle/spikes.svg";
     set icon_z17;
-    text: auto;
 }
 node[barrier=fence][!is_prop_set(icon-image)],
@@ -490,5 +462,4 @@
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -671,25 +642,20 @@
     icon-image: "vehicle/junction.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=traffic_mirror] {
     icon-image: "vehicle/traffic_mirror.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=milestone] {
     icon-image: "vehicle/milestone.svg";
     set icon_z17;
-    text: auto;
 }
 node[direction=clockwise] {
     icon-image: "vehicle/restriction/roundabout_left.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=mini_roundabout] {
     icon-image: "vehicle/restriction/mini_roundabout_left.svg";
     set icon_z17;
-    text: auto;
 }
 node:righthandtraffic[highway=mini_roundabout] {
@@ -700,90 +666,72 @@
     icon-image: "vehicle/restriction/stop.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=give_way] {
     icon-image: "vehicle/restriction/give_way.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=traffic_signals] {
     icon-image: "vehicle/traffic_signals.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=traffic_signals][crossing][crossing!=no] {
     icon-image: "vehicle/traffic_signals_crossing.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=traffic_signals][crossing_ref=zebra] {
     icon-image: "vehicle/traffic_signals_crossing_ref_zebra.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=traffic_signals][crossing=island] {
     icon-image: "vehicle/traffic_signals_crossing_island.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=traffic_signals][crossing=traffic_signals] {
     icon-image: "vehicle/traffic_signals_crossing_traffic_signals.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=street_lamp] {
     icon-image: "misc/streetlamp.png";
     set icon_z17;
-    text: auto;
 }
 node[highway=speed_camera] {
     icon-image: "vehicle/restriction/speed_camera.svg";
     set icon_z17;
-    text: auto;
 }
 relation[type=enforcement] >[role="device"] node {
     icon-image: "vehicle/restriction/speed_camera.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_sign=city_limit] {
     icon-image: "vehicle/restriction/city_limit.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=crossing] {
     icon-image: "vehicle/crossing.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=crossing][crossing=unmarked] {
     icon-image: "vehicle/crossing_unmarked.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=crossing][crossing=island] {
     icon-image: "vehicle/crossing_island.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=crossing][crossing_ref=zebra] {
     icon-image: "vehicle/crossing_ref_zebra.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=crossing][crossing=traffic_signals] {
     icon-image: "vehicle/crossing_traffic_signals.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=incline], node[highway=incline_steep] {
     icon-image: "vehicle/restriction/incline.png";
     set icon_z17;
-    text: auto;
 }
 node[highway=motorway_junction] {
     icon-image: "vehicle/motorway_junction.svg";
     set icon_z17;
-    text: auto;
 }
 area[highway=services] {
@@ -793,5 +741,4 @@
     icon-image: "vehicle/services.svg";
     set icon_z17;
-    text: auto;
 }
 area[highway=rest_area] {
@@ -801,10 +748,8 @@
     icon-image: "vehicle/rest_area.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=ford], node[ford?] {
     icon-image: "misc/ford.svg";
     set icon_z17;
-    text: auto;
 }
 way[ford?]::core_ford {
@@ -824,15 +769,12 @@
     icon-image: "vehicle/turning_circle.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=turning_loop] {
     icon-image: "vehicle/turning_loop.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=passing_place] {
     icon-image: "vehicle/passing_place.svg";
     set icon_z17;
-    text: auto;
 }
 area[highway=elevator] {
@@ -842,5 +784,4 @@
     icon-image: "service/elevator.svg";
     set icon_z17;
-    text: auto;
 }
 way[highway=construction] {
@@ -852,5 +793,4 @@
     icon-image: "misc/construction.png";
     set icon_z17;
-    text: auto;
 }
 area[highway=emergency_access_point] {
@@ -860,5 +800,4 @@
     icon-image: "service/emergency_access_point.svg";
     set icon_z17;
-    text: auto;
 }
 node[highway=motorway], node[highway=motorway_link],
@@ -883,5 +822,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -893,45 +831,36 @@
     icon-image: "vehicle/traffic_calming.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=chicane] {
     icon-image: "vehicle/chicane.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=choker] {
     icon-image: "vehicle/choker.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=island] {
     icon-image: "vehicle/island.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=bump] {
     icon-image: "vehicle/bump.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=hump] {
     icon-image: "vehicle/hump.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=table] {
     icon-image: "vehicle/table.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=cushion] {
     icon-image: "vehicle/cushion.svg";
     set icon_z17;
-    text: auto;
 }
 node[traffic_calming=rumble_strip] {
     icon-image: "vehicle/rumble_strip.svg";
     set icon_z17;
-    text: auto;
 }
 /****************/
@@ -942,5 +871,4 @@
     icon-image: "vehicle/restriction/roundabout_left.svg";
     set icon_z17;
-    text: auto;
 }
 node:righthandtraffic[junction=roundabout] {
@@ -1105,5 +1033,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -1209,25 +1136,20 @@
     icon-image: "power/portal.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=tower] {
     icon-image: "power/tower.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=pole] {
     icon-image: "power/pole.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=pole][transformer=distribution] {
     icon-image: "power/pole_transformer.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=insulator] {
     icon-image: "power/insulator.svg";
     set icon_z17;
-    text: auto;
 }
 way[power=portal],
@@ -1249,5 +1171,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 area[power=plant],
@@ -1261,20 +1182,16 @@
     icon-image: "power/cable_distribution_cabinet.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=generator] {
     icon-image: "power/generator.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=substation] {
     icon-image: "power/substation.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=transformer] {
     icon-image: "power/transformer.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -1282,20 +1199,16 @@
     icon-image: "power/switchgear.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=switch] {
     icon-image: "power/switch.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=converter] {
     icon-image: "power/converter.svg";
     set icon_z17;
-    text: auto;
 }
 node[power=compensator] {
     icon-image: "power/compensator.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -1327,10 +1240,8 @@
     icon-image: "presets/power_source-nuclear.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=wind] {
     icon-image: "presets/power_source-wind.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=hydro],
@@ -1340,25 +1251,20 @@
     icon-image: "presets/power_source-water.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=geothermal] {
     icon-image: "presets/power_source-geothermal.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=solar] {
     icon-image: "presets/power_source-sun.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=coal] {
     icon-image: "presets/power_source-coal.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=gas] {
     icon-image: "presets/power_source-gas.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=biomass],
@@ -1367,5 +1273,4 @@
     icon-image: "presets/power_source-biofuel.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=oil],
@@ -1374,15 +1279,12 @@
     icon-image: "presets/power_source-oil.svg";
     set icon_z17;
-    text: auto;
 }
 node[generator:source=waste] {
     icon-image: "presets/power_source-waste.svg";
     set icon_z17;
-    text: auto;
 }
 node[power_source] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 /*****************/
@@ -1406,25 +1308,20 @@
     icon-image: "misc/landmark/beacon.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=bridge] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[bridge:support] {
     icon-image: "transport/bridge/bridge_support.svg";
     set icon_z17;
-    text: auto;
 }
 node[man_made=chimney] {
     icon-image: "misc/landmark/chimney.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=flagpole] {
     icon-image: "misc/flag.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=gasometer] {
@@ -1432,5 +1329,4 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[man_made=silo] {
@@ -1438,5 +1334,4 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[man_made=storage_tank] {
@@ -1444,10 +1339,8 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[man_made=bunker_silo] {
     icon-image: "bunker_silo.svg";
     set icon_z17;
-    text: auto;
 }
 area[man_made=groyne]:closed {
@@ -1468,15 +1361,12 @@
     icon-image: "misc/landmark/lighthouse.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=monitoring_station] {
     icon-image: "misc/landmark/measurement_station.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=mineshaft] {
     icon-image: "misc/landmark/mine.png";
     set icon_z17;
-    text: auto;
 }
 area[man_made=crane]:closed {
@@ -1490,10 +1380,8 @@
     icon-image: "misc/landmark/crane.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=adit] {
     icon-image: "misc/landmark/adit.png";
     set icon_z17;
-    text: auto;
 }
 area[man_made=pier]:closed {
@@ -1507,5 +1395,4 @@
     icon-image: "nautical/pier.svg";
     set icon_z17;
-    text: auto;
 }
 way[embankment?][!highway][!railway][!waterway],
@@ -1531,10 +1418,8 @@
     icon-image: "misc/pipeline_marker.svg";
     set icon_z17;
-    text: auto;
 }
 node[pipeline=valve] {
     icon-image: "misc/valve.svg";
     set icon_z17;
-    text: auto;
 }
 node[man_made=breakwater],
@@ -1544,10 +1429,8 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=petroleum_well][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 area[man_made=reservoir_covered],
@@ -1566,5 +1449,4 @@
     icon-image: "misc/landmark/reservoir_covered.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=surveillance] {
@@ -1572,50 +1454,40 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[man_made=survey_point] {
     icon-image: "misc/landmark/survey_point.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=tower] {
     icon-image: "misc/landmark/tower.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=wastewater_plant] {
     icon-image: "misc/landmark/wastewater_plant.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=watermill] {
     icon-image: "misc/landmark/watermill.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=water_tower] {
     icon-image: "misc/landmark/water_tower.svg";
     set icon_z17;
-    text: auto;
 }
 node[man_made=water_well] {
     icon-image: "misc/landmark/water_well.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=windmill] {
     icon-image: "misc/landmark/windmill.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=works] {
     icon-image: "misc/landmark/works.png";
     set icon_z17;
-    text: auto;
 }
 node[man_made=water_works] {
     icon-image: "misc/landmark/water_works.png";
     set icon_z17;
-    text: auto;
 }
 way[man_made=cutline] {
@@ -1626,5 +1498,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -1660,110 +1531,88 @@
     icon-image: "styles/standard/office/accountant.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=administrative] {
     icon-image: "styles/standard/office/administrative.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=advertising_agency] {
     icon-image: "styles/standard/office/advertising_agency.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=architect] {
     icon-image: "styles/standard/office/architect.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=association] {
     icon-image: "styles/standard/office/association.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=company] {
     icon-image: "styles/standard/office/private_company.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=educational_institution] {
     icon-image: "styles/standard/office/educational_institution.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=employment_agency] {
     icon-image: "styles/standard/office/employment_agency.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=estate_agent] {
     icon-image: "styles/standard/office/real_state.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=foundation] {
     icon-image: "styles/standard/office/foundation.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=insurance] {
     icon-image: "styles/standard/office/insurance.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=it] {
     icon-image: "styles/standard/office/it.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=lawyer] {
     icon-image: "styles/standard/office/lawyer.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=newspaper] {
     icon-image: "styles/standard/office/newspaper.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=ngo] {
     icon-image: "styles/standard/office/ong.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=notary] {
     icon-image: "styles/standard/office/notary.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=political_party] {
     icon-image: "styles/standard/office/political_party.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=religion] {
     icon-image: "styles/standard/office/religion.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=research] {
     icon-image: "styles/standard/office/research.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=tax_advisor] {
     icon-image: "styles/standard/office/tax_advisor.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=telecommunication] {
     icon-image: "styles/standard/office/telecommunication.svg";
     set icon_z17;
-    text: auto;
 }
 node[office=government] {
     icon-image: "styles/standard/office/government.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -1781,10 +1630,8 @@
     icon-image: "sport/centre.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=stadium] {
     icon-image: "sport/stadium.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=horse_riding] {
@@ -1792,10 +1639,8 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[leisure=water_park] {
     icon-image: "leisure/water_park.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=track][!area?!]:closed {
@@ -1809,5 +1654,4 @@
     icon-image: "sport/track.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=pitch] {
@@ -1817,5 +1661,4 @@
     icon-image: "sport/pitch.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=marina] {
@@ -1825,5 +1668,4 @@
     icon-image: "nautical/marina.png";
     set icon_z17;
-    text: auto;
 }
 way[leisure=slipway] {
@@ -1834,5 +1676,4 @@
     icon-image: "nautical/slipway.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=fishing],
@@ -1849,45 +1690,36 @@
     icon-image: "sport/fishing.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=bird_hide] {
     icon-image: "leisure/bird_hide.svg";
     set icon_z17;
-    text: auto;
 }
 node[leisure=nature_reserve] {
     icon-image: "leisure/nature_reserve.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=park] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=playground] {
     icon-image: "leisure/playground.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=garden] {
     icon-image: "leisure/garden.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=common] {
     icon-image: "leisure/common.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=firepit] { 
     icon-image: "leisure/firepit.svg"; 
-    set icon_z17; 
-    text: auto; 
+    set icon_z17;
 }
 node[leisure=picnic_table] {
     icon-image: "leisure/picnic.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=swimming_pool] {
@@ -1897,5 +1729,4 @@
     icon-image: "sport/pool.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=fitness_station],
@@ -1909,10 +1740,8 @@
     icon-image: "leisure/fitness_station.svg";
     set icon_z17;
-    text: auto;
 }
 node[leisure=miniature_golf] {
     icon-image: "sport/miniature_golf.svg";
     set icon_z17;
-    text: auto;
 }
 node[leisure=dog_park] {
@@ -1920,15 +1749,12 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[leisure=ice_rink] {
     icon-image: "sport/ice_hockey.png";
     set icon_z17;
-    text: auto;
 }
 node[leisure=sauna] {
     icon-image: "leisure/sauna.png";
     set icon_z17;
-    text: auto;
 }
 area[leisure=golf_course] {
@@ -1938,5 +1764,4 @@
     icon-image: "sport/golf/golf.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -1950,5 +1775,4 @@
     icon-image: "sport/golf/tee.svg";
     set icon_z17;
-    text: auto;
 }
 way[golf=hole] {
@@ -1960,5 +1784,4 @@
     icon-image: "sport/golf/pin.svg";
     set icon_z17;
-    text: auto;
 }
 area[golf=bunker] {
@@ -1984,5 +1807,4 @@
     icon-image: "sport/golf/driving_range.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -1994,10 +1816,8 @@
     icon-image: "leisure/advertising_column.svg";
     set icon_z17;
-    text: auto;
 }
 node[advertising=billboard] {
     icon-image: "leisure/billboard.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -2097,30 +1917,24 @@
     icon-image: "shop/supermarket.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=convenience] {
     icon-image: "shop/convenience.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=bakery] {
     icon-image: "shop/groceries/bakery.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=butcher] {
     icon-image: "shop/groceries/butcher.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=bicycle] {
     icon-image: "sport/bicycle.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=doityourself] {
     icon-image: "shop/diy_store.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=dry_cleaning],
@@ -2128,35 +1942,28 @@
     icon-image: "shop/laundry.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=outdoor] {
     icon-image: "shop/outdoor.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=kiosk] {
     icon-image: "shop/kiosk.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=beverages] {
     icon-image: "shop/beverages.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=alcohol] {
     icon-image: "shop/alcohol.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=books] {
     icon-image: "shop/book.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=boutique] {
     icon-image: "shop/boutique.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=car],
@@ -2164,215 +1971,172 @@
     icon-image: "vehicle.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=car_repair] {
     icon-image: "vehicle/repair_shop.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=tyres] {
     icon-image: "vehicle/tyres.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=chemist] {
     icon-image: "shop/chemist.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=tobacco] {
     icon-image: "shop/tobacco.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=clothes] {
     icon-image: "shop/clothes.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=computer] {
     icon-image: "shop/computer.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=confectionery] {
     icon-image: "shop/groceries/confectionery.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=copyshop] {
     icon-image: "shop/copyshop.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=curtain] {
     icon-image: "shop/curtain.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=cycle_repair] {
     icon-image: "sport/bicycle.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=department_store] {
     icon-image: "shop/mall.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=deli] {
     icon-image: "shop/groceries/deli.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=electronics] {
     icon-image: "shop/electronics.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=erotic] {
     icon-image: "shop/erotic.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=furniture] {
     icon-image: "shop/furniture.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=fabric] {
     icon-image: "shop/fabric.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=florist] {
     icon-image: "shop/florist.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=frame] {
     icon-image: "shop/frame.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=gift] {
     icon-image: "presets/present.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=greengrocer] {
     icon-image: "shop/groceries/greengrocer.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=garden_centre] {
     icon-image: "shop/garden_centre.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=hairdresser] {
     icon-image: "shop/hairdresser.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=hardware] {
     icon-image: "shop/hardware.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=hearing_aids] {
     icon-image: "shop/hearing_aids.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=hifi] {
     icon-image: "shop/hifi.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=houseware] {
     icon-image: "shop/houseware.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=jewelry] {
     icon-image: "shop/jewelry.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=kitchen] {
     icon-image: "shop/kitchen.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=mall] {
     icon-image: "shop/mall.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=mobile_phone] {
     icon-image: "shop/mobile_phone.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=motorcycle] {
     icon-image: "vehicle/motorbike.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=musical_instrument] {
     icon-image: "shop/musical_instrument.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=newsagent] {
     icon-image: "shop/news.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=optician] {
     icon-image: "shop/optician.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=medical_supply] {
     icon-image: "shop/medical_supply.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=paint] {
     icon-image: "shop/paint.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=pawnbroker] {
     icon-image: "presets/pawnbroker.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=seafood] {
     icon-image: "shop/groceries/seafood.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=shoes] {
     icon-image: "shop/shoes.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=sports] {
     icon-image: "sport/multi.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=stationery] {
     icon-image: "shop/stationery.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=tailor] {
     icon-image: "shop/tailor.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=travel_agency] {
@@ -2380,35 +2144,28 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[shop=toys] {
     icon-image: "shop/toys.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=vacuum_cleaner] {
     icon-image: "shop/vacuum_cleaner.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=variety_store] {
     icon-image: "shop/variety_store.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=video] {
     icon-image: "shop/video.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=bookmaker] {
     icon-image: "presets/lottery.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=lottery] {
     icon-image: "presets/lottery.svg";
     set icon_z17;
-    text: auto;
 }
 /* duplicate of shopping_centre? */
@@ -2416,105 +2173,84 @@
     icon-image: "shop/mall.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=pet] {
     icon-image: "shop/pet.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=photo] {
     icon-image: "shop/photo.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=ticket] {
     icon-image: "shop/ticket.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=interior_decoration] {
     icon-image: "shop/interior_decoration.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=car_parts] {
     icon-image: "vehicle/car_parts.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=video_games] {
     icon-image: "shop/video_games.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=bed] {
     icon-image: "shop/bed.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=beauty] {
     icon-image: "shop/beauty.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=cosmetics] {
     icon-image: "shop/cosmetics.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=perfumery] {
     icon-image: "shop/perfumery.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=tea] {
     icon-image: "shop/groceries/tea.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=coffee] {
     icon-image: "shop/groceries/coffee.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=antiques] {
     icon-image: "shop/antique.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=music] {
     icon-image: "shop/music.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=funeral_directors] {
     icon-image: "shop/funeral_directors.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=wine] {
     icon-image: "shop/wine.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=farm] {
     icon-image: "presets/apple.png";
     set icon_z17;
-    text: auto;
 }
 node[shop=tattoo] {
     icon-image: "shop/tattoo.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=art] {
     icon-image: "shop/art.svg";
     set icon_z17;
-    text: auto;
 }
 node[shop=bag] {
     icon-image: "shop/bag.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -2529,45 +2265,36 @@
     icon-image: "emergency/ambulance_station.svg";
     set icon_z17;
-    text: auto;
 }
 node[emergency=water_tank] {
     icon-image: "emergency/water_tank.svg";
     set icon_z17;
-    text: auto;
 }
 node[emergency=phone] {
     icon-image: "vehicle/emergency_phone.png";
     set icon_z17;
-    text: auto;
 }
 node[emergency=defibrillator] {
     icon-image: "presets/aed.svg";
     set icon_z17;
-    text: auto;
 }
 node[emergency=fire_hydrant] {
     icon-image: "service/fire_hydrant.png";
     set icon_z17;
-    text: auto;
 }
 node[emergency=fire_extinguisher] {
     icon-image: "emergency/fire_extinguisher.svg";
     set icon_z17;
-    text: auto;
 }
 node[emergency=fire_hose] {
     icon-image: "emergency/fire_hose.svg";
     set icon_z17;
-    text: auto;
 }
 node[emergency=assembly_point] {
     icon-image: "emergency/assembly_point.svg";
     set icon_z17;
-    text: auto;
 }
 node[emergency=siren] {
     icon-image: "emergency/siren.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -2593,60 +2320,48 @@
     icon-image: "food/pub.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=biergarten] {
     icon-image: "food/biergarten.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=nightclub] {
     icon-image: "leisure/discoball.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=stripclub] {
     icon-image: "leisure/nightclub.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=casino] {
     icon-image: "leisure/casino.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=brothel] {
     icon-image: "leisure/stripclub.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=cafe] {
     icon-image: "food/cafe.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=restaurant] {
     icon-image: "food/restaurant.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=food_court] {
     icon-image: "food/restaurant.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=fast_food] {
     icon-image: "food/fastfood.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bar] {
     icon-image: "food/bar.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=ice_cream] {
     icon-image: "food/icecream.png";
     set icon_z17;
-    text: auto;
 }
 area[amenity=bicycle_parking]:closed {
@@ -2672,15 +2387,12 @@
     icon-image: "vehicle/parking/parking_space.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=parking] {
     icon-image: "vehicle/parking.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=parking_entrance] {
     icon-image: "vehicle/parking.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=parking_entrance][parking=multi-storey],
@@ -2688,5 +2400,4 @@
     icon-image: "vehicle/parking/multi-storey.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=parking_entrance][parking=underground],
@@ -2694,80 +2405,64 @@
     icon-image: "vehicle/parking/underground.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=motorcycle_parking] {
     icon-image: "vehicle/parking/motorbike.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bicycle_parking] {
     icon-image: "vehicle/parking/bicycle.png";
     set icon_z17;
-    text: auto;
 }
 node[park_ride][park_ride!=no] {
     icon-image: "vehicle/parking/park_ride.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=parking_space][wheelchair?] {
     icon-image: "vehicle/parking/handicapped.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bicycle_rental] {
     icon-image: "vehicle/rental/bicycle.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bicycle_repair_station] {
     icon-image: "vehicle/bicycle_repair_station.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=car_rental] {
     icon-image: "vehicle/rental/car.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=car_sharing] {
     icon-image: "vehicle/car_sharing.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=car_wash] {
     icon-image: "vehicle/car_wash.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=taxi] {
     icon-image: "transport/taxi.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=fuel] {
     icon-image: "vehicle/fuel.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=charging_station] {
     icon-image: "vehicle/fuel/charging_station.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=grit_bin] {
     icon-image: "misc/grit_bin.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=telephone] {
     icon-image: "service/telephone.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=clock] {
     icon-image: "service/clock.svg";
     set icon_z17;
-    text: auto;
 }
 area[amenity=toilets],
@@ -2780,15 +2475,12 @@
     icon-image: "service/toilets.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=shower] { 
     icon-image: "service/shower.svg"; 
-    set icon_z17; 
-    text: auto; 
+    set icon_z17;
 }
 node[amenity=recycling] {
     icon-image: "service/recycling/recycling.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=recycling][recycling_type=container] {
@@ -2801,15 +2493,12 @@
     icon-image: "service/recycling/trash-bin.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=waste_disposal] {
     icon-image: "service/recycling/waste_disposal.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=sanitary_dump_station] {
     icon-image: "service/recycling/sanitary_dump_station.svg";
     set icon_z17;
-    text: auto;
 }
 area[amenity=public_building],
@@ -2822,20 +2511,16 @@
     icon-image: "service.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=townhall] {
     icon-image: "presets/townhall.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=embassy] {
     icon-image: "service/administration/embassy.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=community_centre] {
     icon-image: "service/community_centre.png";
     set icon_z17;
-    text: auto;
 }
 area[amenity=water_point],
@@ -2846,15 +2531,12 @@
     icon-image: "food/drinking_water.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=water_point] {
     icon-image: "accommodation/camping/water.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=fountain] {
     icon-image: "misc/fountain.png";
     set icon_z17;
-    text: auto;
 }
 area[amenity=place_of_worship],
@@ -2873,120 +2555,96 @@
     icon-image: "religion.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=bahai] {
     icon-image: "religion/bahai.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=buddhist] {
     icon-image: "religion/buddhism.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=christian] {
     icon-image: "religion/church.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=hindu] {
     icon-image: "religion/hinduism.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=jain] {
     icon-image: "religion/jainism.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=jewish] {
     icon-image: "religion/jewish.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=muslim] {
     icon-image: "religion/muslim.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=sikh] {
     icon-image: "religion/sikhism.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=shinto] {
     icon-image: "religion/shinto.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=taoist] {
     icon-image: "religion/taoism.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=grave_yard] {
     icon-image: "rendering/landuse/cemetery.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=crematorium][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=post_office] {
     icon-image: "service/post_office.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=post_box] {
     icon-image: "service/post_box.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=studio] {
     icon-image: "service/studio.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=school] {
     icon-image: "education/school.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=university] {
     icon-image: "education/university.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=college] {
     icon-image: "education/college.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=kindergarten] {
     icon-image: "education/kindergarten.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=driving_school] {
     icon-image: "education/driving_school.png";
     set icon_z17;
-    text: auto;
 }
 area[amenity=pharmacy],
@@ -3004,65 +2662,52 @@
     icon-image: "health/pharmacy.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=hospital] {
     icon-image: "health/hospital.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=clinic] {
     icon-image: "health/clinic.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=nursing_home] {
     icon-image: "social_facility/nursing_home.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=social_facility][social_facility=group_home] {
     icon-image: "social_facility/group_home.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=social_facility][social_facility=assisted_living] {
     icon-image: "social_facility/assisted_living.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=social_facility][social_facility=outreach] {
     icon-image: "social_facility/outreach.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=social_facility][social_facility=shelter] {
     icon-image: "social_facility/shelter.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=social_facility][social_facility=food_bank] {
     icon-image: "social_facility/food_bank.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=baby_hatch] {
     icon-image: "health/baby_hatch.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=doctors] {
     icon-image: "health/doctors.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=dentist] {
     icon-image: "health/dentist.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=veterinary] {
     icon-image: "health/veterinary.svg";
     set icon_z17;
-    text: auto;
 }
 area[amenity=library],
@@ -3085,25 +2730,20 @@
     icon-image: "shop/library.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=police] {
     icon-image: "service/police.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=ranger_station] {
     icon-image: "service/ranger_station.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=fire_station] {
     icon-image: "service/firebrigade.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bus_station] {
     icon-image: "transport/bus.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=ferry_terminal] {
@@ -3111,5 +2751,4 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[amenity=theatre] {
@@ -3117,40 +2756,32 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[amenity=cinema] {
     icon-image: "leisure/cinema.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=arts_centre] {
     icon-image: "service/arts_centre.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=courthouse] {
     icon-image: "service/administration/courthouse.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=prison] {
     icon-image: "service/administration/prison.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bank] {
     icon-image: "money/bank.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bureau_de_change] {
     icon-image: "money/exchange.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=atm] {
     icon-image: "money/atm.png";
     set icon_z17;
-    text: auto;
 }
 way[amenity=bench] {
@@ -3161,15 +2792,12 @@
     icon-image: "leisure/bench.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=bbq] {
     icon-image: "leisure/bbq.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=compressed_air] {
     icon-image: "vehicle/compressed_air.svg";
     set icon_z17;
-    text: auto;
 }
 area[amenity=shelter],
@@ -3181,40 +2809,32 @@
     icon-image: "accommodation/shelter.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=shelter][shelter_type=public_transport] {
     icon-image: "accommodation/shelter_public_transport_brown.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=shelter][shelter_type=picnic_shelter] {
     icon-image: "accommodation/shelter_picnic_brown.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=shelter][shelter_type=basic_hut] {
     icon-image: "accommodation/basic_hut_blue.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=shelter][shelter_type=lean_to] {
     icon-image: "accommodation/shelter_lean_to.svg";
     set icon_z17;
-    text: auto;
 }
 node[amenity=hunting_stand] {
     icon-image: "hunting_stand.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=marketplace] {
     icon-image: "place/marketplace.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=wlan] {
     icon-image: "wlan.png";
     set icon_z17;
-    text: auto;
 }
 node[amenity=vending_machine] {
@@ -3225,5 +2845,4 @@
     icon-image: "service/excrement_bags.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3261,119 +2880,95 @@
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=shoemaker][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=photographer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=metal_construction][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }node[craft=electrician][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=brewery][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=plumber] {
     icon-image: "craft/plumber.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=sawmill][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=gardener][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=winery][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=hvac][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=painter] {
     icon-image: "craft/painter.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=stonemason][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=handicraft][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=pottery] {
     icon-image: "craft/pottery.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=key_cutter][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=caterer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=roofer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=beekeeper][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=blacksmith][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=locksmith][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=window_construction] {
     icon-image: "craft/window_construction.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=upholsterer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[craft=tiler] {
     icon-image: "craft/tiler.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3396,45 +2991,36 @@
     icon-image: "accommodation/hotel.svg";
     set icon_z17;
-    text: auto;
 }
 node[tourism=motel] {
     icon-image: "accommodation/motel.svg";
     set icon_z17;
-    text: auto;
 }
 node[tourism=guest_house] {
     icon-image: "accommodation/guest_house.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=hostel] {
     icon-image: "accommodation/hostel.svg";
     set icon_z17;
-    text: auto;
 }
 node[tourism=chalet] {
     icon-image: "accommodation/chalet.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=alpine_hut] {
     icon-image: "accommodation/alpine_hut_blue.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=wilderness_hut] {
     icon-image: "accommodation/wilderness_hut_blue.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=camp_site] {
     icon-image: "accommodation/camping.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=caravan_site] {
     icon-image: "accommodation/camping/caravan.png";
     set icon_z17;
-    text: auto;
 }
 area[tourism=picnic_site],
@@ -3449,25 +3035,20 @@
     icon-image: "leisure/picnic.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=viewpoint] {
     icon-image: "sightseeing/viewpoint.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=theme_park] {
     icon-image: "leisure/theme_park.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=attraction] {
     icon-image: "sightseeing.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=zoo] {
     icon-image: "leisure/zoo.png";
     set icon_z17;
-    text: auto;
 }
 area[tourism=artwork]:closed {
@@ -3481,10 +3062,8 @@
     icon-image: "service/arts_centre.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=museum] {
     icon-image: "sightseeing/museum.svg";
     set icon_z17;
-    text: auto;
 }
 
@@ -3499,10 +3078,8 @@
     icon-image: "misc/information.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=information][information=guidepost] {
     icon-image: "misc/information/guidepost.png";
     set icon_z17;
-    text: auto;
 }
 area[tourism=information][information=office] {
@@ -3512,15 +3089,12 @@
     icon-image: "misc/information/informationoffice.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=information][information=map] {
     icon-image: "misc/information/map.png";
     set icon_z17;
-    text: auto;
 }
 node[tourism=information][information=board] {
     icon-image: "misc/information/board.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3544,50 +3118,40 @@
     icon-image: "sightseeing/castle.svg";
     set icon_z17;
-    text: auto;
 }
 node[historic=monument] {
     icon-image: "sightseeing/monument.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=memorial] {
     icon-image: "sightseeing/memorial.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=archaeological_site] {
     icon-image: "sightseeing/archaeological.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=ruins] {
     icon-image: "sightseeing/ruins.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=battlefield] {
     icon-image: "sightseeing/battlefield.png";
     set icon_z17;
-    text: auto;
 }
 node[geological=palaeontological_site] {
     icon-image: "historic/palaeontological_site.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=wayside_cross] {
     icon-image: "religion/wayside_cross.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=wayside_shrine] {
     icon-image: "religion/wayside_shrine.png";
     set icon_z17;
-    text: auto;
 }
 node[historic=boundary_stone] {
     icon-image: "historic/boundary_stone.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3688,5 +3252,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3705,25 +3268,20 @@
     icon-image: "transport/airport/airfield.png";
     set icon_z17;
-    text: auto;
 }
 node[military=bunker] {
     icon-image: "misc/landmark/bunker.png";
     set icon_z17;
-    text: auto;
 }
 node[military=barracks][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[military=danger_area] {
     icon-image: "misc/danger.png";
     set icon_z17;
-    text: auto;
 }
 node[military=range] {
     icon-image: "misc/landmark/range.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3735,35 +3293,28 @@
     icon-image: "transport/railway_small.png";
     set icon_z17;
-    text: auto;
 }
 node[highway=bus_stop] {
     icon-image: "transport/bus_small.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=stop_position][bus=yes] {
     icon-image: "transport/bus_small.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=stop_position][aerial=yes] {
     icon-image: "transport/aerialway.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=stop_position][ferry=yes] {
     icon-image: "transport/ferry.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=stop_position][tram=yes] {
     icon-image: "transport/tram.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=stop_position][train=yes] {
     icon-image: "transport/railway_small.png";
     set icon_z17;
-    text: auto;
 }
 area[public_transport=platform]:closed {
@@ -3778,20 +3329,16 @@
     icon-image: "transport/bus_small.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=platform][bus=yes] {
     icon-image: "transport/bus_small.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=platform][aerial=yes] {
     icon-image: "transport/aerialway/station.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=platform][ferry=yes] {
     icon-image: "transport/ferry.png";
     set icon_z17;
-    text: auto;
 }
 node[public_transport=platform][tram=yes],
@@ -3799,5 +3346,4 @@
     icon-image: "transport/railway_station.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -3814,25 +3360,20 @@
     icon-image: "transport/railway_station.png";
     set icon_z17;
-    text: auto;
 }
 node[railway=halt] {
     icon-image: "transport/railway_small.png";
     set icon_z17;
-    text: auto;
 }
 node[railway=tram_stop] {
     icon-image: "transport/tram.png";
     set icon_z17;
-    text: auto;
 }
 node[railway=subway_entrance] {
     icon-image: "transport/underground.png";
     set icon_z17;
-    text: auto;
 }
 node[railway=crossing] {
     icon-image: "transport/railway/crossing.svg";
     set icon_z17;
-    text: auto;
 }
 node[railway=level_crossing] {
@@ -3840,5 +3381,4 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 way[railway=rail] {
@@ -3910,10 +3450,8 @@
     icon-image: "transport/railway/turntable.svg";
     set icon_z17;
-    text: auto;
 }
 node[railway=buffer_stop] {
     icon-image: "transport/railway/buffer_stop.svg";
     set icon_z17;
-    text: auto;
 }
 area[railway=platform]:closed {
@@ -3933,15 +3471,12 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[railway=signal] {
     icon-image: "transport/railway/signal.svg";
     set icon_z17;
-    text: auto;
 }
 node[railway=milestone] {
     icon-image: "transport/railway/milestone.svg";
     set icon_z17;
-    text: auto;
 }
 node[railway=rail], node[railway=tram], node[railway=light_rail],
@@ -3953,5 +3488,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 way[railway=construction][!highway] {
@@ -3993,5 +3527,4 @@
     icon-image: "transport/airport.png";
     set icon_z17;
-    text: auto;
 }
 area[aeroway=terminal] {
@@ -4001,5 +3534,4 @@
     icon-image: "transport/airport/terminal.png";
     set icon_z17;
-    text: auto;
 }
 area[aeroway=helipad] {
@@ -4009,5 +3541,4 @@
     icon-image: "transport/airport/helipad.png";
     set icon_z17;
-    text: auto;
 }
 area[aeroway=runway]:closed {
@@ -4032,5 +3563,4 @@
     icon-image: "transport/airport/parking_position.png";
     set icon_z17;
-    text: auto;
 }
 area[aeroway=apron],
@@ -4043,20 +3573,16 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[aeroway=hangar] {
     icon-image: "transport/airport/hangar.png";
     set icon_z17;
-    text: auto;
 }
 node[aeroway=gate] {
     icon-image: "transport/airport/gate.png";
     set icon_z17;
-    text: auto;
 }
 node[aeroway=windsock] {
     icon-image: "transport/airport/windsock.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -4106,10 +3632,8 @@
     icon-image: "transport/aerialway/station.png";
     set icon_z17;
-    text: auto;
 }
 node[aerialway=pylon] {
     icon-image: "transport/aerialway/pylon.svg";
     set icon_z17;
-    text: auto;
 }
 node[aerialway=cable_car],
@@ -4126,5 +3650,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -4149,20 +3672,16 @@
     icon-image: "sport/10pin.png";
     set icon_z17;
-    text: auto;
 }
 node[sport="10pin"] {
     icon-image: "sport/10pin.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=athletics] {
     icon-image: "sport/athletics.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=running] {
     icon-image: "sport/running.svg";
     set icon_z17;
-    text: auto;
 }
 node[sport=soccer],
@@ -4170,5 +3689,4 @@
     icon-image: "sport/soccer.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=australian_football],
@@ -4179,5 +3697,4 @@
     icon-image: "sport/football.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=baseball],
@@ -4195,45 +3712,36 @@
     icon-image: "sport/baseball.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=basketball] {
     icon-image: "sport/basketball.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=boules] {
     icon-image: "sport/boule.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=bowls] {
     icon-image: "sport/boule.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=canoe] {
     icon-image: "sport/canoe.svg";
     set icon_z17;
-    text: auto;
 }
 node[sport=chess] {
     icon-image: "sport/chess.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=climbing] {
     icon-image: "sport/climbing.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=cricket] {
     icon-image: "sport/cricket.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=croquet] {
     icon-image: "sport/croquet.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=cycling],
@@ -4256,10 +3764,8 @@
     icon-image: "sport/cycling.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=dog_racing] {
     icon-image: "leisure/dog.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=equestrian] {
@@ -4267,10 +3773,8 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[sport=golf] {
     icon-image: "sport/golf.svg";
     set icon_z17;
-    text: auto;
 }
 node[sport=gymnastics] {
@@ -4278,35 +3782,28 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[sport=field_hockey] {
     icon-image: "sport/field_hockey.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=ice_hockey] {
     icon-image: "sport/ice_hockey.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=horse_racing] {
     icon-image: "sport/riding.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=karting] {
     icon-image: "sport/karting.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=motocross] {
     icon-image: "sport/motocross.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=motor] {
     icon-image: "sport/motor.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=multi],
@@ -4321,35 +3818,28 @@
     icon-image: "sport/multi.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=pelota] {
     icon-image: "sport/pelota.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=racquet] {
     icon-image: "sport/racquetball.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=ice_skating] {
     icon-image: "sport/skating.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=roller_skating] {
     icon-image: "sport/roller_skating.svg";
     set icon_z17;
-    text: auto;
 }
 node[sport=skating] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=skateboard] {
     icon-image: "sport/skateboard.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=swimming] {
@@ -4359,5 +3849,4 @@
     icon-image: "sport/pool.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=table_tennis],
@@ -4369,15 +3858,12 @@
     icon-image: "sport/table_tennis.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=tennis] {
     icon-image: "sport/tennis.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=paintball][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=squash],
@@ -4397,5 +3883,4 @@
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=shooting] {
@@ -4403,50 +3888,40 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 node[sport=volleyball] {
     icon-image: "sport/volleyball.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=beachvolleyball] {
     icon-image: "sport/beachvolleyball.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=billiards] {
     icon-image: "sport/billiards.svg";
     set icon_z17;
-    text: auto;
 }
 node[sport=bowling] {
     icon-image: "sport/10pin.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=handball] {
     icon-image: "sport/handball.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=rowing] {
     icon-image: "sport/rowing.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=sailing][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=scuba_diving] {
     icon-image: "sport/scuba_diving.svg";
     set icon_z17;
-    text: auto;
 }
 node[sport=badminton][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
-    text: auto;
 }
 area[sport=archery],
@@ -4459,20 +3934,16 @@
     icon-image: "sport/archery.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=fishing] {
     icon-image: "sport/fishing.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=model_aerodrome] {
     icon-image: "transport/airport.png";
     set icon_z17;
-    text: auto;
 }
 node[sport=rc_car] {
     icon-image: "transport/car.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -4487,10 +3958,8 @@
     icon-image: "misc/landmark/spring.svg";
     set icon_z17;
-    text: auto;
 }
 node[natural=saddle] {
     icon-image: "presets/saddle.svg";
     set icon_z0;
-    text: auto;
     set text_z0;
 }
@@ -4498,5 +3967,4 @@
     icon-image: "presets/peak.svg";
     set icon_z0;
-    text: auto;
     set text_z0;
 }
@@ -4504,5 +3972,4 @@
     icon-image: "sightseeing/peak_viewpoint.svg";
     set icon_z0;
-    text: auto;
     set text_z0;
 }
@@ -4513,5 +3980,4 @@
     icon-image: "misc/landmark/volcano_small.png";
     set icon_z0;
-    text: auto;
     set text_z0;
 }
@@ -4528,5 +3994,4 @@
     icon-image: "misc/cliff.svg";
     set icon_z17;
-    text: auto;
 }
 way[natural=ridge] {
@@ -4591,5 +4056,4 @@
     icon-image: "misc/rock.svg";
     set icon_z17;
-    text: auto;
 }
 area[natural=stone] {
@@ -4599,5 +4063,4 @@
     icon-image: "misc/stone.svg";
     set icon_z17;
-    text: auto;
 }
 area[natural=bay],
@@ -4608,15 +4071,12 @@
     icon-image: "nautical/bay.svg";
     set icon_z17;
-    text: auto;
 }
 node[natural=cave_entrance] {
     icon-image: "misc/landmark/cave_entrance.png";
     set icon_z17;
-    text: auto;
 }
 node[natural=tree] {
     icon-image: "misc/landmark/trees.png";
     set icon_z17;
-    text: auto;
 }
 node[natural=tree][type=conifer],
@@ -4624,5 +4084,4 @@
     icon-image: "misc/landmark/trees_conifer.png";
     set icon_z17;
-    text: auto;
 }
 node[natural=tree][type=broad_leaved],
@@ -4630,10 +4089,8 @@
     icon-image: "misc/landmark/trees_broad_leaved.png";
     set icon_z17;
-    text: auto;
 }
 node[natural=tree][type=palm] {
     icon-image: "misc/landmark/trees_palm.png";
     set icon_z17;
-    text: auto;
 }
 node[natural=glacier],
@@ -4657,5 +4114,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 /*****************/
@@ -4690,15 +4146,12 @@
     icon-image: "nautical/boatyard.png";
     set icon_z17;
-    text: auto;
 }
 node[waterway=lock_gate] {
     icon-image: "nautical/lock_gate.png";
     set icon_z17;
-    text: auto;
 }
 node[waterway=turning_point] {
     icon-image: "nautical/turning.png";
     set icon_z17;
-    text: auto;
 }
 area[waterway=boatyard] {
@@ -4708,5 +4161,4 @@
     icon-image: "nautical/boatyard.png";
     set icon_z17;
-    text: auto;
 }
 node[waterway=water_point],
@@ -4715,10 +4167,8 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 node[mooring] {
     icon-image: "nautical/marina.png";
     set icon_z17;
-    text: auto;
 }
 area[waterway=fuel] {
@@ -4729,5 +4179,4 @@
     icon-width: 16;
     set icon_z17;
-    text: auto;
 }
 way[waterway=weir] {
@@ -4738,5 +4187,4 @@
     icon-image: "nautical/weir.svg";
     set icon_z17;
-    text: auto;
 }
 area[waterway=dam]:closed {
@@ -4750,5 +4198,4 @@
     icon-image: "nautical/dam.svg";
     set icon_z17;
-    text: auto;
 }
 /* it's not possible to have both line and area, line seems more likely */
@@ -4760,5 +4207,4 @@
     icon-image: "nautical/waterfall.svg";
     set icon_z17;
-    text: auto;
 }
 node[waterway=river], node[waterway=riverbank],
@@ -4768,5 +4214,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -4790,5 +4235,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -4800,5 +4244,4 @@
     icon-image: "misc/landmark/mountain_pass.svg";
     set icon_z0;
-    text: auto;
     set text_z0;
 }
@@ -4877,5 +4320,4 @@
     icon-image: "misc/deprecated.png";
     set icon_z17;
-    text: auto;
 }
 
@@ -4961,5 +4403,4 @@
     icon-image: "place/settlement/openGeoDB.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -4994,5 +4435,4 @@
     icon-image: "place/settlement/capital.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5006,5 +4446,4 @@
     icon-image: "place/settlement/city.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5018,5 +4457,4 @@
     icon-image: "place/settlement/town.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5030,5 +4468,4 @@
     icon-image: "place/settlement/suburb.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5042,5 +4479,4 @@
     icon-image: "place/settlement/village.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5054,5 +4490,4 @@
     icon-image: "place/settlement/neighbourhood.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5066,5 +4501,4 @@
     icon-image: "place/settlement/hamlet.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5078,5 +4512,4 @@
     icon-image: "place/settlement/isolated_dwelling.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5090,5 +4523,4 @@
     icon-image: "place/settlement/farm.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5102,5 +4534,4 @@
 node|z-14[place=locality][!setting("hide_icons")] {
     icon-image: "place/locality.png";
-    text: auto;
     font-size: 10;
     font-weight: bold;
@@ -5112,5 +4543,4 @@
     icon-image: "place/island.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5123,5 +4553,4 @@
     icon-image: "place/islet.png";
     set icon_z0;
-    text: auto;
     set text_z0;
     font-size: 10;
@@ -5182,7 +4611,4 @@
 */
 
-node {
-    text: auto;
-}
 node|z-16[setting("hide_icons")],
 node|z17-[!is_prop_set("icon-image")][setting("hide_icons")]!.maxspeedclass,