diff --git a/data/styles/default/dark/symbols/security-m.svg b/data/styles/default/dark/symbols/security-m.svg
index 07af1bbb9..1bdb80511 100644
--- a/data/styles/default/dark/symbols/security-m.svg
+++ b/data/styles/default/dark/symbols/security-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#717065"/>
+ <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
  <path d="m13.295 7.9993h-8.5898v1.2734c0 2.6488 1.8321 5.1251 4.2949 5.7266 2.4627-0.60136 4.2949-3.0776 4.2949-5.7266zm-4.2949 0.49805 0.73633 1.7363 1.8887 0.16211-1.4316 1.2363 0.42969 1.8516-1.623-0.97656-1.623 0.97656 0.42969-1.8457-1.4316-1.2363 1.8906-0.16211z" fill="#000"/>
  <path d="m11.5 7v-1c0-1.3807-1.1193-2.5-2.5-2.5s-2.5 1.1193-2.5 2.5v1" fill="none" stroke="#000" stroke-width="1.5"/>
 </svg>
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index a456e49de..70851cc51 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -803,8 +803,6 @@ node|z17-[amenity=cinema],
 node|z17-[amenity=ice_cream],
 node|z17-[leisure=bowling_alley],
 node|z17-[amenity=police],
-node|z17-[building=guardhouse],
-node|z17-[office=security],
 node|z17-[amenity=prison],
 node|z17-[office=diplomatic],
 node|z17-[office=lawyer],
@@ -839,6 +837,8 @@ node|z18-[amenity=waste_disposal],
 node|z18-[amenity=recycling],
 node|z18-[amenity=waste_transfer_station],
 node|z18-[amenity=hunting_stand],
+node|z18-[building=guardhouse],
+node|z18-[office=security],
 node|z18-[shop=lottery],
 node|z18-[shop=hearing_aids],
 node|z18-[man_made=chimney],
@@ -1286,16 +1286,20 @@ node|z17-[leisure=bowling_alley],
 node|z18-[leisure=bowling_alley],
 {font-size: 11;}
 
-node|z17-[building=guardhouse],
-node|z17-[office=security],
-{icon-image: security-m.svg;}
 node|z17-[amenity=police],
 {icon-image: police-m.svg;}
-node|z18-[building=guardhouse],
-node|z18-[office=security],
 node|z18-[amenity=police],
 {font-size: 11;}
 
+node|z18-[building=guardhouse],
+node|z18-[office=security],
+{icon-image: security-m.svg; font-size: 11;}
+/* Reset captions inherited from [building], leave only main label z18- */
+node|z16-17[building=guardhouse],
+{text: none;}
+node|z16-[building=guardhouse]::int_name,
+{text: none;}
+
 node|z17-[amenity=prison],
 {icon-image: prison-m.svg;}
 node|z18-[amenity=prison],
@@ -2285,6 +2289,8 @@ node[sport=yoga],
 node[amenity=car_rental],
 node[amenity=car_sharing],
 node[amenity=fire_station],
+node[building=guardhouse],
+node[office=security],
 {text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
 node[amenity=bicycle_rental],
diff --git a/data/styles/default/light/symbols/security-m.svg b/data/styles/default/light/symbols/security-m.svg
index 0659b6568..ab5037e41 100644
--- a/data/styles/default/light/symbols/security-m.svg
+++ b/data/styles/default/light/symbols/security-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#717065"/>
+ <circle cx="9" cy="9" r="8.25" fill="#747E86"/>
  <path d="m13.295 7.9993h-8.5898v1.2734c0 2.6488 1.8321 5.1251 4.2949 5.7266 2.4627-0.60136 4.2949-3.0776 4.2949-5.7266zm-4.2949 0.49805 0.73633 1.7363 1.8887 0.16211-1.4316 1.2363 0.42969 1.8516-1.623-0.97656-1.623 0.97656 0.42969-1.8457-1.4316-1.2363 1.8906-0.16211z" fill="#fff"/>
  <path d="m11.5 7v-1c0-1.3807-1.1193-2.5-2.5-2.5s-2.5 1.1193-2.5 2.5v1" fill="none" stroke="#fff" stroke-width="1.5"/>
 </svg>
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index eb73f9a12..8e5b05e8e 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -284,6 +284,10 @@ node|z12-[barrier=border_control],
 node|z14-[barrier=border_control],
 {icon-image: bcontrol-m.svg;}
 
+node|z16-[building=guardhouse],
+node|z17-[office=security],
+{icon-image: security-m.svg;}
+
 node|z14-[highway=ford],
 {icon-image: ford-m.svg;}
 
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index 3536ee37a..418aa675d 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -524,14 +524,6 @@ node|z19-[building],
 node|z19-[building]::int_name,
 {font-size: 13;}
 
-/* ToDo text: none; doesn't work here ..  */
-node|z18-[building=guardhouse],
-area|z18-[building=guardhouse],
-node|z18-[building=guardhouse]::int_name,
-area|z18-[building=guardhouse]::int_name,
-{text-offset: 1;}
-
-
 node|z18[addr:housenumber][addr:street],
 {font-size: 13;}
 node|z19-[addr:housenumber][addr:street],
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 96f815c12..b4cf45ef9 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -462,12 +462,17 @@ node|z17[amenity=bank],
 node|z18-[amenity=bank],
 {icon-image: bank-m.svg;font-size: 14.5; icon-min-distance: 10;}
 
-node|z17-[building=guardhouse],
-node|z17-[office=security],
+node|z18-[building=guardhouse],
+node|z18-[office=security],
 {icon-image: security-m.svg;}
+/* Reset captions inherited from [building] */
+node|z18-[building=guardhouse],
+{text: none;}
+node|z18-[building=guardhouse]::int_name,
+{text: none;}
+
 node|z17-[amenity=police],
 {icon-image: police-m.svg;}
-
 node|z17[amenity=police],
 {font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=police],