diff --git a/icons/poi_gravestone.svg b/icons/poi_gravestone.svg
new file mode 100644
index 000000000..2abd5eb25
--- /dev/null
+++ b/icons/poi_gravestone.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+ <path d="M0 13H16V16H0zM7 0c-2.216 0-4 1.784-4 4v4 4h4 2 4v-4-4c0-2.216-1.784-4-4-4h-2z"/>
+</svg>
diff --git a/src/constants/color.js b/src/constants/color.js
index e2bf7bdc7..dd13e246a 100644
--- a/src/constants/color.js
+++ b/src/constants/color.js
@@ -15,8 +15,11 @@ export const hueBorderCasing = 281;
 export const border = "hsl(0, 2%, 47%)";
 export const borderCasing = `hsl(${hueBorderCasing}, 35%, 86%)`;
 
+//Greenspace colors
 export const parkFill = "hsl(136, 41%, 89%)";
+export const cemeteryFill = "hsl(136, 41%, 80%)";
 export const parkOutline = "hsla(136, 41%, 70%, 50%)";
+export const cemeteryOutline = "hsla(136, 41%, 70%, 40%)";
 export const parkLabel = "hsl(136, 71%, 29%)";
 export const parkLabelHalo = "hsl(90, 27%, 94%)";
 
@@ -82,7 +85,7 @@ export const hue = {
 export const poi = {
   infrastructure: palette.blue,
   consumer: palette.texas_orange,
-  //outdoor:
+  outdoor: palette.green,
   attraction: palette.brown,
   airport: `hsl(${hue.airport}, 100%, 28%)`,
   transport: palette.mauve,
diff --git a/src/layer/index.js b/src/layer/index.js
index 740eb6061..51a209c3a 100644
--- a/src/layer/index.js
+++ b/src/layer/index.js
@@ -34,6 +34,7 @@ export function build(locales) {
     lyrLanduse.urbanizedArea,
     lyrPark.fill,
     lyrAeroway.fill,
+    lyrPark.cemeteryFill,
     lyrPark.parkFill,
 
     lyrBoundary.countyCasing,
@@ -50,6 +51,7 @@ export function build(locales) {
     lyrPark.outline,
     lyrAeroway.outline,
     lyrPark.parkOutline,
+    lyrPark.cemeteryOutline,
 
     lyrBoundary.city,
     lyrBoundary.county,
diff --git a/src/layer/park.js b/src/layer/park.js
index bcf2cebd3..def7af2a8 100644
--- a/src/layer/park.js
+++ b/src/layer/park.js
@@ -55,6 +55,21 @@ export const parkFill = {
   "source-layer": "landcover",
 };
 
+export const cemeteryFill = {
+  id: "cemetery-fill",
+  type: "fill",
+  filter: ["==", "class", "cemetery"],
+  paint: {
+    "fill-color": Color.cemeteryFill,
+  },
+  layout: {
+    visibility: "visible",
+  },
+  source: "openmaptiles",
+  metadata: {},
+  "source-layer": "landuse",
+};
+
 export const parkOutline = {
   ...outline,
   id: "park_outline",
@@ -62,6 +77,21 @@ export const parkOutline = {
   "source-layer": "landcover",
 };
 
+export const cemeteryOutline = {
+  id: "cemetery-outline",
+  type: "line",
+  filter: ["==", "class", "cemetery"],
+  paint: {
+    "line-color": Color.cemeteryOutline,
+  },
+  layout: {
+    visibility: "visible",
+  },
+  source: "openmaptiles",
+  metadata: {},
+  "source-layer": "landuse",
+};
+
 export const parkLabel = {
   ...label,
   id: "park_label",
@@ -74,4 +104,5 @@ export const legendEntries = [
     description: "Park",
     layers: [fill.id, outline.id, parkFill.id, parkOutline.id],
   },
+  { description: "Cemetery", layers: [cemeteryFill.id, cemeteryOutline.id] },
 ];
diff --git a/src/layer/poi.js b/src/layer/poi.js
index d9a5ddbcc..3b4260174 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -59,6 +59,14 @@ var iconDefs = {
     color: Color.poi.consumer,
     description: "Car dealership",
   },
+  cemetery: {
+    classes: {
+      cemetery: ["cemetery"],
+    },
+    sprite: "poi_gravestone",
+    color: Color.poi.outdoor,
+    decription: "Cemetery",
+  },
   taxi: {
     classes: {
       office: ["taxi"],
@@ -359,6 +367,8 @@ export const poi = {
         ...getSubclasses(iconDefs.pow_taoist),
       ],
       Color.poi.infrastructure,
+      ["cemetery"],
+      Color.poi.outdoor,
       Color.poi.infrastructure,
     ],
   },
@@ -399,6 +409,7 @@ export const poi = {
       [
         ...getSubclasses(iconDefs.bar),
         ...getSubclasses(iconDefs.bookstore),
+        ...getSubclasses(iconDefs.cemetery),
         ...getSubclasses(iconDefs.coffee),
         ...getSubclasses(iconDefs.car_shop),
         ...getSubclasses(iconDefs.car_repair),