[styles] Adjust/fix guardhouses and security offices

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

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],