diff --git a/data/categories.txt b/data/categories.txt
index d65d1942c4..75d2d40875 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -9777,6 +9777,43 @@ shop-second_hand
 en:4Second Hand
 ru:4Подержанные товары
 
+shop-charity
+en:4Charity Shop
+ar:ﻱﺮﻴﺧ ﺮﺠﺘﻣ
+be:Дабрачынная крама
+bg:Благотворителен магазин
+cs:Charitativní obchod
+da:Velgørenhedsbutik
+de:Wohltätigkeitsladen
+el:Φιλανθρωπικό κατάστημα
+es:Tienda de caridad
+eu:Ongintzazko Denda
+fa:ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ
+fi:Hyväntekeväisyysmyymälä
+fr:Magasin de charité
+he:הקדצ תונח
+hu:Jótékonysági Bolt
+id:Toko Amal
+it:Negozio di beneficenza
+ja:チャリティーショップ
+ko:자선 상점
+nb:Veldedighetsbutikk
+nl:Kringloopwinkel
+pl:Sklep charytatywny
+pt:Loja de caridade
+pt-BR:Loja de caridade
+ro:Magazin de caritate
+ru:Благотворительный магазин
+sk:Charitatívny obchod
+sv:Välgörenhetsbutik
+sw:Duka la msaada
+th:ร้านการกุศล
+tr:Hayır Dükkanı
+uk:Магазин благодійності
+vi:Cửa hàng từ thiện
+zh-Hans:慈善商店
+zh-Hant:慈善商店
+
 shop-ticket
 en:4Ticket Shop|tickets|ticket hub|ticket office|ticket center|booking office|box office|ticket agency|ticket booth|pay box
 ru:4Билетная касса|билет|театральная касса|билетный центр|городская касса|продажа билетов|бронирование билетов
diff --git a/data/editor.config b/data/editor.config
index 2e5a423567..80fc066aac 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -561,6 +561,10 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-charity" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-bag" group="shop">
         <include group="poi" />
         <include field="internet" />
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 9953827f5d..646090adda 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -355,6 +355,8 @@ area[tourism=attraction][attraction=animal],
 
 node[amenity=cafe],
 area[amenity=cafe],
+node[shop=charity],
+area[shop=charity],
 node[amenity=theatre],
 area[amenity=theatre]
 {z-index: 2790;}
@@ -2210,6 +2212,9 @@ area|z16[shop=wine]
 node|z16[shop=books],
 area|z16[shop=books]
 {icon-image: book-shop-m.svg;}
+node|z16[shop=charity],
+area|z16[shop=charity]
+{icon-image: charity_shop-m.svg;}
 node|z16[shop=bookmaker],
 area|z16[shop=bookmaker]
 {icon-image: bookmaker-m.svg;}
@@ -2390,6 +2395,9 @@ area|z17-[shop=wine]
 node|z17-[shop=books],
 area|z17-[shop=books]
 {icon-image: book-shop-m.svg;icon-min-distance: 24;text-optional: true;}
+node|z17-[shop=charity],
+area|z17-[shop=charity]
+{icon-image: charity_shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=bookmaker],
 area|z17-[shop=bookmaker]
 {icon-image: bookmaker-m.svg;icon-min-distance: 24;text-optional: true;}
diff --git a/data/styles/clear/style-clear/symbols/charity_shop-m.svg b/data/styles/clear/style-clear/symbols/charity_shop-m.svg
new file mode 100644
index 0000000000..dffa63e499
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/charity_shop-m.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shop-m</title>
+      <g id="charity-shop-m" fill-rule="nonzero">
+         <circle id="Oval" cx="12" cy="12" r="12" fill="#ffffff" opacity=".6"/>
+         <circle id="Oval" cx="12" cy="12" r="11" fill="#8c5f93"/>
+         <path d="m12 17.786707-3.3589997-3.359c-2.1213324-2.121332 1.0606677-5.3033325 3.1819997-3.182l.177.177.177-.177c2.121332-2.1213325 5.303332 1.060668 3.182 3.182zm4.666667-9.4533737h-1.333334c0-1.84-1.493333-3.3333333-3.333333-3.3333333s-3.3333333 1.4933333-3.3333333 3.3333333h-1.3333334c-.7333333 0-1.3266666.6-1.3266666 1.3333334l-.0066667 8.0000003c0 .733333.6 1.333333 1.3333333 1.333333h9.3333337c.733333 0 1.333333-.6 1.333333-1.333333v-8.0000003c0-.7333334-.6-1.3333334-1.333333-1.3333334zm-4.666667-2c1.106667 0 2 .8933334 2 2h-4c0-1.1066666.893333-2 2-2z" style="fill:#ffffff"/>
+      </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/charity_shop-m.svg b/data/styles/clear/style-night/symbols/charity_shop-m.svg
new file mode 100644
index 0000000000..b4c492840e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/charity_shop-m.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shop-m</title>
+      <g id="charity-shop-m" fill-rule="nonzero" opacity="0.6">
+         <circle id="Oval" cx="12" cy="12" r="12" fill="#ffffff"/>
+         <circle id="Oval" cx="12" cy="12" r="11" fill="#8c5f93"/>
+         <path d="m12 17.786707-3.3589997-3.359c-2.1213324-2.121332 1.0606677-5.3033325 3.1819997-3.182l.177.177.177-.177c2.121332-2.1213325 5.303332 1.060668 3.182 3.182zm4.666667-9.4533737h-1.333334c0-1.84-1.493333-3.3333333-3.333333-3.3333333s-3.3333333 1.4933333-3.3333333 3.3333333h-1.3333334c-.7333333 0-1.3266666.6-1.3266666 1.3333334l-.0066667 8.0000003c0 .733333.6 1.333333 1.3333333 1.333333h9.3333337c.733333 0 1.333333-.6 1.333333-1.333333v-8.0000003c0-.7333334-.6-1.3333334-1.333333-1.3333334zm-4.666667-2c1.106667 0 2 .8933334 2 2h-4c0-1.1066666.893333-2 2-2z" style="fill:#ffffff"/>
+      </g>
+</svg>
\ No newline at end of file