Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9419)
+++ trunk/data/defaultpresets.xml	(revision 9420)
@@ -7346,4 +7346,11 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chemist -->
+        <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" />
+            <space />
+            <key key="shop" value="tobacco" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Tobacco -->
         <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9419)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9420)
@@ -1836,4 +1836,5 @@
 area[shop=tyres],
 area[shop=chemist],
+area[shop=tobacco],
 area[shop=clothes],
 area[shop=computer],
@@ -1988,4 +1989,9 @@
     text: auto;
 }
+node[shop=tobacco] {
+    icon-image: "shop/tobacco.svg";
+    set icon_z17;
+    text: auto;
+}
 node[shop=clothes] {
     icon-image: "shop/clothes.png";