diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index b1cb3cffa6..45f1b6ac16 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -551,9 +551,9 @@ line[waterway]
 line[waterway][tunnel]
 {text: none;}
 
-/* 7. LANDUSE*/
+/* 7. LANDUSE */
 
-/*7.2 Hostital 7.3 University & Sport */
+/*7.2 Hospital 7.3 University & Sport */
 
 /* 	7.1 Industrial */
 
@@ -568,7 +568,7 @@ node|z15-[landuse=railway],
 node|z15-[landuse=quarry],
 {text: name;font-size: 10;text-color: @city_label;text-position: center;}
 
-/* 	7.4 Cemetry */
+/* 	7.4 Cemetery */
 
 area|z15-[landuse=cemetery],
 node|z17-[landuse=cemetery],
@@ -584,6 +584,7 @@ area|z15-[highway=pedestrian][area?],
 area|z15-[area:highway=pedestrian],
 area|z15-[highway=footway][area?][!sac_scale],
 area|z15-[area:highway=footway],
+area|z16-[place=square],
 {text: name;font-size: 11;text-color: @city_label;text-position: center;}
 
 /* 	7.6 Military */
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 3dfb1fed5c..ba2061591e 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -461,7 +461,6 @@ node|z14-[amenity=theatre],
 area|z14-[amenity=theatre],
 node|z14-[tourism=attraction],
 area|z14-[tourism=attraction],
-area|z14-[place=square],
 node|z14-[tourism=theme_park],
 area|z14-[tourism=theme_park],
 node|z14-[tourism=viewpoint],
@@ -692,15 +691,12 @@ area|z16-[tourism=artwork],
 
 node|z14[tourism=attraction],
 area|z14[tourism=attraction],
-area|z14[place=square],
 {icon-image: tourism-s.svg;icon-min-distance: 12;}
 node|z15[tourism=attraction],
 area|z15[tourism=attraction],
-area|z15[place=square],
 {icon-image: tourism-m.svg;icon-min-distance: 36;}
 node|z16-[tourism=attraction],
 area|z16-[tourism=attraction],
-area|z16-[place=square],
 {icon-image: tourism-m.svg;icon-min-distance: 24;}
 
 node|z14[tourism=theme_park],
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 61cce17cb8..8b352ff9e3 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -326,7 +326,7 @@ highway-secondary-tunnel                            # pathtext z10- (also has sh
 shop-mall                                           # icon z14- (also has caption(optional) z14-)
 === 5550
 
-place-square                                        # icon z14- (also has caption(optional) z14-)
+place-square                                        # caption z16-
 tourism-theme_park                                  # icon z14- (also has caption(optional) z14-)
 === 5500
 
@@ -1483,7 +1483,6 @@ amenity-parking-private                             # icon z18- (also has captio
 # shop-mall                                         # caption(optional) z14- (also has icon z14-)
 # === -4450
 
-# place-square                                      # caption(optional) z14- (also has icon z14-)
 # tourism-theme_park                                # caption(optional) z14- (also has icon z14-)
 # === -4500
 
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index a385ac59e0..00e5975fad 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -453,9 +453,9 @@ line|z15-[waterway=riverbank],
 line[waterway][tunnel]
 {text: none;}
 
-/* 7. LANDUSE*/
+/* 7. LANDUSE */
 
-/*7.2 Hostital 7.3 University & Sport */
+/*7.2 Hospital 7.3 University & Sport */
 
 /* 	7.1 Industrial */
 
@@ -468,13 +468,13 @@ node|z15-[landuse=railway],
 node|z15-[landuse=quarry],
 {text: name;font-size: 10;text-color: @city_label;text-position: center;}
 
-/* 	7.4 Cemetry */
+/* 	7.4 Cemetery */
 
 
 
 /* 	7.5 Pedestrian areas */
-
-
+area|z16-[place=square],
+{text: name;font-size: 10;text-color: @city_label;text-position: center;}
 
 /* 	7.6 Military */
 
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 84687b5bea..fc2e2ae1dd 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -458,6 +458,7 @@ natural-bay                                         # caption z14-
 natural-cape                                        # caption z14-
 place-farm                                          # caption z14-
 place-isolated_dwelling                             # caption z14-
+place-square                                        # caption z16-
 === 1400
 
 tourism-zoo                                         # icon z15- (also has caption(optional) z15-)