diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 5e0917f23f..915c29d96e 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -33,6 +33,15 @@
 area[natural=coastline]
 {z-index: -10;}
 
+/* These are foreground areas with semi-transparent hardcoded hatching-style fills.
+   They are rendered over all other background areas only.
+   And we want lines to be rendered above them, hence minimum z-index.
+*/
+area[leisure=nature_reserve],
+area[boundary=national_park],
+area[landuse=military],
+{z-index: 0;}
+
 area[natural=land],
 area[place=islet]
 {z-index: 0;}
@@ -166,13 +175,6 @@ line[boundary=military]
 line[boundary=administrative]
 {z-index: 130;}
 
-area[leisure=nature_reserve],
-area[boundary=national_park],
-area[landuse=military],
-area[landuse=military][military=danger_area][wikipedia?],
-area[landuse=military][military=cordon][wikipedia?]
-{z-index: 140;}
-
 line[natural=cliff],
 line[natural=earth_bank],
 line[man_made=embankment],
@@ -321,14 +323,13 @@ area|z12-13[landuse=field],
 /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
 area|z10-[leisure=nature_reserve],
 area|z10-[boundary=national_park],
-{fill-position: background; fill-opacity: 0.2; fill-color: @green6;}
+{fill-opacity: 0.2; fill-color: @green6;}
 
-area|z10-[landuse=military][military=danger_area][wikipedia?],
-area|z10-[landuse=military][military=cordon][wikipedia?],
-{fill-position: background; fill-opacity: 1.0; fill-color: @military;}
+area|z10-[landuse=military][military=danger_area],
+{fill-opacity: 1.0; fill-color: @military;}
 
 area|z12-[landuse=military]
-{fill-position: background; fill-opacity: 0.5; fill-color: @military;}
+{fill-opacity: 0.5; fill-color: @military;}
 /* End of hardcoded */
 
 area|z14[landuse=forest],
@@ -390,7 +391,7 @@ line|z13-[waterway=stream],
 line|z13-[waterway=stream][intermittent=yes],
 line|z13-[waterway=canal],
 line|z13-[natural=strait],
-{opacity: 1; color: @river; -x-me-line-priority: 999;}
+{opacity: 1; color: @river; -x-me-line-priority: 1005;}
 
 /* 6.1 Area water(lake,pond etc.) */
 
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index a3f8c191d3..502515568a 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -65,8 +65,6 @@ node[man_made=breakwater],
 line[waterway=dam],
 line[waterway=weir],
 node[waterway=weir],
-area[landuse=military],
-node[landuse=military]
 {z-index: 1000;}
 
 node[place=state]
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 9c98617555..88df482526 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -360,10 +360,6 @@ area[office=lawyer]
 node[man_made=lighthouse],
 area[man_made=lighthouse],
 node[barrier=border_control],
-node[boundary=national_park],
-area[boundary=national_park],
-node[leisure=nature_reserve],
-area[leisure=nature_reserve]
 {z-index: 2700;}
 
 node[tourism=artwork],