diff --git a/amenity-points.mss b/amenity-points.mss
index 00aa93bbcd..6e6e7a8d15 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -143,7 +143,7 @@
   }
 
   [feature = 'barrier_toll_booth'][zoom >= 16] {
-    marker-file: url('symbols/toll_booth.svg');
+    marker-file: url('symbols/barrier/toll_booth.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
@@ -1499,7 +1499,7 @@
 
   [feature = 'barrier_gate']::barrier {
     [zoom >= 17] {
-      marker-file: url('symbols/gate.svg');
+      marker-file: url('symbols/barrier/gate.svg');
       marker-placement: interior;
       marker-clip: false;
     }
@@ -1507,12 +1507,26 @@
 
   [feature = 'barrier_lift_gate'][zoom >= 17]::barrier,
   [feature = 'barrier_swing_gate'][zoom >= 17]::barrier {
-    marker-file: url('symbols/liftgate.svg');
+    marker-file: url('symbols/barrier/lift_gate.svg');
     marker-fill: #3f3f3f;
     marker-placement: interior;
     marker-clip: false;
   }
 
+  [feature = 'barrier_cattle_grid'][zoom >= 17]::barrier {
+    marker-file: url('symbols/barrier/cattle_grid.svg');
+    marker-fill: #3f3f3f;
+    marker-placement: interior;
+    marker-clip: false;
+  }
+
+  [feature = 'barrier_stile'][zoom >= 17]::barrier {
+    marker-file: url('symbols/barrier/stile.svg');
+    marker-fill: #3f3f3f;
+    marker-placement: interior;
+    marker-clip: false; 
+  }
+
   [feature = 'barrier_bollard'],
   [feature = 'barrier_block'],
   [feature = 'barrier_log'] {
diff --git a/project.mml b/project.mml
index 108d1d2dcf..52b258b11b 100644
--- a/project.mml
+++ b/project.mml
@@ -2478,7 +2478,7 @@ Layer:
                             'waste_basket', 'waste_disposal') THEN amenity ELSE NULL END,
               'historic_' || CASE WHEN historic IN ('wayside_cross', 'wayside_shrine') THEN historic ELSE NULL END,
               'man_made_' || CASE WHEN man_made IN ('cross') THEN man_made ELSE NULL END,
-              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log') THEN barrier ELSE NULL END
+              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile') THEN barrier ELSE NULL END
             )  AS feature,
             access,
             CASE WHEN amenity IN ('waste_basket', 'waste_disposal') THEN 2 ELSE 1 END AS prio
@@ -2488,7 +2488,7 @@ Layer:
              OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench', 'waste_basket', 'waste_disposal')
              OR historic IN ('wayside_cross', 'wayside_shrine')
              OR man_made IN ('cross')
-             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log')
+             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile')
           ORDER BY prio
           ) AS amenity_low_priority
     properties:
@@ -2504,12 +2504,12 @@ Layer:
             way,
             COALESCE(
               'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
-              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log') THEN barrier ELSE NULL END
+              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile') THEN barrier ELSE NULL END
             )  AS feature,
             access
           FROM planet_osm_polygon p
           WHERE amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
-             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log')
+             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile')
           ) AS amenity_low_priority_poly
     properties:
       minzoom: 14
diff --git a/symbols/barrier/cattle_grid.svg b/symbols/barrier/cattle_grid.svg
new file mode 100644
index 0000000000..869fb8d2f4
--- /dev/null
+++ b/symbols/barrier/cattle_grid.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="14"
+   height="14"
+   viewBox="0 0 3.7041666 3.7041668"
+   version="1.1"
+   id="svg8">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.71428572,0,0,1,0.52916667,-293.29582)">
+    <rect
+       style="opacity:1;fill:#000000;fill-rule:evenodd;stroke-width:0.18708189"
+       id="rect53"
+       width="3.7041667"
+       height="0.26456413"
+       x="0"
+       y="294.35419"
+       ry="9.9553893e-007" />
+    <rect
+       style="opacity:1;fill:#000000;fill-rule:evenodd;stroke-width:0.18708476"
+       id="rect55"
+       width="3.7041667"
+       height="0.26457226"
+       x="4.9227904e-008"
+       y="294.88333"
+       ry="9.9556951e-007" />
+    <rect
+       style="opacity:1;fill:#000000;fill-rule:evenodd;stroke-width:0.18708764"
+       id="rect57"
+       width="3.7041667"
+       height="0.2645804"
+       x="0"
+       y="295.41248"
+       ry="9.9560009e-007" />
+    <rect
+       style="opacity:1;fill:#000000;fill-rule:evenodd;stroke-width:0.18708764"
+       id="rect57-6"
+       width="3.7041667"
+       height="0.2645804"
+       x="1.0883254e-007"
+       y="295.94165"
+       ry="9.9560009e-007" />
+  </g>
+</svg>
diff --git a/symbols/gate.svg b/symbols/barrier/gate.svg
similarity index 100%
rename from symbols/gate.svg
rename to symbols/barrier/gate.svg
diff --git a/symbols/liftgate.svg b/symbols/barrier/lift_gate.svg
similarity index 100%
rename from symbols/liftgate.svg
rename to symbols/barrier/lift_gate.svg
diff --git a/symbols/barrier/stile.svg b/symbols/barrier/stile.svg
new file mode 100644
index 0000000000..d089ff212d
--- /dev/null
+++ b/symbols/barrier/stile.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 3.7041666 3.7041668"
+   height="14"
+   width="14">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-293.29582)"
+     id="layer1">
+    <path
+       id="rect22"
+       transform="matrix(0.26458334,0,0,0.26458334,0,293.29582)"
+       d="M 4.5,2 C 4.223,2 4,2.223 4,2.5 4,5.6666667 4,8.8333333 4,12 h 1 v -1 h 4 v 1 h 1 C 10,8.8333333 10,5.6666667 10,2.5 10,2.223 9.777,2 9.5,2 9.223,2 9,2.223 9,2.5 9,3.6666667 9,4.8333333 9,6 H 5 C 5,4.8333333 5,3.6666667 5,2.5 5,2.223 4.777,2 4.5,2 Z M 5,7 H 9 V 8 H 5 Z m 0,2 h 4 v 1 H 5 Z"
+       style="opacity:1;fill:#000000;fill-rule:evenodd;stroke-width:1" />
+  </g>
+</svg>
diff --git a/symbols/toll_booth.svg b/symbols/barrier/toll_booth.svg
similarity index 100%
rename from symbols/toll_booth.svg
rename to symbols/barrier/toll_booth.svg