diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index b0db4ee73a..1e07b0c044 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -691,6 +691,9 @@ area|z18-[waterway=dam],
 area|z18-[landuse=garages],
 {fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
 
+area|z14-[waterway=dam],
+{fill-position: background;}
+
 
 /* 8.3 Barriers, cliffs */
 
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index 1b0f706413..68345ceb93 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -58,13 +58,10 @@ node[place=continent]
 {z-index: 999;}
 
 node[place=country],
-area[man_made=pier],
-area[man_made=breakwater],
 line[man_made=pier],
 line[man_made=breakwater],
 node[man_made=pier],
 node[man_made=breakwater],
-area[waterway=dam],
 line[waterway=dam],
 line[waterway=weir],
 node[waterway=weir],
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index b1f7cbaf1e..9b7e475284 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -575,6 +575,9 @@ area|z16-[waterway=dam],
 area|z16-[landuse=garages],
 {fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}
 
+area|z15-[waterway=dam],
+{fill-position: background;}
+
 
 /* 8.3 Barriers, cliffs */
 
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index 8a1f0bef91..520f6ea17c 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -50,13 +50,10 @@ node[place=continent]
 {z-index: 999;}
 
 node[place=country],
-area[man_made=pier],
-area[man_made=breakwater],
 line[man_made=pier],
 line[man_made=breakwater],
 node[man_made=pier],
 node[man_made=breakwater],
-area[waterway=dam],
 line[waterway=dam],
 line[waterway=weir],
 node[waterway=weir],