diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 31fefaf5d1..1ca2499dab 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1979,6 +1979,8 @@ area|z17-[shop=money_lender],
 node|z17-[shop=pawnbroker],
 area|z17-[shop=pawnbroker],
 node|z17-[shop=wholesale],
+node|z18-[shop=tobacco],
+area|z18-[shop=tobacco],
 {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
 
 node|z14[shop=mall],
@@ -2473,6 +2475,9 @@ area|z17-[shop=rental]
 node|z17-[shop=rental][rental=bike],
 area|z17-[shop=rental][rental=bike],
 {icon-image: shop-rental-bicycle-m.svg;icon-min-distance: 24;}
+node|z18-[shop=tobacco],
+area|z18-[shop=tobacco],
+{icon-image: tobacco-m.svg;icon-min-distance: 24;}
 
 /* 6.1 Craft */
 
diff --git a/data/styles/clear/style-clear/symbols/tobacco-m.svg b/data/styles/clear/style-clear/symbols/tobacco-m.svg
new file mode 100644
index 0000000000..db84c96d17
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/tobacco-m.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+ <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <path d="m7 14.5h1v3h-1zm-1-1c0.66667-1 2-2 2-3 0-1-3-2-3-4 0-2 2-2 4-3-0.33333 1.3333-2 2-2 3 1 1 3 2 3 4 0 2-1 2-4 3zm-1 1h1v3h-1zm14 3h-10v-3h10z" fill="#fff"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/tobacco-m.svg b/data/styles/clear/style-night/symbols/tobacco-m.svg
new file mode 100644
index 0000000000..7a888a4d71
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/tobacco-m.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
+ <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <path d="m7 14.5h1v3h-1zm-1-1c0.66667-1 2-2 2-3 0-1-3-2-3-4 0-2 2-2 4-3-0.33333 1.3333-2 2-2 3 1 1 3 2 3 4 0 2-1 2-4 3zm-1 1h1v3h-1zm14 3h-10v-3h10z" fill="#000"/>
+</svg>