diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index a5ad0d764..46ca90a9e 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -241,7 +241,6 @@ area|z15-[natural=water][tunnel],
 {fill-opacity: 0.15;}
 
 area|z11-[natural=wetland],
-area|z11-[leisure=marina],
 area|z13-[leisure=swimming_pool],
 area|z16-[amenity=fountain],
 {fill-opacity: 1;}
@@ -336,7 +335,6 @@ area|z10-[aeroway=aerodrome][aerodrome=international],
 area|z10-[aeroway=aerodrome],
 area|z14-[amenity=hospital],
 area|z14-[amenity=doctors],
-area|z14-[healthcare=laboratory],
 area|z14-[highway=pedestrian][area?],
 area|z14-[area:highway=pedestrian],
 area|z14-[highway=footway][area?],
@@ -445,12 +443,35 @@ area|z16-[railway=platform],
 
 /* Generic amenities */
 
-area|z14-[amenity=place_of_worship],
-area|z15-[tourism=camp_site],
-area|z15-[leisure=resort],
-area|z16-[amenity=police],
+/*
+Might be problematic as marina areas encompass both land and water,
+need to make sure that coastline water is rendered on top.
+area|z13-[leisure=marina],
+*/
+
+area|z13-[leisure=water_park],
+area|z13-[amenity=place_of_worship],
+area|z13-[tourism=camp_site],
+area|z13-[emergency=mountain_rescue],
+area|z13-[leisure=resort],
+area|z13-[highway=services],
+area|z13-[highway=rest_area],
+
+area|z15-[leisure=dog_park],
+area|z15-[amenity=police],
+area|z15-[amenity=courthouse],
+area|z15-[amenity=fire_station],
+area|z15-[amenity=recycling][recycling_type=centre],
+area|z15-[amenity=social_facility],
+area|z15-[amenity=marketplace],
+area|z15-[office=diplomatic],
+area|z15-[amenity=vehicle_inspection],
+area|z15-[amenity=car_wash],
+area|z15-[amenity=charging_station][motorcar?],
+area|z15-[amenity=fuel],
 {fill-opacity: 1; fill-color: @general_area;}
 
+
 /* 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 dc27c5c86..94a56deea 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
@@ -50,9 +50,24 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180
 
+amenity-courthouse
+amenity-car_wash
+amenity-fire_station
+amenity-marketplace
 amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
+amenity-recycling-centre
+amenity-social_facility
+amenity-vehicle_inspection
+amenity-charging_station-motorcar
+amenity-fuel
+emergency-mountain_rescue
+highway-services
+highway-rest_area
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+leisure-dog_park
 leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-water_park
+office-diplomatic
 tourism-camp_site                                   # area z15- (also has icon z16-, caption(optional) z16-)
 === 170
 
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index 0860fd5f6..b4dc638ea 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -73,10 +73,6 @@ 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 9e6643e4f..d20a8d50b 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
@@ -50,9 +50,25 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180
 
+amenity-courthouse
+amenity-car_wash
+amenity-fire_station
+amenity-marketplace
 amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
+amenity-recycling-centre
+amenity-social_facility
+amenity-vehicle_inspection
+amenity-charging_station-motorcar
+amenity-fuel
+emergency-mountain_rescue
+highway-services
+highway-rest_area
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+landuse-garages
+leisure-dog_park
 leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-water_park
+office-diplomatic
 tourism-camp_site                                   # area z13- (also has icon z13-, caption(optional) z13-)
 === 170
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 33c7584dd..57c4c5489 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -284,7 +284,6 @@ area|z10-[aeroway=aerodrome][aerodrome=international],
 area|z10-[aeroway=aerodrome],
 area|z14-[amenity=hospital],
 area|z14-[amenity=doctors],
-area|z14-[healthcare=laboratory],
 area|z14-[highway=pedestrian][area?],
 area|z14-[area:highway=pedestrian],
 area|z14-[highway=footway][area?],