Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7704)
+++ trunk/data/defaultpresets.xml	(revision 7705)
@@ -6272,4 +6272,11 @@
             <reference ref="link_contact" />
         </item> <!-- Curtain -->
+        <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=art" />
+            <space />
+            <key key="shop" value="art" />
+            <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Art -->
         <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
@@ -6426,4 +6433,11 @@
             <reference ref="link_contact" />
         </item> <!-- Beauty -->
+        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo" />
+            <space />
+            <key key="shop" value="tattoo" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Tattoo -->
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7704)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7705)
@@ -1526,4 +1526,7 @@
 area[shop=funeral_directors],
 area[shop=wine],
+area[shop=farm],
+area[shop=tattoo],
+area[shop=art],
 area[shop=bag] {
     fill-color: shop#00005f;
@@ -1895,4 +1898,19 @@
 node[shop=wine] {
     icon-image: "shop/wine.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=farm] {
+    icon-image: "presets/apple.png";
+    set icon_z17;
+    text: auto;
+}
+node[shop=tattoo] {
+    icon-image: "shop/tattoo.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=art] {
+    icon-image: "shop/art.svg";
     set icon_z17;
     text: auto;