diff --git a/data/categories.txt b/data/categories.txt
index 32e30ff611..16180a7118 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10489,6 +10489,46 @@ el:Φωτογραφείο|πλαίσια|κατάστημα
 sk:4Fotografické služby|Rámovanie
 mr:फोटो शॉप|फोटो स्टुडिओ
 
+shop-camera
+en:3Camera Shop
+ar:متجر الكاميرا
+be:Крама фотаапаратаў
+bg:Магазин за фотоапарати
+ca:Botiga de càmeres
+cs:Obchod s fotoaparáty
+da:Kamera butik
+de:Kamerageschäft
+el:Κατάστημα φωτογραφικών μηχανών
+es:Tienda de cámaras
+et:Kaamerapood
+eu:Kamera Denda
+fa:فروشگاه دوربین
+fi:Kamerakauppa
+fr:Boutique d'appareils photo
+he:חנות מצלמות
+hu:Fényképezőgép bolt
+id:Toko Kamera
+it:Negozio di macchine fotografiche
+ja:カメラショップ
+ko:카메라 샵
+mr:कॅमेरा शॉप
+nb:Kamerabutikk
+nl:Camerawinkel
+pl:Sklep z aparatami
+pt:Loja de câmeras
+pt-BR:Loja de câmeras
+ro:Magazin de aparate foto
+ru:Магазин фотоаппаратов
+sk:Obchod s fotoaparátmi
+sv:Kameraaffär
+sw:Duka la Kamera
+th:ร้านกล้อง
+tr:Kamera Dükkanı
+uk:Магазин фотоапаратів
+vi:Cửa hàng máy ảnh
+zh-Hans:相机店
+zh-Hant:相機店
+
 shop-travel_agency
 en:4Travel Agency|tours|4tour agency|trips|journeys|travel bureau|holidays|travel agent|tourist office|last minute tour
 ru:3Турагентство|путешествия|туристическое агентство|турфирма|5путевки|пакетные туры|горящие туры|горящие путевки|туроператор|купить тур|купить путевку|бронирование туров|туристическая компания|туристическая фирма
diff --git a/data/editor.config b/data/editor.config
index 79878cc0be..8a5f5d72db 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1000,6 +1000,9 @@
       <type id="shop-car_parts" group="shop">
         <include group="poi_internet" />
       </type>
+      <type id="shop-camera" group="shop">
+        <include group="poi_internet" />
+      </type>
       <!-- Uncomment this after our editor core supports complex types
       <type id="amenity-vending_machine-cigarettes">
         <tag k="amenity" v="vending_machine" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index c5832e6354..156c98404d 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1559,3 +1559,4 @@ shop|curtain;1558;
 shop|fashion_accessories;1559;
 shop|cannabis;1560;
 shop|herbalist;1561;
+shop|camera;1562;
\ No newline at end of file
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index bbbb4c9939..caa4633908 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -6148,6 +6148,46 @@
     zh-Hans = 摄影棚
     zh-Hant = 攝影師
 
+  [type.shop.camera]
+    en = Camera Shop
+    ar = متجر الكاميرا
+    be = Крама фотаапаратаў
+    bg = Магазин за фотоапарати
+    ca = Botiga de càmeres
+    cs = Obchod s fotoaparáty
+    da = Kamera butik
+    de = Kamerageschäft
+    el = Κατάστημα φωτογραφικών μηχανών
+    es = Tienda de cámaras
+    et = Kaamerapood
+    eu = Kamera Denda
+    fa = فروشگاه دوربین
+    fi = Kamerakauppa
+    fr = Boutique d'appareils photo
+    he = חנות מצלמות
+    hu = Fényképezőgép bolt
+    id = Toko Kamera
+    it = Negozio di macchine fotografiche
+    ja = カメラショップ
+    ko = 카메라 샵
+    mr = कॅमेरा शॉप
+    nb = Kamerabutikk
+    nl = Camerawinkel
+    pl = Sklep z aparatami
+    pt = Loja de câmeras
+    pt-BR = Loja de câmeras
+    ro = Magazin de aparate foto
+    ru = Магазин фотоаппаратов
+    sk = Obchod s fotoaparátmi
+    sv = Kameraaffär
+    sw = Duka la Kamera
+    th = ร้านกล้อง
+    tr = Kamera Dükkanı
+    uk = Магазин фотоапаратів
+    vi = Cửa hàng máy ảnh
+    zh-Hans = 相机店
+    zh-Hant = 相機店
+
   [type.craft.plumber]
     en = Plumber
     ar = سباك
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index fde5833f95..276111e2c0 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2322,6 +2322,8 @@ node|z16-[shop=copyshop],
 area|z16-[shop=copyshop],
 node|z16-[shop=photo],
 area|z16-[shop=photo],
+node|z16-[shop=camera],
+area|z16-[shop=camera],
 node|z16-[shop=pet],
 area|z16-[shop=pet],
 node|z16-[shop=department_store],
@@ -2525,6 +2527,9 @@ area|z16[shop=health_food],
 node|z16[shop=copyshop],
 area|z16[shop=copyshop]
 {icon-image: copyshop-m.svg;}
+node|z16[shop=camera],
+area|z16[shop=camera]
+{icon-image: photo-shop-m.svg;}
 node|z16[shop=photo],
 area|z16[shop=photo]
 {icon-image: photo-shop-m.svg;}
@@ -2731,6 +2736,9 @@ area|z17-[shop=health_food],
 node|z17-[shop=copyshop],
 area|z17-[shop=copyshop]
 {icon-image: copyshop-m.svg;icon-min-distance: 24;}
+node|z17-[shop=camera],
+area|z17-[shop=camera]
+{icon-image: photo-shop-m.svg;icon-min-distance: 24;}
 node|z17-[shop=photo],
 area|z17-[shop=photo]
 {icon-image: photo-shop-m.svg;icon-min-distance: 24;}