Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16479)
+++ trunk/resources/data/defaultpresets.xml	(revision 16480)
@@ -3490,4 +3490,67 @@
         </item> <!-- Bird Hide -->
         <separator/>
+        <item name="Amusement arcade" icon="presets/leisure/amusement_arcade.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=amusement_arcade" />
+            <space />
+            <key key="leisure" value="amusement_arcade" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Amusement arcade -->
+        <item name="Adult gaming centre" icon="presets/leisure/adult_gaming_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=adult_gaming_centre" />
+            <space />
+            <key key="leisure" value="adult_gaming_centre" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Adult gaming centre -->
+        <item name="Gambling" icon="presets/leisure/gambling.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=gambling" />
+            <space />
+            <key key="amenity" value="gambling" />
+            <multiselect key="gambling" text="Type" values="yes;lottery;pachinko;slot_machines;bingo;betting;poker" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Gambling -->
+        <item name="Casino" icon="presets/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=casino" />
+            <space />
+            <key key="amenity" value="casino" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Casino -->
+        <separator/>
         <item name="Night Club" icon="presets/leisure/nightclub.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=nightclub" />
@@ -3501,14 +3564,4 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Night Club -->
-        <item name="Casino" icon="presets/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:amenity=casino" />
-            <space />
-            <key key="amenity" value="casino" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <space />
-            <reference ref="internet_smoking" />
-            <space />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Casino -->
         <item name="Strip Club" icon="presets/leisure/stripclub.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=stripclub" />
@@ -3516,4 +3569,5 @@
             <key key="amenity" value="stripclub" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
             <space />
             <reference ref="internet_smoking" />
@@ -6562,4 +6616,9 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
         </item> <!-- Bookmaker -->
         <item name="Lottery" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -6569,4 +6628,9 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
         </item> <!-- Lottery -->
         <item name="Bag" icon="presets/shop/bag.svg" type="node,closedway,multipolygon" preset_name_label="true">
Index: trunk/resources/images/presets/leisure/adult_gaming_centre.svg
===================================================================
--- trunk/resources/images/presets/leisure/adult_gaming_centre.svg	(revision 16480)
+++ trunk/resources/images/presets/leisure/adult_gaming_centre.svg	(revision 16480)
@@ -0,0 +1,24 @@
+<?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>
+ <g transform="translate(0 -293.3)">
+  <g>
+   
+   <rect x="-3.9736e-7" y="293.56" width="1.0583" height=".52917" style="fill:#DF0101"/>
+   <rect x="2.6458" y="293.56" width="1.0583" height=".52917" style="fill:#DF0101"/>
+   <rect x="2.1167" y="294.09" width=".52917" height=".52917" style="fill:#DF0101"/>
+   <rect x="1.0583" y="294.09" width=".52917" height=".52917" style="fill:#DF0101"/>
+  </g>
+  <path d="m0.52917 294.62v0.52917h-0.52917v1.8521h0.52917v-0.52917h0.52917v0.52917h0.52917v-0.52917h0.52917v0.52917h0.52917v-0.52917h0.52917v0.52917h0.52917v-1.8521h-0.52917v-0.52917zm0.52917 0.52917h0.52917v0.52917h-0.52917zm1.0583 0h0.52917v0.52917h-0.52917z"
+  style="fill:#DF0101"/>
+ </g>
+</svg>
Index: trunk/resources/images/presets/leisure/amusement_arcade.svg
===================================================================
--- trunk/resources/images/presets/leisure/amusement_arcade.svg	(revision 16480)
+++ trunk/resources/images/presets/leisure/amusement_arcade.svg	(revision 16480)
@@ -0,0 +1,24 @@
+<?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>
+ <g transform="translate(0 -293.3)">
+  <g>
+   
+   <rect x="-3.9736e-7" y="293.56" width="1.0583" height=".52917" style="fill:#0E8517"/>
+   <rect x="2.6458" y="293.56" width="1.0583" height=".52917" style="fill:#0E8517"/>
+   <rect x="2.1167" y="294.09" width=".52917" height=".52917" style="fill:#0E8517"/>
+   <rect x="1.0583" y="294.09" width=".52917" height=".52917" style="fill:#0E8517"/>
+  </g>
+  <path d="m0.52917 294.62v0.52917h-0.52917v1.8521h0.52917v-0.52917h0.52917v0.52917h0.52917v-0.52917h0.52917v0.52917h0.52917v-0.52917h0.52917v0.52917h0.52917v-1.8521h-0.52917v-0.52917zm0.52917 0.52917h0.52917v0.52917h-0.52917zm1.0583 0h0.52917v0.52917h-0.52917z"
+  style="fill:#0E8517"/>
+ </g>
+</svg>
Index: trunk/resources/images/presets/leisure/gambling.svg
===================================================================
--- trunk/resources/images/presets/leisure/gambling.svg	(revision 16480)
+++ trunk/resources/images/presets/leisure/gambling.svg	(revision 16480)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="bingo1.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="27.75051"
+     inkscape:cx="5.1826024"
+     inkscape:cy="9.7217834"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3622)">
+    <rect
+       style="opacity:1;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76776588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect896"
+       width="15"
+       height="14.999983"
+       x="0"
+       y="1038.3622" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816"
+       width="3"
+       height="3"
+       x="3"
+       y="1047.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6"
+       width="3"
+       height="3"
+       x="9"
+       y="1047.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-2"
+       width="3"
+       height="3"
+       x="3"
+       y="1041.3622" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-0"
+       width="3"
+       height="3"
+       x="9"
+       y="1041.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-7"
+       width="3"
+       height="3"
+       x="0"
+       y="1044.3622" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-02"
+       width="3"
+       height="3"
+       x="6"
+       y="1044.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-66"
+       width="3"
+       height="3"
+       x="0"
+       y="1038.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-9"
+       width="3"
+       height="3"
+       x="6"
+       y="1038.3622" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-8"
+       width="3"
+       height="3"
+       x="0"
+       y="1050.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-7"
+       width="3"
+       height="3"
+       x="6"
+       y="1050.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-02-6"
+       width="3"
+       height="3"
+       x="12"
+       y="1044.3622" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-9-7"
+       width="3"
+       height="3"
+       x="12"
+       y="1038.3622" />
+    <rect
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect816-6-7-3"
+       width="3"
+       height="3"
+       x="12"
+       y="1050.3622" />
+  </g>
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 16479)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 16480)
@@ -2565,4 +2565,7 @@
 area[amenity=biergarten],
 area[amenity=nightclub],
+area[amenity=amusement_arcade],
+area[amenity=adult_gaming_centre],
+area[amenity=gambling],
 area[amenity=stripclub],
 area[amenity=casino],
@@ -2586,4 +2589,16 @@
 node[amenity=nightclub] {
     icon-image: "presets/leisure/nightclub.svg";
+    set icon_z17;
+}
+node[amenity=amusement_arcade] {
+    icon-image: "presets/leisure/amusement_arcade.svg";
+    set icon_z17;
+}
+node[amenity=adult_gaming_centre] {
+    icon-image: "presets/leisure/adult_gaming_centre.svg";
+    set icon_z17;
+}
+node[amenity=gambling] {
+    icon-image: "presets/leisure/gambling.svg";
     set icon_z17;
 }