diff --git a/amenity-points.mss b/amenity-points.mss
index c76ec59cae..e028eb1572 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -288,6 +288,13 @@
     marker-clip: false;
   }
 
+  [feature = 'amenity_casino'][zoom >= 17] {
+    marker-file: url('symbols/casino.svg');
+    marker-fill: @amenity-brown;
+    marker-placement: interior;
+    marker-clip: false;
+  }
+
   [feature = 'tourism_hostel'][zoom >= 17] {
     marker-file: url('symbols/hostel.svg');
     marker-placement: interior;
@@ -2786,6 +2793,19 @@
     text-halo-fill: @standard-halo-fill;
     text-placement: interior;
   }
+
+  [feature = 'amenity_casino'][zoom >= 17] {
+    text-name: "[name]";
+    text-fill: @amenity-brown;
+    text-size: @standard-font-size;
+    text-wrap-width: @standard-wrap-width;
+    text-line-spacing: @standard-line-spacing-size;
+    text-dy: 10;
+    text-face-name: @standard-font;
+    text-halo-radius: @standard-halo-radius;
+    text-halo-fill: @standard-halo-fill;
+    text-placement: interior;
+  }
 }
 
 #amenity-line {
diff --git a/project.mml b/project.mml
index b26cfc6506..eee7f207a6 100644
--- a/project.mml
+++ b/project.mml
@@ -1481,7 +1481,7 @@ Layer:
                                                   'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water',
                                                   'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
                                                   'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq',
-                                                  'nursing_home', 'childcare', 'driving_school') THEN amenity ELSE NULL END,
+                                                  'nursing_home', 'childcare', 'driving_school', 'casino') THEN amenity ELSE NULL END,
               'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
               'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END,
               'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
@@ -1594,7 +1594,7 @@ Layer:
                                                   'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water',
                                                   'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
                                                   'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq',
-                                                  'nursing_home', 'childcare', 'driving_school') THEN amenity ELSE NULL END,
+                                                  'nursing_home', 'childcare', 'driving_school', 'casino') THEN amenity ELSE NULL END,
               'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
               'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END,
               'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END,
@@ -2053,7 +2053,8 @@ Layer:
                                                   'atm', 'bicycle_rental', 'car_rental', 'car_wash', 'post_box', 'post_office',
                                                   'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand',
                                                   'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre',
-                                                  'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school') THEN amenity ELSE NULL END,
+                                                  'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school',
+                                                  'casino') THEN amenity ELSE NULL END,
               'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
               'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
                                             'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre',
@@ -2220,7 +2221,7 @@ Layer:
                                                       'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'toilets', 'taxi',
                                                       'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
                                                       'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq',
-                                                      'nursing_home', 'childcare', 'driving_school') THEN amenity ELSE NULL END,
+                                                      'nursing_home', 'childcare', 'driving_school', 'casino') THEN amenity ELSE NULL END,
                   'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
                   'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion',
                                                 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser',
diff --git a/symbols/casino.svg b/symbols/casino.svg
new file mode 100644
index 0000000000..21447399b4
--- /dev/null
+++ b/symbols/casino.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="14" height="14" version="1.1" viewBox="0 0 3.7042 3.7042" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <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/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m2.0898 1.3149c-0.29315 0-0.52916 0.236-0.52916 0.52916v1.0583c0 0.29315 0.236 0.52916 0.52916 0.52916h1.0583c0.29315 0 0.52916-0.236 0.52916-0.52916v-1.0583c0-0.29315-0.236-0.52916-0.52916-0.52916zm1.0583 0.19844a0.33072 0.33072 0 0 1 0.33072 0.33072 0.33072 0.33072 0 0 1-0.33072 0.33072 0.33072 0.33072 0 0 1-0.33072-0.33072 0.33072 0.33072 0 0 1 0.33072-0.33072zm-1.0583 1.0583a0.33072 0.33072 0 0 1 0.33072 0.33072 0.33072 0.33072 0 0 1-0.33072 0.33072 0.33072 0.33072 0 0 1-0.33072-0.33072 0.33072 0.33072 0 0 1 0.33072-0.33072z" stroke-width="0"/>
+ <path d="m1.0232 0.28137c-0.16932 0.0119-0.33006 0.10588-0.42169 0.26458l-0.52916 0.91778c-0.14658 0.25389-0.063714 0.57271 0.19017 0.71934l0.91778 0.52916c0.037335 0.021399 0.076231 0.046177 0.11575 0.057877v-0.92603c0-0.43515 0.35859-0.79374 0.79374-0.79374h0.32247c-0.043719-0.065201-0.10079-0.12329-0.17363-0.16536l-0.91778-0.52916c-0.095206-0.054998-0.19606-0.081512-0.29765-0.074413zm0.080615 0.18758c0.14845 0.0014155 0.27776 0.10157 0.31625 0.24494 0.047347 0.17637-0.057215 0.35774-0.23357 0.40512-0.17637 0.047347-0.35774-0.057215-0.40512-0.23357-0.047347-0.17637 0.057215-0.35774 0.23357-0.40512 0.028974-0.007804 0.058877-0.011629 0.088883-0.011369zm-0.5612 0.97201c0.14859 0.001479 0.27794 0.10188 0.31625 0.24546 0.046981 0.17636-0.057782 0.35745-0.23409 0.40462-0.1762 0.047018-0.35721-0.057475-0.40462-0.23357-0.047347-0.17637 0.057215-0.35774 0.23357-0.40512 0.028974-0.0078 0.058877-0.011629 0.088883-0.011369z" stroke-width="0"/>
+</svg>