Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 11345)
+++ trunk/data/defaultpresets.xml	(revision 11346)
@@ -7334,4 +7334,13 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Seafood -->
+        <item name="Dairy" icon="presets/shop/groceries/dairy.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dairy"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dairy"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=dairy" />
+            <space />
+            <key key="shop" value="dairy" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Dairy -->
         <item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 11345)
+++ trunk/data/validator/combinations.mapcss	(revision 11346)
@@ -205,5 +205,6 @@
 }
 
-/* {0.tag} together with {1.key}, see #10837 */
+/* {0.tag} together with {1.key}, see #10837, #14034 */
+*[amenity=vending_machine][shop],
 *[noname?][name] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
Index: trunk/images/presets/shop/groceries/dairy.svg
===================================================================
--- trunk/images/presets/shop/groceries/dairy.svg	(revision 11346)
+++ trunk/images/presets/shop/groceries/dairy.svg	(revision 11346)
@@ -0,0 +1,101 @@
+<?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"
+   id="svg2"
+   xml:space="preserve"
+   viewBox="0 0 7 16"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="02.svg"
+   width="7"
+   height="16"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview135"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="32.000002"
+     inkscape:cx="2.7522437"
+     inkscape:cy="8.8105878"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"><inkscape:grid
+       type="xygrid"
+       id="grid4151"
+       originx="-3.8384907e-009"
+       originy="-9.0541047e-007" /></sodipodi:namedview><defs
+     id="defs6"><clipPath
+       id="clipPath136"><path
+         id="path138"
+         d="m 7,-0.48208 18,0 0,32 -18,0 0,-32 z"
+         inkscape:connector-curvature="0" /></clipPath><mask
+       id="mask140"><g
+         id="g142"><g
+           id="g144"
+           clip-path="url(#clipPath136)"><path
+             id="path146"
+             style="fill:#000000;fill-opacity:0.19140003"
+             d="m 7,-0.48208 18,0 0,32 -18,0 0,-32 z"
+             inkscape:connector-curvature="0" /></g></g></mask><clipPath
+       id="clipPath152"><path
+         id="path154"
+         d="m 7,-0.48208 18,0 0,32 -18,0 0,-32 z"
+         inkscape:connector-curvature="0" /></clipPath><clipPath
+       id="clipPath156"><path
+         id="path158"
+         d="M 7,0 25,0 25,32 7,32 7,0 Z"
+         inkscape:connector-curvature="0" /></clipPath></defs><path
+     style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd"
+     d="M 5.3631235,0.00774818 1.5401075,1.1827408e-6 C 1.3973465,-2.8781726e-4 1.2801525,0.05240118 1.1870195,0.14087718 c -0.109654,0.08523 -0.170769,0.272815 -0.173665,0.424574 -0.0032,0.168207 0.05486,0.352497 0.174409,0.47687802 0.08542,0.08887 0.205432,0.154175 0.346398,0.149328 l 0.08325,0 c 0.0044,0.131856 0.0026,0.268998 -0.01264,0.417696 -0.03895,0.485996 -0.169381,0.846752 -0.392486,1.087561 -0.71158374,0.820981 -1.09851424,1.666133 -1.16035824,2.533649 -0.061996,0.815672 -0.070072,4.018498 -0.01561,9.6112438 0.014813,0.227243 0.087732,0.649355 0.3553182,0.76425 1.34001704,0.57537 4.89228804,0.471792 6.20617204,0.0028 0.251276,-0.08969 0.35427,-0.503931 0.367966,-0.67902 0.02699,-2.500997 0.03582,-4.649253 0.03345,-6.4098438 -1.31e-4,-0.125155 10e-4,-0.290943 7.39e-4,-0.409243 -0.0049,-1.974562 -0.0269,-3.343804 -0.0617,-3.768427 -0.04282,-0.430252 -0.131129,-0.543198 -0.862245,-1.42917 -0.194328,-0.206683 -0.359485,-0.597264 -0.483946,-0.918506 -0.100326,-0.258948 -0.206501,-0.604122 -0.208136,-0.803696 0.02622,-0.0037 0.05523,-9.45e-4 0.08251,-0.0014 0.140965,0.0048 0.255953,-0.04362 0.346397,-0.149328 0.09955,-0.09892 0.160514,-0.31033002 0.157591,-0.47687802 -0.0026,-0.149924 -0.05176,-0.334317 -0.156845,-0.424573 -0.161553,-0.138757997259 -0.284599,-0.130678 -0.450465,-0.131014 z m -2.762412,1.18390802 1.726627,7.05e-4 c 0.02062,0.714898 0.238555,1.059519 0.454183,1.558085 0.316569,0.731957 1.209465,1.250105 1.219083,2.072986 0.01031,0.882134 0.02821,1.030358 0.03419,2.167372 -1.215613,-0.05278 -0.683203,-0.190747 -1.786775,-0.185979 -0.706613,0.108989 -1.085961,-0.06004 -1.848883,0.06175 -1.259184,0.244038 -1.378523,0.58324 -1.378523,0.58324 0,0 -0.06352,-1.722234 0.111906,-2.55995 0.06718,-0.320799 0.203937,-0.627675 0.355406,-0.921549 0.221286,-0.42933 0.44274,-0.783932 0.801324,-1.215758 0.251074,-0.25545 0.34978,-0.784096 0.31146,-1.560902 z"
+     id="path58"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sscaaccccccsscccccacccassccasccccaacc" /><g
+     id="g132"
+     style="fill:#800080"
+     transform="matrix(1.0961218,-0.60084682,-0.60084682,-1.0961218,9.5481161,18.541016)"><g
+       id="g148"
+       mask="url(#mask140)"
+       style="fill:#800080"><g
+         id="g160"
+         style="fill:#800080"><g
+           id="g162"
+           clip-path="url(#clipPath152)"
+           style="fill:#800080"><g
+             id="g164"
+             transform="translate(0,-0.48208)"
+             style="fill:#800080"><g
+               id="g168"
+               style="fill:#800080"><g
+                 id="g170"
+                 clip-path="url(#clipPath156)"
+                 style="fill:#800080"><g
+                   id="g172"
+                   style="fill:#800080" /></g></g></g></g></g></g></g><metadata
+     id="metadata133"><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /><dc:publisher><cc:Agent
+             rdf:about="http://openclipart.org/"><dc:title /></cc:Agent></dc:publisher><dc:title></dc:title></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></svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 11345)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 11346)
@@ -1883,4 +1883,5 @@
 area[shop=pawnbroker],
 area[shop=seafood],
+area[shop=dairy],
 area[shop=shoes],
 area[shop=sports],
@@ -2130,4 +2131,8 @@
     set icon_z17;
 }
+node[shop=dairy] {
+    icon-image: "presets/shop/groceries/dairy.svg";
+    set icon_z17;
+}
 node[shop=shoes] {
     icon-image: "presets/shop/shoes.svg";