diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -537,6 +537,9 @@
     m_defaultStyle[GeoDataPlacemark::ShopPet]                  = createOsmPOIStyle(osmFont, "shop/shop_pet.16", shopColor);
     m_defaultStyle[GeoDataPlacemark::ShopToys]                 = createOsmPOIStyle(osmFont, "shop/toys-14", shopColor);
     m_defaultStyle[GeoDataPlacemark::ShopTravelAgency]         = createOsmPOIStyle(osmFont, "shop/travel_agency-14", shopColor);
+    m_defaultStyle[GeoDataPlacemark::ShopDeli]                 = createOsmPOIStyle(osmFont, "shop/deli", shopColor);
+    m_defaultStyle[GeoDataPlacemark::ShopTobacco]              = createOsmPOIStyle(osmFont, "shop/tobacco", shopColor);
+    m_defaultStyle[GeoDataPlacemark::ShopTea]                  = createOsmPOIStyle(osmFont, "shop/tea", shopColor);
     m_defaultStyle[GeoDataPlacemark::Shop]                     = createOsmPOIStyle(osmFont, "shop/shop-14", shopColor);
 
     m_defaultStyle[GeoDataPlacemark::ManmadeBridge]            = createWayStyle(QColor("#b8b8b8"), Qt::transparent, true, true);
@@ -912,6 +915,9 @@
     s_visualCategories[OsmTag("shop", "pet")]                   = GeoDataPlacemark::ShopPet;
     s_visualCategories[OsmTag("shop", "toys")]                  = GeoDataPlacemark::ShopToys;
     s_visualCategories[OsmTag("shop", "travel_agency")]         = GeoDataPlacemark::ShopTravelAgency;
+    s_visualCategories[OsmTag("shop", "deli")]                  = GeoDataPlacemark::ShopDeli;
+    s_visualCategories[OsmTag("shop", "tobacco")]               = GeoDataPlacemark::ShopTobacco;
+    s_visualCategories[OsmTag("shop", "tea")]                   = GeoDataPlacemark::ShopTea;
 
     // Default for all other shops
     foreach (const QString &value, shopValues()) {
@@ -2002,6 +2008,9 @@
         popularities << GeoDataPlacemark::ShopPet;
         popularities << GeoDataPlacemark::ShopToys;
         popularities << GeoDataPlacemark::ShopTravelAgency;
+        popularities << GeoDataPlacemark::ShopDeli;
+        popularities << GeoDataPlacemark::ShopTobacco;
+        popularities << GeoDataPlacemark::ShopTea;
         popularities << GeoDataPlacemark::Shop;
 
         popularities << GeoDataPlacemark::LeisureGolfCourse;
@@ -2234,6 +2243,9 @@
         visualCategoryNames[GeoDataPlacemark::ShopPet] = "ShopPet";
         visualCategoryNames[GeoDataPlacemark::ShopToys] = "ShopToys";
         visualCategoryNames[GeoDataPlacemark::ShopTravelAgency] = "ShopTravelAgency";
+        visualCategoryNames[GeoDataPlacemark::ShopDeli] = "ShopDeli";
+        visualCategoryNames[GeoDataPlacemark::ShopTobacco] = "ShopTobacco";
+        visualCategoryNames[GeoDataPlacemark::ShopTea] = "ShopTea";
         visualCategoryNames[GeoDataPlacemark::Shop] = "Shop";
         visualCategoryNames[GeoDataPlacemark::ManmadeBridge] = "ManmadeBridge";
         visualCategoryNames[GeoDataPlacemark::ManmadeLighthouse] = "ManmadeLighthouse";
@@ -2368,8 +2380,8 @@
 {
     // from https://taginfo.openstreetmap.org/keys/building#values
     static const QStringList osmShopValues = QStringList()
-        << "cheese" << "chocolate" << "coffee" << "deli" << "dairy" << "farm"
-        << "pasta" << "pastry" << "tea" << "wine" << "general" << "mall"
+        << "cheese" << "chocolate" << "coffee" << "dairy" << "farm"
+        << "pasta" << "pastry" << "wine" << "general" << "mall"
         << "baby_goods" << "boutique" << "fabric" << "leather" << "tailor" << "watches"
         << "charity" << "second_hand" << "erotic" << "hearing_aids" << "herbalist" << "massage"
         << "medical_supply" << "tattoo" << "bathroom_furnishing" << "electrical" << "energy" << "furnace"
@@ -2381,7 +2393,7 @@
         << "frame" << "games" << "model" << "music" << "trophy" << "video"
         << "video_games" << "anime" << "ticket" << "copyshop" << "dry_cleaning" << "e-cigarette"
         << "funeral_directors" << "money_lender" << "pawnbroker" << "pyrotechnics" << "religion" << "storage_rental"
-        << "tobacco" << "weapons" << "user defined";
+        << "weapons" << "user defined";
 
     return osmShopValues;
 }
diff --git a/src/lib/marble/declarative/Placemark.cpp b/src/lib/marble/declarative/Placemark.cpp
--- a/src/lib/marble/declarative/Placemark.cpp
+++ b/src/lib/marble/declarative/Placemark.cpp
@@ -149,6 +149,22 @@
                 addTagDescription(m_description, QStringLiteral("service:prepress"), QStringLiteral("no"), tr(" No press printing assistance", "A copy shop does not provide help with preparing special printing techniques"));
                 addTagDescription(m_description, QStringLiteral("service:self"), QStringLiteral("yes"), tr("Self service", "A copy shop provides individual copy machines for self-service"));
                 addTagDescription(m_description, QStringLiteral("service:self"), QStringLiteral("no"), tr(" No self service", "A copy shop does not provide individual machines for self-service"));
+            } else if (category == GeoDataPlacemark::ShopDeli) {
+                addTagDescription(m_description, QStringLiteral("organic"), QStringLiteral("yes"), tr("Sells organic food", "A deli that sells organic food"));
+                addTagDescription(m_description, QStringLiteral("organic"), QStringLiteral("no"), tr("Does not sell organic food", "A deli that does not sell organic food"));
+                addTagDescription(m_description, QStringLiteral("organic"), QStringLiteral("only"), tr("Only sells organic food", "A deli that only sells organic food"));
+
+                addTagDescription(m_description, QStringLiteral("diet:gluten_free"), QStringLiteral("yes"), tr("Sells gluten free food", "A deli that sells gluten free food"));
+                addTagDescription(m_description, QStringLiteral("diet:gluten_free"), QStringLiteral("no"), tr("Does not sell gluten free food", "A deli that does not sell gluten free food"));
+                addTagDescription(m_description, QStringLiteral("diet:gluten_free"), QStringLiteral("only"), tr("Only sells gluten free food", "A deli that only sells gluten free food"));
+
+                addTagDescription(m_description, QStringLiteral("diet:lactose_free"), QStringLiteral("yes"), tr("Sells lactose free food", "A deli that sells lactose free food"));
+                addTagDescription(m_description, QStringLiteral("diet:lactose_free"), QStringLiteral("no"), tr("Does not sell lactose free food", "A deli that does not sell lactose free food"));
+                addTagDescription(m_description, QStringLiteral("diet:lactose_free"), QStringLiteral("only"), tr("Only sells lactose free food", "A deli that only sells lactose free food"));
+            } else if (category == GeoDataPlacemark::ShopTobacco) {
+                addTagDescription(m_description, QStringLiteral("lottery"), QStringLiteral("yes"), tr("Sells lottery tickets", "A tobacco shop that also sells lottery tickets"));
+                addTagDescription(m_description, QStringLiteral("stamps"), QStringLiteral("yes"), tr("Sells revenue stamps", "A tobacco shop that also sells revenue stamps"));
+                addTagDescription(m_description, QStringLiteral("salt"), QStringLiteral("yes"), tr("Sells salt", "A tobacco shop that also sells salt"));
             }
         } else if (category == GeoDataPlacemark::TransportBusStop) {
             addTagValue(m_description, "network");
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marble/geodata/data/GeoDataPlacemark.h
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.h
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h
@@ -327,6 +327,9 @@
         ShopPet,
         ShopToys,
         ShopTravelAgency,
+        ShopDeli,
+        ShopTobacco,
+        ShopTea,
         Shop,
 
         ManmadeBridge,
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
@@ -549,6 +549,9 @@
     case ShopPet: return GeoDataPlacemarkPrivate::tr("Pet Shop");
     case ShopToys: return GeoDataPlacemarkPrivate::tr("Toy Store");
     case ShopTravelAgency: return GeoDataPlacemarkPrivate::tr("Travel Agency");
+    case ShopDeli: return GeoDataPlacemarkPrivate::tr("Deli");
+    case ShopTobacco: return GeoDataPlacemarkPrivate::tr("Tobacco Shop");
+    case ShopTea: return GeoDataPlacemarkPrivate::tr("Tea Shop");
     case Shop: return GeoDataPlacemarkPrivate::tr("Shop");
     case ManmadeBridge: return GeoDataPlacemarkPrivate::tr("Bridge");
     case ManmadeLighthouse: return GeoDataPlacemarkPrivate::tr("Lighthouse");