Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7914)
+++ trunk/data/defaultpresets.xml	(revision 7915)
@@ -2180,28 +2180,4 @@
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
-        <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
-            <space />
-            <key key="aerialway" value="chair_lift" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:occupancy" text="Number of people per chair" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" />
-                <check key="aerialway:heating" text="Has heating?" />
-            </optional>
-        </item> <!-- Chair Lift -->
-        <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-            <space />
-            <key key="aerialway" value="drag_lift" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-            </optional>
-        </item> <!-- Drag Lift -->
         <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
@@ -2222,4 +2198,18 @@
             </optional>
         </item> <!-- Cable Car -->
+		<item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
+            <space />
+            <key key="aerialway" value="chair_lift" />
+            <reference ref="name_ref" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:occupancy" text="Number of people per chair" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <check key="aerialway:bubble" text="Has bubble?" />
+                <check key="aerialway:heating" text="Has heating?" />
+            </optional>
+        </item> <!-- Chair Lift -->
         <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=gondola" />
@@ -2234,5 +2224,5 @@
             </optional>
         </item> <!-- Gondola -->
-        <item name="Mixed Lift" type="way" preset_name_label="true">
+        <item name="Mixed Lift" icon="styles/standard/transport/aerialway/mixed_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
             <space />
@@ -2247,8 +2237,8 @@
             </optional>
         </item> <!-- Mixed Lift -->
-        <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=t-bar" />
-            <space />
-            <key key="aerialway" value="t-bar" />
+        <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+            <space />
+            <combo key="aerialway" text="Type" values="drag_lift,t-bar,j-bar,platter,rope_tow" display_values="drag_lift (general type - use only if exact type (see values below) is unknown),t-bar,j-bar,platter,rope_tow" match="keyvalue" />
             <reference ref="name_ref" />
             <optional>
@@ -2256,36 +2246,6 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item> <!-- T-bar Lift -->
-        <item name="J-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=j-bar" />
-            <space />
-            <key key="aerialway" value="j-bar" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-            </optional>
-        </item> <!-- J-bar Lift -->
-        <item name="Platter Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=platter" />
-            <space />
-            <key key="aerialway" value="platter" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-            </optional>
-        </item> <!-- Platter Lift -->
-        <item name="Rope Tow" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=rope_tow" />
-            <space />
-            <key key="aerialway" value="rope_tow" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-            </optional>
-        </item> <!-- Rope Tow -->
-        <item name="Magic Carpet" type="way" preset_name_label="true">
+        </item> <!-- Drag Lift -->
+        <item name="Magic Carpet" icon="styles/standard/transport/aerialway/magic_carpet.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=magic_carpet" />
             <space />
@@ -2314,5 +2274,5 @@
             <text key="name" text="Name" />
         </item> <!-- Station -->
-        <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
+        <item name="Pylon" icon="styles/standard/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=pylon" />
             <space />
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 7914)
+++ trunk/data/validator/deprecated.mapcss	(revision 7915)
@@ -332,4 +332,5 @@
 /* see #10661, #10837 */
 *[barrier=yes],
+*[aerialway=yes],
 *[amenity=yes],
 *[place=yes] {
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 7914)
+++ trunk/data/validator/geometry.mapcss	(revision 7915)
@@ -4,4 +4,15 @@
 node[sidewalk],
 node[footway],
+node[aerialway=cable_car],
+node[aerialway=gondola],
+node[aerialway=chair_lift],
+node[aerialway=mixed_lift],
+node[aerialway=drag_lift],
+node[aerialway=t-bar],
+node[aerialway=j-bar],
+node[aerialway=platter],
+node[aerialway=magic_carpet],
+node[aerialway=rope_tow],
+node[aerialway=goods],
 node[waterway=river],
 node[waterway=riverbank],
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7914)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7915)
@@ -3369,14 +3369,4 @@
     dashes: 9,9;
 }
-node[aerialway=cable_car] {
-    icon-image: "transport/aerialway/cable_car.png";
-    set icon_z17;
-    text: auto;
-}
-node[aerialway=gondola] {
-    icon-image: "transport/aerialway/gondola.png";
-    set icon_z17;
-    text: auto;
-}
 way[aerialway=chair_lift] {
     width: 1;
@@ -3384,9 +3374,13 @@
     dashes: 6,6;
 }
-node[aerialway=chair_lift] {
-    icon-image: "transport/aerialway/chair_lift.png";
-    set icon_z17;
-    text: auto;
-}
+way[aerialway=mixed_lift] {
+    width: 1;
+    color: aerialway#663300;
+    dashes: 6,6,9,6;
+}
+way[aerialway=j-bar],
+way[aerialway=t-bar],
+way[aerialway=platter],
+way[aerialway=rope_tow],
 way[aerialway=drag_lift] {
     width: 1;
@@ -3394,22 +3388,8 @@
     dashes: 3,3;
 }
-node[aerialway=drag_lift] {
-    icon-image: "transport/aerialway/drag_lift.png";
-    set icon_z17;
-    text: auto;
-}
-area[aerialway=station],
-area[aerialway=pylon] {
-    fill-color: aerialway#663300;
-}
-node[aerialway=station] {
-    icon-image: "transport/aerialway/station.png";
-    set icon_z17;
-    text: auto;
-}
-node[aerialway=pylon] {
-    icon-image: "misc/landmark/power/tower_small.png";
-    set icon_z17;
-    text: auto;
+way[aerialway=magic_carpet] {
+    width: 1;
+    color: aerialway#663300;
+    dashes: 3,3;
 }
 way[aerialway=goods] {
@@ -3418,6 +3398,29 @@
     dashes: 2,2;
 }
+area[aerialway=station] {
+    fill-color: aerialway#663300;
+}
+node[aerialway=station] {
+    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],
+node[aerialway=gondola],
+node[aerialway=chair_lift],
+node[aerialway=mixed_lift],
+node[aerialway=drag_lift],
+node[aerialway=t-bar],
+node[aerialway=j-bar],
+node[aerialway=platter],
+node[aerialway=magic_carpet],
+node[aerialway=rope_tow],
 node[aerialway=goods] {
-    icon-image: "transport/aerialway/goods.png";
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;