diff --git a/data/editor.config b/data/editor.config
index 689ad71f9c..108b9e20e9 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -544,6 +544,10 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-video_games" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-confectionery" group="shop">
         <include group="poi" />
         <include field="internet" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 930d63b5cd..07936c5978 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1345,3 +1345,4 @@ recycling|scrap_metal;[amenity=recycling][recycling:scrap_metal=yes];;name;int_n
 recycling|small_appliances;[amenity=recycling][recycling:small_appliances=yes];;name;int_name;1345;
 amenity|recycling_container;[amenity=recycling][recycling_type=container],[amenity=recycling][!recycling_type];;name;int_name;1346;
 hwtag|onedir_bicycle;1347;
+shop|video_games;1348;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index da18d8d7ab..76a8326e78 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -17883,6 +17883,40 @@
     sk = Obchod
     fa = فروشگاه
 
+  [type.shop.video_games]
+    en = Video games shop
+    ru = Магазин видеоигр
+    ar = متجر ألعاب فيديو
+    cs = Obchod s videohrami
+    da = Computerspilbutik
+    nl = Winkel voor videogames
+    fi = Videopelikauppa
+    fr = Boutique de jeux vidéo
+    de = Gameshop
+    hu = Videojáték bolt
+    id = Toko permainan video
+    it = Negozio di videogiochi
+    ja = ゲームショップ
+    ko = 비디오 게임 가게
+    nb = Videospillbutikken
+    pl = Sklep z grami wideo
+    pt = Loja de jogos de vídeo
+    pt-BR = Loja de jogos eletrônicos
+    ro = Magazin de jocuri video
+    es = Tienda de videojuegos
+    es-MX = Tienda de videojuegos
+    sv = Videospel butik
+    th = ร้านขายวิดีโอเกม
+    tr = Video oyunları mağazası
+    uk = Магазин відеоігор
+    vi = Cửa hàng bán trò chơi điện tử
+    el = Κατάστημα βιντεοπαιχνιδιών
+    sk = Predajňa s videohrami
+    sw = Duka la Video za Michezo
+    zh-Hans = 电子游戏商城
+    zh-Hant = 電子遊戲商城
+    fa = فروشگاه بازی‌های رایانه‌ای
+
   [type.shop.wine]
     en = Wine Shop
     ru = Винный магазин
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 8191f54ddf..02bd5dba8a 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2354,7 +2354,9 @@ node|z16[shop=clothes],
 area|z16[shop=clothes]
 {icon-image: clothes-m.svg;}
 node|z16[shop=computer],
-area|z16[shop=computer]
+area|z16[shop=computer],
+node|z16[shop=video_games],
+area|z16[shop=video_games]
 {icon-image: computer-m.svg;}
 node|z16[shop=tattoo],
 area|z16[shop=tattoo]
@@ -2515,7 +2517,9 @@ node|z17-[shop=clothes],
 area|z17-[shop=clothes]
 {icon-image: clothes-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=computer],
-area|z17-[shop=computer]
+area|z17-[shop=computer],
+node|z17-[shop=video_games],
+area|z17-[shop=video_games]
 {icon-image: computer-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=tattoo],
 area|z17-[shop=tattoo]
diff --git a/data/ugc_types.csv b/data/ugc_types.csv
index ee4856d1fe..e5d09abb41 100644
--- a/data/ugc_types.csv
+++ b/data/ugc_types.csv
@@ -132,6 +132,7 @@ shop-supermarket,1,1,1,assortment service value_for_money
 shop-tattoo,1,1,0,quality service value_for_money
 shop-tyres,1,1,1,assortment service value_for_money
 shop-variety_store,1,1,1,assortment service value_for_money
+shop-video_games,1,1,1,assortment service value_for_money
 shop-wine,1,1,1,assortment service value_for_money
 sponsored-booking,0,0,0, 
 sport-basketball,1,1,0,equipment service value_for_money