Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7735)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7737)
@@ -2245,4 +2245,5 @@
 }
 area[amenity=drinking_water],
+area[amenity=water_point],
 area[amenity=fountain] {
     fill-color: light_water#00005f;
@@ -2250,4 +2251,9 @@
 node[amenity=drinking_water] {
     icon-image: "food/drinking_water.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=water_point] {
+    icon-image: "accommodation/camping/water.png";
     set icon_z17;
     text: auto;
@@ -3917,15 +3923,12 @@
     text: auto;
 }
-node[waterway=water_point] {
-    icon-image: "accommodation/camping/water.png";
-    set icon_z17;
-    text: auto;
-}
-node[waterway=waste_disposal] {
-    icon-image: "accommodation/camping/wastewater.png";
-    set icon_z17;
-    text: auto;
-}
+node[waterway=water_point],
+node[waterway=waste_disposal],
 node[waterway=mooring] {
+    icon-image: "misc/deprecated.png";
+    set icon_z17;
+    text: auto;
+}
+node[mooring] {
     icon-image: "nautical/marina.png";
     set icon_z17;