Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 15066)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 15081)
@@ -4293,17 +4293,27 @@
     set icon_z17;
 }
-area[natural=bay],
+area[natural=bay]:closed {
+    fill-color: natural#002f00;
+}
+way[natural=bay] {
+    width: 2;
+    color: natural#002f00;
+}
+node[natural=bay] {
+    icon-image: "presets/nautical/bay.svg";
+    set icon_z17;
+}
 area[natural=cape],
 area[natural=cave_entrance] {
     fill-color: natural#002f00;
 }
-node[natural=bay] {
-    icon-image: "presets/nautical/bay.svg";
-    set icon_z17;
-}
 node[natural=cape] {
     icon-image: "presets/nautical/cape.svg";
     set icon_z17;
 }
+node[natural=cave_entrance] {
+    icon-image: "presets/landmark/cave_entrance.svg";
+    set icon_z17;
+}
 area[natural=reef] {
     fill-color: reef#80c9ff;
@@ -4311,8 +4321,4 @@
 node[natural=reef] {
     icon-image: "presets/landmark/reef.svg";
-    set icon_z17;
-}
-node[natural=cave_entrance] {
-    icon-image: "presets/landmark/cave_entrance.svg";
     set icon_z17;
 }