diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 0070e95a8..9f490f5f8 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -497,7 +497,10 @@ area|z13-[leisure=resort],
 area|z13-[highway=services],
 area|z13-[highway=rest_area],
 area|z13-[landuse=garages],
+area|z13-[amenity=ranger_station],
+area|z13-[tourism=information][information=visitor_centre],
 
+area|z15-[tourism=information][information=office],
 area|z15-[leisure=dog_park],
 area|z15-[amenity=police],
 area|z15-[amenity=courthouse],
@@ -510,6 +513,8 @@ area|z15-[amenity=vehicle_inspection],
 area|z15-[amenity=car_wash],
 area|z15-[amenity=charging_station][motorcar?],
 area|z15-[amenity=fuel],
+area|z15-[amenity=motorcycle_parking],
+area|z15-[amenity=bicycle_parking],
 {fill-opacity: 1; fill-color: @general_area;}
 
 
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 29811332f..2d32ee8f0 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
@@ -60,6 +60,7 @@ amenity-marketplace                                 # area z15- (also has icon z
 amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-ranger_station
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
@@ -71,6 +72,8 @@ leisure-resort                                      # area z13- (also has icon z
 leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
 office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
 tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
+tourism-information-office
+tourism-information-visitor_centre
 === 170
 
 highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
@@ -114,6 +117,9 @@ amenity-parking-private                             # area z17- (also has icon z
 amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-bicycle_parking
+amenity-bicycle_parking-covered
+amenity-motorcycle_parking
 === 100
 
 natural-wetland                                     # area z11- (also has caption z16-)
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index e148a774c..934d9d80f 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -335,8 +335,8 @@ node|z15-[tourism=information][information=guidepost],
 node|z15-[tourism=information][information=map],
 {icon-image: map.svg;}
 
-node|z14-[amenity=ranger_station],
-{icon-image: ranger-station-m.svg; icon-min-distance: 10;}
+node|z13-[amenity=ranger_station],
+{icon-image: ranger-station-m.svg;}
 
 node|z14-[man_made=survey_point],
 {icon-image: survey_point-m.svg; font-size: 11;}
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 658fd2e93..3976c68d3 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
@@ -60,6 +60,7 @@ amenity-marketplace                                 # area z15- (also has icon z
 amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-ranger_station
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
@@ -71,6 +72,8 @@ leisure-resort                                      # area z13- (also has icon z
 leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
 office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
 tourism-camp_site                                   # area z13- (also has icon z13-, caption(optional) z13-)
+tourism-information-office
+tourism-information-visitor_centre
 === 170
 
 highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
@@ -114,6 +117,9 @@ amenity-parking-private                             # area z17- (also has icon z
 amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-bicycle_parking
+amenity-bicycle_parking-covered
+amenity-motorcycle_parking
 === 100
 
 natural-wetland                                     # area z11- (also has caption z16-)
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 400524b5a..1d008da37 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -350,6 +350,7 @@ area|z15-[amenity=charging_station][motorcar?],
 area|z15-[amenity=fuel],
 area|z17-[amenity=vehicle_inspection],
 area|z17-[amenity=car_wash],
+area|z17-[amenity=motorcycle_parking],
 {fill-opacity: 1; fill-color: @general_area;}
 
 /* 7.6 Airports */
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index 4b6ad4ee1..e0a1b5761 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -28,6 +28,7 @@ amenity-parking-private                             # area z15- (also has icon z
 amenity-parking-street_side                         # area z15- (also has icon z17-)
 amenity-parking-street_side-fee                     # area z15- (also has icon z15-)
 amenity-parking-street_side-private                 # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-motorcycle_parking
 === 160
 
 amenity-car_wash                                    # area z17- (also has icon z17-, caption(optional) z17-)