diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 276111e2c0..3b6d718c78 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1982,11 +1982,13 @@ node|z15-[barrier=border_control]
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
 node|z16-[barrier=chain],
+node|z16-[barrier=stile],
+{icon-image: dot-m.svg;font-size: 11;}
+
 node|z16-[barrier=entrance],
 node|z16-[barrier=gate],
 node|z16-[barrier=kissing_gate],
-node|z16-[barrier=stile],
-{icon-image: dot-m.svg;font-size: 11;}
+{icon-image: gate-s.svg;font-size: 11;}
 
 node|z16-[highway=ford],
 /* ToDo: Make separate tower icon? Because of a good landmark */
@@ -2156,10 +2158,10 @@ area|z18-[amenity=vending_machine][vending=fuel]
 
 node|z17-[aeroway=gate],
 area|z17-[aeroway=gate]
-{icon-image: gate-m.svg;font-size: 11;}
+{icon-image: airport_gate-m.svg;font-size: 11;}
 node|z18-[aeroway=gate],
 area|z18-[aeroway=gate]
-{icon-image: gate-m.svg;font-size: 11;z-index: 24200;}/*check*/
+{icon-image: airport_gate-m.svg;font-size: 11;z-index: 24200;}/*check*/
 
 area|z17-[amenity=bureau_de_change],
 node|z17-[amenity=bureau_de_change],
diff --git a/data/styles/clear/style-clear/symbols/gate-m.svg b/data/styles/clear/style-clear/symbols/airport_gate-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/gate-m.svg
rename to data/styles/clear/style-clear/symbols/airport_gate-m.svg
diff --git a/data/styles/clear/style-clear/symbols/gate-s.svg b/data/styles/clear/style-clear/symbols/gate-s.svg
new file mode 100644
index 0000000000..6e29c6eab9
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/gate-s.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12pt" height="12pt" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.7144 0.85719c-0.29402 9.9153e-4 -0.58285 0.16454-0.73337 0.4171l-0.77921 1.2972h-5.3445c-0.22461-3.163e-4 -0.44851 0.090982-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498-0.22461-3.163e-4 -0.44851 0.090981-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498h1.2307l-0.25209 0.4171c-0.15527 0.25857-0.16021 0.60164-0.01146 0.86402 0.14875 0.26238 0.44552 0.4336 0.74713 0.43315h1.7143c0.29351-4.33e-4 0.58218-0.16325 0.73337-0.41481l0.77921-1.2995h5.3445c0.22462 3.164e-4 0.44851-0.090982 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.12e-4 -0.22461-0.09099-0.44851-0.24981-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498 0.22461 3.163e-4 0.44851-0.090981 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.16e-4 -0.22461-0.090986-0.44851-0.2498-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498h-1.2307l0.25209-0.4171c0.15527-0.25857 0.16021-0.60164 0.01146-0.86402-0.14875-0.26238-0.44552-0.4336-0.74713-0.43315z" fill="#fff" opacity=".6" stroke-width="1.2"/>
+ <path d="m7.7145 1.7136-1.0281 1.7145h-5.8302v1.7145h4.8021l-1.0314 1.7145h-3.7706v1.7145h2.7426l-1.0281 1.7145h1.7145l1.0281-1.7145h5.8302v-1.7145h-4.8021l1.0314-1.7145h3.7706v-1.7145h-2.7426l1.0281-1.7145z" fill="#555" stroke-width="1.2"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/gate-m.svg b/data/styles/clear/style-night/symbols/airport_gate-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/gate-m.svg
rename to data/styles/clear/style-night/symbols/airport_gate-m.svg
diff --git a/data/styles/clear/style-night/symbols/gate-s.svg b/data/styles/clear/style-night/symbols/gate-s.svg
new file mode 100644
index 0000000000..e99f55549e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/gate-s.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12pt" height="12pt" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.7144 0.85719c-0.29402 9.9153e-4 -0.58285 0.16454-0.73337 0.4171l-0.77921 1.2972h-5.3445c-0.22461-3.163e-4 -0.44851 0.090982-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498-0.22461-3.163e-4 -0.44851 0.090981-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498h1.2307l-0.25209 0.4171c-0.15527 0.25857-0.16021 0.60164-0.01146 0.86402 0.14875 0.26238 0.44552 0.4336 0.74713 0.43315h1.7143c0.29351-4.33e-4 0.58218-0.16325 0.73337-0.41481l0.77921-1.2995h5.3445c0.22462 3.164e-4 0.44851-0.090982 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.12e-4 -0.22461-0.09099-0.44851-0.24981-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498 0.22461 3.163e-4 0.44851-0.090981 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.16e-4 -0.22461-0.090986-0.44851-0.2498-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498h-1.2307l0.25209-0.4171c0.15527-0.25857 0.16021-0.60164 0.01146-0.86402-0.14875-0.26238-0.44552-0.4336-0.74713-0.43315z" opacity=".6" stroke-width="1.2"/>
+ <path d="m7.7145 1.7136-1.0281 1.7145h-5.8302v1.7145h4.8021l-1.0314 1.7145h-3.7706v1.7145h2.7426l-1.0281 1.7145h1.7145l1.0281-1.7145h5.8302v-1.7145h-4.8021l1.0314-1.7145h3.7706v-1.7145h-2.7426l1.0281-1.7145z" fill="#fff" opacity=".6" stroke-width="1.2"/>
+</svg>