Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10797)
+++ /trunk/data/defaultpresets.xml	(revision 10798)
@@ -9346,4 +9346,12 @@
             <text key="species" text="Species" />
         </item> <!-- Plant Nursery -->
+        <item name="Aquaculture" icon="presets/landuse/aquaculture.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=aquaculture" />
+            <space />
+            <key key="landuse" value="aquaculture" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="aquaculture" text="Aquaculture" values="shrimp,fish,mussels" />
+        </item> <!-- Aquaculture -->
         <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 10797)
+++ /trunk/data/validator/combinations.mapcss	(revision 10798)
@@ -293,6 +293,5 @@
 
 /* #6932 */
-*[natural=water][leisure=swimming_pool],
-*[natural=water][amenity=swimming_pool] {
+*[natural=water][leisure=swimming_pool] {
   throwWarning: tr("natural water used for swimming pool");
   fixRemove: "natural";
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 10797)
+++ /trunk/data/validator/deprecated.mapcss	(revision 10798)
@@ -319,4 +319,12 @@
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
+}
+
+node[type=palm],
+way[type=palm] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type";
+  suggestAlternative: "trees";
+  suggestAlternative: "species";
 }
 
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10797)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10798)
@@ -3229,4 +3229,7 @@
     fill-color: green#b1e0c2;
 }
+area[landuse=aquaculture] {
+    fill-color: aquaculture#189dff;
+}
 area[landuse=grass] {
     fill-color: grass#97ca96;
@@ -4182,8 +4185,4 @@
 node[natural=tree][leaf_type=broadleaved] {
     icon-image: "presets/landmark/trees_broad_leaved.svg";
-    set icon_z17;
-}
-node[natural=tree][type=palm] {
-    icon-image: "presets/landmark/trees_palm.png";
     set icon_z17;
 }