Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9549)
+++ trunk/data/defaultpresets.xml	(revision 9550)
@@ -7435,4 +7435,31 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chemist -->
+        <item name="Cosmetics" icon="styles/standard/shop/cosmetics.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=cosmetics" />
+            <space />
+            <key key="shop" value="cosmetics" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Cosmetics -->
+        <item name="Perfumery" icon="styles/standard/shop/perfumery.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=perfumery" />
+            <space />
+            <key key="shop" value="perfumery" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Perfumery -->
+        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
+            <space />
+            <key key="shop" value="beauty" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Beauty -->
         <item name="Tobacco" icon="styles/standard/shop/tobacco.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tobacco" />
@@ -7455,17 +7482,4 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->
-        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
-            <space />
-            <key key="shop" value="beauty" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </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"
Index: trunk/images_nodist/presets/beauty.svg
===================================================================
--- trunk/images_nodist/presets/beauty.svg	(revision 9550)
+++ trunk/images_nodist/presets/beauty.svg	(revision 9550)
@@ -0,0 +1,361 @@
+<?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="529.35229"
+   height="1542.7272"
+   id="svg3097"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="beauty2new.svg">
+  <defs
+     id="defs3099">
+    <filter
+       id="filter4862-1"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4864-2"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter4862-5"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4864-6"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter4862-4"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4864-9"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter4862-54"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4864-62"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter3040"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3042"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter3044"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3046"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter3048"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3050"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter3052"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3054"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter3056"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3058"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter3060"
+       height="1.0726"
+       width="1.2434"
+       y="-0.036311999"
+       x="-0.12168"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3062"
+         stdDeviation="3.7661955" />
+    </filter>
+    <filter
+       id="filter4973"
+       y="-0.089010999"
+       width="1.7701"
+       x="-0.38503999"
+       height="1.178"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4975"
+         stdDeviation="9.8905746" />
+    </filter>
+    <filter
+       id="filter4973-3"
+       height="1.178"
+       width="1.7701"
+       y="-0.089010999"
+       x="-0.38503999"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4975-4"
+         stdDeviation="9.8905746" />
+    </filter>
+    <linearGradient
+       id="linearGradient5010"
+       x1="1072.8"
+       gradientUnits="userSpaceOnUse"
+       y1="1542.4"
+       gradientTransform="matrix(1.2179,0,0,1.2169,-426.46,-475.03)"
+       x2="1032.4"
+       y2="1530.8">
+      <stop
+         id="stop5006"
+         stop-color="#ececec"
+         offset="0" />
+      <stop
+         id="stop5008"
+         stop-color="#ececec"
+         stop-opacity="0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3840"
+       y="-0.032026"
+       width="1.4413"
+       x="-0.22063001"
+       height="1.0641"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3842"
+         stdDeviation="6.5957527" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-145.32061"
+     inkscape:cy="731.34638"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3102">
+    <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
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-495.32061,279.01873)">
+    <g
+       id="layer1-1"
+       transform="matrix(1.1076098,0,0,1,163.52225,87.387517)">
+      <path
+         id="path4538"
+         d="m 812.16,603.3 a 197.99,28.284 0 1 1 -395.98,0 197.99,28.284 0 1 1 395.98,0 z"
+         transform="matrix(-0.90281,0,0,0.9018,1087.4,-342.03)"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:3.92689991" />
+      <path
+         id="path4540"
+         d="m 812.16,603.3 a 197.99,28.284 0 1 1 -395.98,0 197.99,28.284 0 1 1 395.98,0 z"
+         transform="matrix(-0.79371,0,0,0.79117,1020.3,-275.28)"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:4.47139978" />
+      <path
+         id="rect4554"
+         d="M 765.64,681 V 965.83 H 301.34 V 681 h 0.0568 c 0.11756,33.624 103.99,60.872 232.11,60.872 128.11,0 231.99,-27.247 232.11,-60.872 h 0.0283 z"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:3.54329991" />
+      <path
+         id="path4556"
+         d="m 812.16,603.3 a 197.99,28.284 0 1 1 -395.98,0 197.99,28.284 0 1 1 395.98,0 z"
+         transform="matrix(-1.1723,0,0,2.1542,1253.5,-618.68)"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:2.22970009" />
+      <path
+         id="rect4542"
+         d="m 336.1,545.33 c 0.77601,23.318 88.839,42.187 197.41,42.187 102.71,0 187.1,-16.874 196.56,-38.439 -0.45972,61.522 0.28805,72.302 0.90283,131.87 0,23.461 -88.414,42.469 -197.46,42.469 -109.046,0 -197.43,-19.008 -197.43,-42.469 1.2186,-59.254 0,-73.417 0,-135.62 h 0.0283 z"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#000000;stroke-width:3.54329991" />
+      <path
+         id="path4552"
+         d="m 812.16,603.3 a 197.99,28.284 0 1 1 -395.98,0 197.99,28.284 0 1 1 395.98,0 z"
+         transform="matrix(-0.99727,0,0,1.5019,1146,-361.38)"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:2.89520001" />
+      <path
+         id="path4544"
+         d="m 712.04,202.58 v 342.43 h -0.45141 c -1.1356,13.948 -80.717,29.087 -178.73,29.087 -98.012,0 -177.57,-15.14 -178.7,-29.087 h -0.0283 V 202.58 h 0.0564 c 2.0494,13.833 81.24,24.969 178.67,24.969 97.433,0 176.65,-11.135 178.7,-24.969 z"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#000000;stroke-width:3.54329991" />
+      <path
+         id="path4927"
+         style="color:#000000;fill:#cccccc;filter:url(#filter4862-1)"
+         d="m 658.62,1090.2 34.345,12.122 74.751,-10.102 10.102,-246.48 -111.12,8.0812 z"
+         transform="matrix(1.2183,0,0,1.2989,-365.13,-858.77)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4699"
+         d="M 684.31,203.54 V -150.1 c 3.3989,-71.5 -60.39,-192.44 -96.085,-214.5 l -17.411,1.2883 c -11.195,2.9205 -22.039,6.0644 -32.061,10.489 -20.195,8.9164 -153.28,214.58 -158.07,240.05 -1.8589,9.8939 -1.7542,19.294 -1.3934,27.651 v 286.08 c 0.50801,24.859 276.82,31.804 305.02,2.5766 z"
+         inkscape:connector-curvature="0"
+         style="fill:#d40000;stroke:#000000;stroke-width:3.54329991" />
+      <path
+         id="path4868"
+         style="color:#000000;fill:#cccccc;filter:url(#filter4862-5)"
+         d="m 868.73,430.11 -2.0203,220.21 -42.426,8.0812 z"
+         transform="matrix(1.2183,0,0,1.2781,-365.13,-278.77)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4903"
+         style="color:#000000;fill:#666666;filter:url(#filter4862-4)"
+         d="m 593.97,829.57 78.792,10.102 -20.203,256.58 -46.467,-4.0406 -6.0609,-14.142 2.0203,-248.5 z"
+         transform="matrix(1.2183,0,0,1.2781,-365.13,-835.78)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4915"
+         style="color:#000000;fill:#666666;filter:url(#filter4862-54)"
+         d="m 697.01,845.73 v 232.34 l 34.345,-236.38 z"
+         transform="matrix(1.2183,0,0,1.2781,-365.13,-835.78)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4939"
+         style="color:#000000;fill:#cccccc;filter:url(#filter4862-1)"
+         d="m 658.62,1090.2 34.345,12.122 74.751,-10.102 10.102,-246.48 -111.12,8.0812 z"
+         transform="matrix(1.4284,0,0,0.51721,-512.65,152.39)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4941"
+         style="color:#000000;fill:#cccccc;filter:url(#filter4862-5)"
+         d="m 868.73,430.11 -2.0203,220.21 -42.426,8.0812 z"
+         transform="matrix(1.4284,0,0,0.51721,-517.57,355.67)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4945"
+         style="color:#000000;fill:#666666;filter:url(#filter4862-54)"
+         d="m 697.01,845.73 v 232.34 l 25.73,-223.3 z"
+         transform="matrix(1.4284,0,0,0.51721,-528.65,154.23)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4947"
+         style="color:#000000;fill:#cccccc;filter:url(#filter4862-1)"
+         d="m 658.62,1090.2 34.345,12.122 91.809,0.9888 13.757,-240.93 -131.83,-8.5542 z"
+         transform="matrix(1.4284,0,0,0.31351,-540.5,477.81)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4949"
+         style="color:#000000;fill:#cccccc;filter:url(#filter4862-5)"
+         d="m 868.73,430.11 -2.0203,220.21 -42.426,8.0812 z"
+         transform="matrix(1.408,-0.24026,0.052851,0.30903,-504.71,787.73)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4953"
+         style="color:#000000;fill:#666666;filter:url(#filter4862-54)"
+         d="m 697.01,845.73 v 232.34 l 25.73,-223.3 z"
+         transform="matrix(1.4284,0,0,0.31351,-544.31,477.19)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="rect4686"
+         d="m 765.64,766.63 v 284.83 H 301.34 V 766.63 h 0.0568 c 0.11756,33.624 103.99,60.872 232.11,60.872 128.11,0 231.99,-27.247 232.11,-60.872 h 0.0283 z"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:3.54329991" />
+      <path
+         id="path4955"
+         style="color:#000000;fill:#666666;filter:url(#filter4973)"
+         d="m 593.97,829.57 61.649,25.064 -3.0602,241.62 -46.467,-4.0406 -6.0609,-14.142 2.0203,-248.5 z"
+         transform="matrix(-1.2183,0,0,1.2781,1472.2,-255.14)"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4977"
+         style="color:#000000;fill:#1a1a1a;filter:url(#filter4973-3)"
+         d="m 358.99,887.71 16.162,58.589 -9.0914,147.48 195.97,6.0609 -16.162,-90.914 -25.254,-69.701 -85.863,-41.416 z"
+         transform="matrix(1.2183,0,0,1.2169,-93.626,-254.7)"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect5002"
+         style="color:#000000;fill:url(#linearGradient5010)"
+         transform="matrix(0.85619,-0.51666,0,1,0,0)"
+         height="286.85001"
+         width="13.459"
+         y="1246.7"
+         x="868.15002" />
+      <path
+         id="path3070"
+         transform="translate(0,-435.83)"
+         d="m 592.86,98.189 c 47.14,62.861 68.57,111.43 71.43,142.86 2.85,31.42 -14.29,351.42 -14.29,351.42 z"
+         inkscape:connector-curvature="0"
+         style="fill:#ff2a2a;filter:url(#filter3840)" />
+    </g>
+  </g>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9549)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9550)
@@ -1958,4 +1958,6 @@
 area[shop=bed],
 area[shop=beauty],
+area[shop=cosmetics],
+area[shop=perfumery],
 area[shop=tea],
 area[shop=coffee],
@@ -2326,4 +2328,14 @@
 node[shop=beauty] {
     icon-image: "shop/beauty.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=cosmetics] {
+    icon-image: "shop/cosmetics.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=perfumery] {
+    icon-image: "shop/perfumery.svg";
     set icon_z17;
     text: auto;