Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9092)
+++ /trunk/data/defaultpresets.xml	(revision 9093)
@@ -2261,8 +2261,4 @@
             <key key="waterway" value="turning_point" />
         </item> <!-- Turning Point -->
-        <item name="Buoy" icon="styles/standard/nautical/buoy.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:seamark=buoy" />
-            <key key="seamark" value="buoy" />
-        </item> <!-- Buoy -->
         <separator/>
         <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node,way" preset_name_label="true">
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 9092)
+++ /trunk/data/validator/deprecated.mapcss	(revision 9093)
@@ -564,2 +564,13 @@
   suggestAlternative: "landuse=farmyard";
 }
+
+/* #12135 comment:11 */
+*[seamark=buoy]["seamark:type"=~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "{1.tag}";
+  fixRemove: "seamark";
+}
+*[seamark=buoy]["seamark:type"!~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "{1.tag}";
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 9092)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 9093)
@@ -3474,5 +3474,4 @@
 node[railway=signal] {
     icon-image: "vehicle/railway_signal.svg";
-    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -4226,9 +4225,4 @@
 node[waterway=turning_point] {
     icon-image: "nautical/turning.png";
-    set icon_z17;
-    text: auto;
-}
-node[seamark=buoy] {
-    icon-image: "nautical/buoy.svg";
     set icon_z17;
     text: auto;