Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15272)
+++ /trunk/data/defaultpresets.xml	(revision 15273)
@@ -1097,6 +1097,7 @@
             </optional>
             <optional text="Optional crossing attributes:">
-                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no" />
+                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+                <check key="crossing:island" text="With island" />
                 <check key="button_operated" text="Button operated" />
                 <check key="traffic_signals:sound" text="Sound signals" />
@@ -1140,5 +1141,4 @@
                 <list_entry value="uncontrolled" icon="presets/vehicle/crossing.svg" />
                 <list_entry value="traffic_signals" icon="presets/vehicle/crossing_traffic_signals.svg" />
-                <list_entry value="island" icon="presets/vehicle/crossing_island.svg" />
                 <list_entry value="unmarked" icon="presets/vehicle/crossing_unmarked.svg" />
             </combo>
@@ -1146,4 +1146,5 @@
             <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
             <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
+            <check key="crossing:island" text="With island" />
             <check key="bicycle" text="Cross by bicycle" />
             <check key="horse" text="Cross on horseback" />
@@ -1963,5 +1964,5 @@
             <key key="railway" value="crossing" />
             <optional>
-                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no" />
+                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals" />
                 <reference ref="supervised" />
                 <check key="horse" text="Cross on horseback" />
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 15272)
+++ /trunk/data/validator/deprecated.mapcss	(revision 15273)
@@ -1739,2 +1739,11 @@
   fixAdd: "access=yes";
 }
+
+/* #17330 */
+*[crossing=island] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "crossing:island=yes";
+  group: tr("deprecated tagging");
+  fixRemove: "crossing";
+  fixAdd: "crossing:island=yes";
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15272)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15273)
@@ -732,12 +732,12 @@
     set icon_z17;
 }
+node[highway=traffic_signals][crossing:island=yes] {
+    icon-image: "presets/vehicle/traffic_signals_crossing_island.svg";
+    set icon_z17;
+}
 node[highway=traffic_signals][crossing_ref=zebra] {
     icon-image: "presets/vehicle/traffic_signals_crossing_ref_zebra.svg";
     set icon_z17;
 }
-node[highway=traffic_signals][crossing=island] {
-    icon-image: "presets/vehicle/traffic_signals_crossing_island.svg";
-    set icon_z17;
-}
 node[highway=traffic_signals][crossing=traffic_signals] {
     icon-image: "presets/vehicle/traffic_signals_crossing_traffic_signals.svg";
@@ -768,10 +768,10 @@
     set icon_z17;
 }
+node[highway=crossing][crossing:island=yes] {
+    icon-image: "presets/vehicle/crossing_island.svg";
+    set icon_z17;
+}
 node[highway=crossing][crossing=unmarked] {
     icon-image: "presets/vehicle/crossing_unmarked.svg";
-    set icon_z17;
-}
-node[highway=crossing][crossing=island] {
-    icon-image: "presets/vehicle/crossing_island.svg";
     set icon_z17;
 }