Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10896)
+++ trunk/data/defaultpresets.xml	(revision 10897)
@@ -7302,5 +7302,12 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Deli (Fine Food) -->
-        <item name="Candy Store" icon="presets/shop/groceries/confectionery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pastry" icon="presets/shop/groceries/pastry.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pastry" />
+            <space />
+            <key key="shop" value="pastry" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Pastry -->
+        <item name="Confectionery" icon="presets/shop/groceries/confectionery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=confectionery"
@@ -7316,5 +7323,5 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Candy Store -->
+        </item> <!-- Confectionery -->
         <item name="Tea" icon="presets/shop/groceries/tea.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"
Index: trunk/images/presets/shop/groceries/pastry.svg
===================================================================
--- trunk/images/presets/shop/groceries/pastry.svg	(revision 10897)
+++ trunk/images/presets/shop/groceries/pastry.svg	(revision 10897)
@@ -0,0 +1,111 @@
+<?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="16"
+   height="16"
+   id="svg4395"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="cake5.svg"
+   inkscape:export-filename="E:\Casey's Documents\Dropbox\comic\ggo15\cake.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title2986">Cake</title>
+  <defs
+     id="defs4397" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.4389692"
+     inkscape:cy="7.8688133"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="2"
+     fit-margin-left="2"
+     fit-margin-right="2"
+     fit-margin-bottom="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4139" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4400">
+    <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>Cake</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Casey Leonard</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <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(-249.77932,-560.05786)">
+    <path
+       style="fill:#5a3216;fill-opacity:1;stroke:#0c0800;stroke-width:0.58682603;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 264.54725,564.77062 c 0.60865,0 0.94075,-0.11108 0.93866,0.91051 l -0.0179,8.72654 c -0.002,0.87839 -0.44133,1.33204 -1.11545,1.33204 l -13.41784,0 c -0.67411,0 -0.77938,0.21184 -0.78589,-0.66652 l -0.0761,-10.25207 c 0,0 10.86094,-0.0505 14.47453,-0.0505 z"
+       id="rect3160"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssccs" />
+    <path
+       style="fill:#ffe680;fill-opacity:1;stroke:#0c0800;stroke-width:0.57370043;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 262.19456,571.43578 c 0.57153,0 1.03161,0.17862 1.03161,0.4005 l 0,2.25795 c 0,0.22188 -0.4601,0.39953 -1.03161,0.4005 l -12.01574,0.0201 c 0,0 -0.0476,-2.25849 -0.0476,-3.06633 0,0 8.99978,-0.0128 12.06335,-0.0128 z"
+       id="rect3160-1-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssccc" />
+    <path
+       style="fill:#ffe680;fill-opacity:1;stroke:#0c0800;stroke-width:0.58644468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 262.20558,566.34711 c 0.57483,0 1.03756,0.18557 1.03756,0.41609 l 0,2.34581 c 0,0.23052 -0.46274,0.4151 -1.03756,0.41611 l -12.08515,0.0209 c 0,0 -0.0478,-2.34639 -0.0478,-3.18566 0,0 9.05176,-0.0133 12.13302,-0.0133 z"
+       id="rect3160-1-7-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssccc" />
+    <path
+       style="fill:#5a3216;fill-opacity:1;stroke:#0c0800;stroke-width:0.68468547;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 250.12167,564.63757 10.24272,-4.1736 c 0,0 0.28532,-0.50151 2.69822,1.31047 1.77832,1.33544 2.163,2.94496 2.163,2.94496 z"
+       id="path3242"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscc" />
+  </g>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 10896)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 10897)
@@ -1849,4 +1849,5 @@
 area[shop=computer],
 area[shop=confectionery],
+area[shop=pastry],
 area[shop=copyshop],
 area[shop=curtain],
@@ -2000,4 +2001,8 @@
     set icon_z17;
 }
+node[shop=pastry] {
+    icon-image: "presets/shop/groceries/pastry.svg";
+    set icon_z17;
+}
 node[shop=copyshop] {
     icon-image: "presets/shop/copyshop.svg";