diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 7c1a24e1c..d5b141270 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -361,7 +361,6 @@ area|z15-[amenity=college],
 area|z15-[amenity=school],
 area|z15-[landuse=education],
 area|z16-[public_transport=platform],
-area|z16-[amenity=place_of_worship],
 area|z16-[railway=platform],
 area|z15-[leisure=playground],
 {fill-opacity: 1;}
@@ -431,7 +430,6 @@ area|z14-[area:highway=pedestrian],
 area|z14-[highway=footway][area?],
 area|z14-[area:highway=footway],
 area|z14-[area:highway=living_street],
-area|z16-[amenity=place_of_worship]
 {fill-color: @pedestrian_area;}
 
 area|z16-[highway=pedestrian][area?],
@@ -445,6 +443,14 @@ area|z16-[public_transport=platform],
 area|z16-[railway=platform],
 {fill-color: @railway_platform;}
 
+/* Generic amenities */
+
+area|z14-[amenity=place_of_worship],
+area|z15-[tourism=camp_site],
+area|z15-[leisure=resort],
+area|z16-[amenity=police],
+{fill-opacity: 1; fill-color: @pedestrian_area_light;}
+
 /* 7.6 Airports */
 
 area|z10[aeroway=aerodrome][aerodrome=international],
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index b1287d7e8..8cebc5183 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -51,6 +51,9 @@ landuse-cemetery-christian                          # area z14- (also has icon z
 === 180
 
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+tourism-camp_site
+leisure-resort
+amenity-police
 === 170
 
 highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index b4dc638ea..0860fd5f6 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -73,6 +73,10 @@ line[waterway][tunnel]
 {width: 0;}
 
 
+area|z13-[tourism=camp_site],
+{fill-opacity: 1; fill-color: @pedestrian_area_light;}
+
+
 line|z13-[man_made=cutline],
 {width: 1.7; color: @green0; opacity: 0.6;}
 line|z14[man_made=cutline],
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index f306a68de..1da8e4d8d 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -51,6 +51,9 @@ landuse-cemetery-christian                          # area z14- (also has icon z
 === 180
 
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+tourism-camp_site
+leisure-resort
+amenity-police
 === 170
 
 highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 0711d97bc..33c7584dd 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -302,7 +302,6 @@ area|z15-[landuse=quarry],
 area|z15-[leisure=stadium],
 area|z15-[amenity=parking],
 area|z16-[public_transport=platform],
-area|z16-[amenity=place_of_worship],
 area|z16-[railway=platform],
 {fill-opacity: 1;}