Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15169)
+++ /trunk/data/defaultpresets.xml	(revision 15170)
@@ -372,5 +372,5 @@
     <chunk id="power_pole">
         <text key="height" text="Height (meters)" />
-        <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
         <check key="location:transition" text="Location transition" disable_off="true" />
         <reference ref="ref_operator" />
@@ -1618,5 +1618,5 @@
             <key key="substance" value="water" />
             <key key="usage" value="penstock" />
-            <combo key="location" text="Location" values="underground,overground" values_context="pipeline" />
+            <combo key="location" text="Location" values="overground,underground" values_context="pipeline" />
             <optional>
                 <text key="name" text="Name" />
@@ -1684,5 +1684,5 @@
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
-            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove,wet_meadow,string_bog,saltern,fen" values_searchable="true" />
+            <combo key="wetland" text="Type" values="bog,fen,mangrove,marsh,reedbed,saltern,saltmarsh,string_bog,swamp,tidalflat,wet_meadow" values_searchable="true" />
             <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Wetland -->
@@ -3337,5 +3337,5 @@
             <text key="artwork_subject" text="Subject" />
             <text key="artist_name" text="Artist Name" />
-            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
             <text key="start_date" text="Start date" />
         </item> <!-- Artwork -->
@@ -4591,5 +4591,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,carport,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,college,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public,ruins,bakehouse" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="bakehouse,barn,basilica,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,supermarket,synagogue,temple,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <text key="name" text="Name" />
@@ -4613,5 +4613,5 @@
             <link wiki="Key:building:part" />
             <space />
-            <combo key="building:part" text="Building part" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,college,hospital,warehouse,retail,shed,supermarket,cowshed,construction,ruins,bakehouse" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building:part" text="Building part" values="bakehouse,barn,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,greenhouse,hangar,hospital,industrial,office,retail,roof,ruins,school,shed,supermarket,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
@@ -4784,5 +4784,5 @@
             <key key="pipeline" value="valve" />
             <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
-            <combo key="actuator" text="Actuator" values="manual,electric_motor,pneumatic_cylinder,hydraulic_cylinder,thermostatic,solenoid" values_context="actuator" />
+            <combo key="actuator" text="Actuator" values="electric_motor,hydraulic_cylinder,manual,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" />
             <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
             <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
@@ -4924,5 +4924,5 @@
             <space />
             <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue!" default="yes" />
-            <combo key="bridge:structure" text="Structure" values="arch,beam,truss,floating,suspension,cable-stayed,simple-suspension,humpback" match="key" />
+            <combo key="bridge:structure" text="Structure" values="arch,beam,cable-stayed,floating,humpback,simple-suspension,suspension,truss" match="key" />
             <reference ref="optional_bridge" />
         </item> <!-- Bridge -->
@@ -4937,5 +4937,5 @@
             <link wiki="Key:bridge:support" />
             <space />
-            <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier,pylon" match="key" />
+            <combo key="bridge:support" text="Type" values="abutment,lift_pier,pier,pivot_pier,pylon" match="key" />
         </item> <!-- Bridge Support -->
         <item name="Bridge outline" icon="presets/transport/bridge/bridge_outline.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -4964,6 +4964,6 @@
             <space />
             <key key="military" value="bunker" />
-            <combo key="bunker_type" text="Type" values="pillbox,munitions,hardened_aircraft_shelter" match="key" />
-            <combo key="location" text="Location" values="underground,overground" values_context="bunker" />
+            <combo key="bunker_type" text="Type" values="hardened_aircraft_shelter,munitions,pillbox" match="key" />
+            <combo key="location" text="Location" values="overground,underground" values_context="bunker" />
             <text key="name" text="Name" />
             <check key="historic" text="Historic" />
@@ -4993,5 +4993,5 @@
                 <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
                 <space />
-                <combo key="plant:source" text="Plant source" values="biofuel,biogas,biomass,coal,gas,oil,diesel,gasoline,nuclear,solar,waste,hydro,tidal,wave,osmotic,geothermal,wind" />
+                <combo key="plant:source" text="Plant source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
             </optional>
         </item> <!-- Power Plant -->
@@ -5160,5 +5160,5 @@
             <key key="power" value="substation" />
             <text key="name" text="Name" />
-            <combo key="substation" text="Type of substation" values="transmission,distribution,minor_distribution,converter,compensation,transition,traction,industrial" values_context="power" />
+            <combo key="substation" text="Type of substation" values="compensation,converter,distribution,industrial,minor_distribution,traction,transition,transmission" values_context="power" />
             <reference ref="power_extra" />
             <optional>
@@ -5172,5 +5172,5 @@
             <space />
             <key key="power" value="transformer" />
-            <combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,auxiliary,yes" match="key" values_context="power" />
+            <combo key="transformer" text="Type of transformer" values="auto,auxiliary,converter,distribution,generator,phase_angle_regulator,traction,yes" match="key" values_context="power" />
             <reference ref="power_loc" />
             <reference ref="transformer_voltage_frequency" />
@@ -5208,5 +5208,5 @@
             <space />
             <key key="power" value="switch" />
-            <combo key="switch" text="Type of switch" values="mechanical,circuit_breaker,disconnector,earthing" match="key" values_context="power" />
+            <combo key="switch" text="Type of switch" values="circuit_breaker,disconnector,earthing,mechanical" match="key" values_context="power" />
             <reference ref="power_loc" />
             <optional>
@@ -5233,5 +5233,5 @@
             <space />
             <key key="power" value="compensator" />
-            <combo key="compensator" text="Type of compensator" values="shunt_reactor,shunt_capacitor,static_var,statcom,synchronous_condenser,filter,series_reactor,series_capacitor" match="key" values_context="power" />
+            <combo key="compensator" text="Type of compensator" values="filter,series_capacitor,series_reactor,shunt_capacitor,shunt_reactor,statcom,static_var,synchronous_condenser" match="key" values_context="power" />
             <reference ref="voltage_frequency" />
             <reference ref="ref_operator" />
@@ -5273,5 +5273,5 @@
             <text key="height" text="Height (meters)" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
-            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
             <reference ref="ref_operator" />
@@ -5284,5 +5284,5 @@
             <text key="height" text="Height (meters)" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
-            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
             <reference ref="ref_operator" />
@@ -5310,5 +5310,5 @@
             <space />
             <label text="Switch Attributes:" />
-            <combo key="switch" text="Type" values="mechanical,circuit_breaker,disconnector,earthing" match="key!" values_context="power" />
+            <combo key="switch" text="Type" values="circuit_breaker,disconnector,earthing,mechanical" match="key!" values_context="power" />
             <optional>
                 <reference ref="voltage" />
@@ -5351,5 +5351,5 @@
             <optional>
                 <reference ref="cables_circuits" />
-                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
+                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" values_sort="false" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
@@ -5446,5 +5446,5 @@
             <space />
             <key key="historic" value="tomb" />
-            <combo key="tomb" text="Type" values="tumulus,rock-cut,hypogeum,war_grave,mausoleum,columbarium,crypt,pyramid,sarcophagus,vault" values_context="tomb" values_searchable="true" />
+            <combo key="tomb" text="Type" values="columbarium,crypt,hypogeum,mausoleum,pyramid,rock-cut,sarcophagus,tumulus,vault,war_grave" values_context="tomb" values_searchable="true" />
             <text key="name" text="Name" />
         </item> <!-- Tomb -->
@@ -5461,9 +5461,9 @@
             <key key="historic" value="memorial" />
             <text key="name" text="Name" />
-            <combo key="memorial" text="Type" values="statue,bust,plaque,stele,stone,war_memorial" values_context="memorial" values_searchable="true" />
+            <combo key="memorial" text="Type" values="bust,plaque,statue,stele,stone,war_memorial" values_context="memorial" values_searchable="true" />
             <optional>
                 <text key="inscription" text="Inscription" />
                 <text key="artist_name" text="Artist Name" />
-                <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
                 <text key="start_date" text="Start date" />
                 <text key="wikipedia" text="Wikipedia" />
@@ -6468,5 +6468,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Plumber -->
-    <item name="Hvac" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Hvac" icon="presets/craft/hvac.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=hvac" />
         <space />
@@ -6623,5 +6623,5 @@
             <space />
             <key key="boundary" value="maritime" />
-            <combo key="border_type" text="Border type" values="baseline,territorial,contiguous,eez" />
+            <combo key="border_type" text="Border type" values="baseline,contiguous,eez,territorial" />
             <text key="name" text="Name" />
         </item> <!-- Maritime -->
@@ -7003,5 +7003,5 @@
             <space />
             <key key="landuse" value="orchard" />
-            <combo key="trees" text="Trees" values="olive_trees,apple_trees,oil_palms,orange_trees,almond_trees,banana_plants,coconut_palms,hazel_plants,cherry_trees,persimmon_trees,walnut_trees,plum_trees,peach_trees,tea_plants" />
+            <combo key="trees" text="Trees" values="almond_trees,apple_trees,banana_plants,cherry_trees,coconut_palms,hazel_plants,oil_palms,olive_trees,orange_trees,peach_trees,persimmon_trees,plum_trees,tea_plants,walnut_trees" />
             <reference ref="optional_name" />
         </item> <!-- Orchard -->
Index: /trunk/images/presets/craft/hvac.svg
===================================================================
--- /trunk/images/presets/craft/hvac.svg	(revision 15170)
+++ /trunk/images/presets/craft/hvac.svg	(revision 15170)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="hvac1.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient881">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop877" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop879" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient881"
+       id="linearGradient883"
+       x1="1"
+       y1="1045.3622"
+       x2="15"
+       y2="1045.3622"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.296875"
+     inkscape:cx="1.7109888"
+     inkscape:cy="8.1240404"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#0000ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:11.69999981;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="m 2,1051.3622 v -12 h 4 v 12 h 4 v -12 h 4 v 12"
+       id="path816-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:url(#linearGradient883);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:normal;stroke-miterlimit:11.69999981;stroke-dasharray:none"
+       d="m 2,1051.3622 v -12 h 4 v 12 h 4 v -12 h 4 v 12"
+       id="path816"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15169)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15170)
@@ -3037,6 +3037,6 @@
     set icon_z17;
 }
-node[craft=hvac][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=hvac] {
+    icon-image: "presets/craft/hvac.svg";
     set icon_z17;
 }