Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7629)
+++ /trunk/data/defaultpresets.xml	(revision 7630)
@@ -4744,4 +4744,10 @@
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
         </item> <!-- Swimming -->
+        <item name="Scuba Diving" icon="styles/standard/sport/scuba_diving.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=scuba_diving" />
+            <space />
+            <key key="sport" value="scuba_diving" />
+            <text key="name" text="Name" />
+        </item> <!-- Scuba Diving -->
         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 7629)
+++ /trunk/data/validator/deprecated.mapcss	(revision 7630)
@@ -314,2 +314,9 @@
   fixDeleteObject: this;
 }
+
+/* see #8281 */
+*[sport=diving] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}"); 
+  suggestAlternative: "sport=scuba_diving";
+  suggestAlternative: "sport=cliff_diving";
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7629)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7630)
@@ -3590,5 +3590,5 @@
 area[sport=rowing],
 area[sport=sailing],
-area[sport=diving],
+area[sport=scuba_diving],
 area[sport=badminton] {
     fill-color: sport#bde3cb;
@@ -3634,6 +3634,6 @@
     text: auto;
 }
-node[sport=diving] {
-    icon-image: "sport/diving.png";
+node[sport=scuba_diving] {
+    icon-image: "sport/scuba_diving.svg";
     set icon_z17;
     text: auto;