diff --git a/amenity-points.mss b/amenity-points.mss
index 798e6f91ec..09c603971b 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -888,6 +888,10 @@
       marker-file: url('symbols/shop/butcher.svg');
     }
 
+    [shop = 'charity'][zoom >= 18] {
+      marker-file: url('symbols/shop/charity.svg');
+    }
+
     [shop = 'chemist'][zoom >= 18] {
       marker-file: url('symbols/shop/chemist.svg');
     }
@@ -1096,6 +1100,10 @@
       marker-file: url('symbols/shop/travel_agency.svg');
     }
 
+    [shop = 'second_hand'][zoom >= 18] {
+      marker-file: url('symbols/shop/second_hand.svg');
+    }
+
     [shop = 'sports'][zoom >= 18] {
       marker-file: url('symbols/shop/sports.svg');
     }
@@ -2428,6 +2436,7 @@
   [feature = 'shop_bed'],
   [feature = 'shop_beverages'],
   [feature = 'shop_books'],
+  [feature = 'shop_charity'],
   [feature = 'shop_clothes'],
   [feature = 'shop_coffee'],
   [feature = 'shop_computer'],
@@ -2483,6 +2492,7 @@
   [feature = 'shop_toys'],
   [feature = 'shop_travel_agency'],
   [feature = 'shop_seafood'],
+  [feature = 'shop_second_hand'],
   [feature = 'shop_sports'],
   [feature = 'shop_stationery'],
   [feature = 'shop_tobacco'],
diff --git a/project.mml b/project.mml
index fef74f85d9..7a00a89a60 100644
--- a/project.mml
+++ b/project.mml
@@ -1527,7 +1527,7 @@ Layer:
                                'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery',
                                'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
                                'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate',
-                               'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket') THEN shop
+                               'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand') THEN shop
                                ELSE 'other' END AS shop,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
@@ -1660,7 +1660,7 @@ Layer:
                                'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery',
                                'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
                                'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate',
-                               'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket') THEN shop
+                               'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand') THEN shop
                                ELSE 'other' END AS shop,
             NULL AS way_pixels
           FROM planet_osm_point
@@ -2063,7 +2063,7 @@ Layer:
                                             'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys',
                                             'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages',
                                             'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea',
-                                            'coffee', 'tyres', 'pastry', 'chocolate', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket') THEN shop
+                                            'coffee', 'tyres', 'pastry', 'chocolate', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand') THEN shop
                               WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
               'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
               'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
@@ -2230,7 +2230,7 @@ Layer:
                                                 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts',
                                                 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics',
                                                 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres',
-                                                'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket') THEN shop
+                                                'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand') THEN shop
                                   WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
                   'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
                   'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
diff --git a/symbols/shop/charity.svg b/symbols/shop/charity.svg
new file mode 100644
index 0000000000..959a44d428
--- /dev/null
+++ b/symbols/shop/charity.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <defs
+     id="defs3053" />
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="variety_store"
+     d="M 5 0 C 4 0 4 0 4 1 L 4.0097656 4 L 1 4 L 1 13 C 1 14 1 14 2 14 L 12 14 C 13 14 13 14 13 13 L 13 4 L 10.039062 4 L 10 1 C 10 0 10 0 9 0 L 5 0 z M 5 1 L 9 1 L 9 4 L 5 4 L 5 1 z M 5.1777344 5.4980469 C 5.6948144 5.4951869 5.8032568 5.5555569 6.1074219 5.7226562 C 6.4776429 5.9260446 6.8587292 6.6814598 6.9375 6.9902344 L 6.9863281 7.1816406 L 7.1054688 6.9179688 C 7.8374226 5.3155896 9.9453218 4.8690109 10.701172 6.6347656 C 10.910591 7.1239934 10.967755 8.1253493 10.755859 8.6972656 C 10.479448 9.4433093 9.9599004 10.013184 8.7597656 10.884766 C 7.9726964 11.456366 7.0815411 12.319938 7.0195312 12.441406 C 6.9475482 12.582409 7.0151826 12.463679 6.6972656 12.107422 C 6.5296439 11.919585 6.1115092 11.554652 5.7675781 11.294922 C 4.7485372 10.525363 4.6110174 10.414187 4.1972656 10.033203 C 3.4344883 9.3308342 3.110218 8.624774 3.1113281 7.6679688 C 3.1118698 7.2008944 3.1426367 7.02141 3.2734375 6.7460938 C 3.4953509 6.2789969 3.8223062 5.9310322 4.2402344 5.71875 C 4.5362383 5.5683985 4.6834278 5.5007797 5.1777344 5.4980469 z " />
+</svg>
diff --git a/symbols/shop/department_store.svg b/symbols/shop/department_store.svg
index 38bec3ea35..6082e1c438 100644
--- a/symbols/shop/department_store.svg
+++ b/symbols/shop/department_store.svg
@@ -5,15 +5,15 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="14"
-   height="14"
-   viewBox="0 0 14 14"
    id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
    version="1.1">
   <defs
-     id="defs4" />
+     id="defs3053" />
   <metadata
-     id="metadata7">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -25,14 +25,13 @@
     </rdf:RDF>
   </metadata>
   <rect
-     width="14"
-     height="14"
-     x="0"
-     y="0"
+     style="fill:none;stroke:none;visibility:hidden"
      id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
   <path
-     id="rect3477"
-     d="M 7.0664063,0 C 6.4300663,0 5.7941523,0.16062188 5.2226563,0.48242188 4.1024903,1.1133219 3.3931204,2.2802344 3.3652344,3.5527344 l -1.8671875,0 L 1,12.972656 1,14 13.064453,14 12.511719,3.5527344 l -1.744141,0 C 10.739678,2.2802344 10.030331,1.1133219 8.9101563,0.48242188 8.3386613,0.16062187 7.7027473,0 7.0664063,0 Z m 0,1.5273438 c 0.378661,0 0.7576841,0.094956 1.0957031,0.2851562 0.652423,0.3675 1.050958,1.0240344 1.078125,1.7402344 l -4.3476563,0 C 4.9196981,2.8365344 5.3182802,2.18 5.9707031,1.8125 6.3087222,1.6222 6.6877463,1.5273438 7.0664063,1.5273438 Z M 6.7675781,5.2011719 c 0.7750155,0 1.3450096,0.1519044 1.7089844,0.453125 0.3639749,0.3012205 0.5449219,0.6615775 0.5449219,1.0820312 0,0.2353286 -0.055011,0.4612321 -0.1679687,0.6777344 C 8.7436957,7.6305648 8.6100107,7.8064845 8.453125,7.9414062 8.2962393,8.076328 8.0160933,8.276263 7.6113281,8.5429688 c 0.3357355,0.3357354 0.6848533,0.6488302 1.0488282,0.9375 0.097269,-0.1945383 0.1809703,-0.4006853 0.25,-0.6171876 L 10.40625,9.1972656 C 10.327807,9.4733845 10.251855,9.6950293 10.179687,9.8613281 10.10752,10.027627 10.006784,10.223303 9.875,10.449219 l 0.71875,0.49414 c 0.08786,0.05648 0.201784,0.124683 0.339844,0.203125 L 9.9023438,12.332031 C 9.7140809,12.231624 9.5184046,12.116159 9.3144531,11.984375 9.1136394,11.852591 8.933461,11.738663 8.7734375,11.644531 8.4408398,11.864171 8.1079884,12.024593 7.7753907,12.125 c -0.461244,0.138059 -0.9855131,0.207031 -1.5722657,0.207031 -0.9193502,0 -1.6040412,-0.191417 -2.0527343,-0.574219 -0.4486932,-0.382801 -0.671875,-0.846615 -0.671875,-1.392578 0,-0.3922139 0.1309632,-0.7630415 0.3945312,-1.1113278 C 4.1366149,8.9024823 4.5686654,8.6068384 5.1679688,8.3652344 4.9169516,8.0608761 4.7445221,7.7969965 4.6503907,7.5742188 c -0.094132,-0.2259155 -0.140625,-0.4553092 -0.140625,-0.6875 0,-0.4894835 0.1852057,-0.8920753 0.5585937,-1.2089844 0.373388,-0.3169092 0.9398919,-0.4765625 1.6992187,-0.4765625 z m 0.080078,1.0351562 c -0.1945383,0 -0.3522385,0.056964 -0.4746094,0.1699219 -0.1223709,0.1129577 -0.1835938,0.2466426 -0.1835938,0.4003906 0,0.1945383 0.1724296,0.477406 0.5175782,0.8476563 0.2478794,-0.1349217 0.439297,-0.2806143 0.5742187,-0.4375 0.1349219,-0.1600235 0.2011721,-0.3119279 0.2011721,-0.453125 0,-0.1474726 -0.055011,-0.2706869 -0.1679688,-0.3710938 -0.1129577,-0.1035445 -0.2691208,-0.15625 -0.4667968,-0.15625 z m -0.8242188,3.09375 C 5.7598695,9.5152033 5.5859029,9.6729035 5.4980469,9.8046875 5.4133286,9.9364715 5.3691407,10.075184 5.3691407,10.222656 c 0,0.229053 0.099199,0.434432 0.296875,0.613282 0.1976759,0.178849 0.4565283,0.267578 0.7734374,0.267578 0.3420109,0 0.7256147,-0.133685 1.1523438,-0.400391 C 7.1838941,10.389354 6.6603935,9.9325193 6.0234375,9.3300781 Z"
-     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+     id="variety_store"
+     d="M 5 0 C 4 0 4 0 4 1 L 4.0097656 4 L 1 4 L 1 13 C 1 14 1 14 2 14 L 12 14 C 13 14 13 14 13 13 L 13 4 L 10.039062 4 L 10 1 C 10 0 10 0 9 0 L 5 0 z M 5 1 L 9 1 L 9 4 L 5 4 L 5 1 z M 6.5683594 5.5 C 7.3324736 5.5 7.8930989 5.6496197 8.2519531 5.9453125 C 8.6108082 6.2410052 8.7890625 6.5950746 8.7890625 7.0078125 C 8.7890625 7.2388225 8.7363691 7.4593457 8.625 7.671875 C 8.5167249 7.8844042 8.3851479 8.0570074 8.2304688 8.1894531 C 8.0757896 8.321899 7.799462 8.5194386 7.4003906 8.78125 C 7.731404 9.1108243 8.0747386 9.4177996 8.4335938 9.7011719 C 8.5294954 9.5102039 8.6116295 9.3082323 8.6796875 9.0957031 L 10.154297 9.421875 C 10.076958 9.6929269 10.002795 9.9109708 9.9316406 10.074219 C 9.8604887 10.237466 9.7607896 10.430574 9.6308594 10.652344 L 10.339844 11.136719 C 10.426468 11.192163 10.539663 11.258938 10.675781 11.335938 L 9.6582031 12.5 C 9.4725884 12.401436 9.2792081 12.287569 9.078125 12.158203 C 8.8801358 12.028837 8.7026949 11.916629 8.5449219 11.824219 C 8.2170034 12.039828 7.8884653 12.198315 7.5605469 12.296875 C 7.1057911 12.432408 6.5902182 12.5 6.0117188 12.5 C 5.105301 12.5 4.4306627 12.311325 3.9882812 11.935547 C 3.5458997 11.559771 3.3242188 11.104303 3.3242188 10.568359 C 3.3242187 10.183343 3.4549833 9.8204104 3.7148438 9.4785156 C 3.9747044 9.1335408 4.3993605 8.842639 4.9902344 8.6054688 C 4.7427483 8.3066957 4.5732757 8.0487676 4.4804688 7.8300781 C 4.3876628 7.6083084 4.3417969 7.3822268 4.3417969 7.1542969 C 4.3417969 6.6737961 4.5244424 6.2798435 4.8925781 5.96875 C 5.2607138 5.6576564 5.8197136 5.5000001 6.5683594 5.5 z M 6.6464844 6.515625 C 6.4546827 6.515625 6.2983841 6.5727088 6.1777344 6.6835938 C 6.0570852 6.7944786 5.9980469 6.9252454 5.9980469 7.0761719 C 5.9980469 7.2671402 6.1675197 7.5447474 6.5078125 7.9082031 C 6.7522057 7.7757575 6.9411942 7.6325223 7.0742188 7.4785156 C 7.2072429 7.3214287 7.2734375 7.1718092 7.2734375 7.0332031 C 7.2734375 6.8884368 7.2187922 6.7684859 7.1074219 6.6699219 C 6.9960531 6.5682783 6.8413799 6.515625 6.6464844 6.515625 z M 5.8339844 9.5527344 C 5.5741249 9.7344624 5.4030262 9.8901663 5.3164062 10.019531 C 5.2328775 10.148897 5.1894531 10.284921 5.1894531 10.429688 C 5.1894531 10.654536 5.2875274 10.855682 5.4824219 11.03125 C 5.6773172 11.206818 5.9316895 11.294922 6.2441406 11.294922 C 6.5813408 11.294922 6.960133 11.162203 7.3808594 10.900391 C 6.9786942 10.592379 6.4619816 10.14412 5.8339844 9.5527344 z " />
 </svg>
diff --git a/symbols/shop/second_hand.svg b/symbols/shop/second_hand.svg
new file mode 100644
index 0000000000..9c58e5923b
--- /dev/null
+++ b/symbols/shop/second_hand.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <defs
+     id="defs3053" />
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="variety_store"
+     d="M 5 0 C 4 0 4 0 4 1 L 4.0097656 4 L 1 4 L 1 13 C 1 14 1 14 2 14 L 12 14 C 13 14 13 14 13 13 L 13 4 L 10.039062 4 L 10 1 C 10 0 10 0 9 0 L 5 0 z M 5 1 L 9 1 L 9 4 L 5 4 L 5 1 z M 7.5058594 5 L 7.7089844 5.0371094 C 9.127416 5.2898435 10.312583 6.2814255 10.802734 7.6289062 C 10.92386 7.9618667 10.997929 8.3050881 11.027344 8.6464844 C 11.10874 9.5911796 10.79949 10.505123 10.261719 11.275391 L 10.628906 11.275391 C 10.896171 11.275879 11.117833 11.495542 11.117188 11.761719 L 11.115234 12.134766 C 11.114596 12.400627 10.894277 12.619637 10.626953 12.619141 L 8.2871094 12.615234 C 8.1229556 12.614907 7.985863 12.478206 7.9863281 12.314453 L 7.9902344 9.9863281 C 7.9907095 9.7203155 8.2131374 9.5014573 8.4804688 9.5019531 L 8.8554688 9.5039062 C 9.1227401 9.5043956 9.3422952 9.7241955 9.3417969 9.9902344 L 9.3417969 10.115234 C 9.6441071 9.4824952 9.7864932 8.7764922 9.5351562 8.0859375 C 9.2090275 7.1890315 8.4157004 6.5277685 7.4707031 6.359375 L 7.2675781 6.3242188 L 7.5058594 5 z M 3.3730469 5.3808594 L 5.7128906 5.3867188 C 5.8768459 5.3871794 6.0140065 5.522003 6.0136719 5.6855469 L 6.0078125 8.0136719 C 6.0073128 8.2796454 5.7867778 8.5003236 5.5195312 8.5 L 5.1445312 8.4980469 C 4.8772592 8.4975502 4.6598241 8.2775935 4.6601562 8.0117188 L 4.6582031 7.8828125 C 4.3544146 8.5162943 4.2131087 9.2202828 4.4648438 9.9121094 C 4.7911367 10.80884 5.5824543 11.474181 6.5273438 11.642578 L 6.7324219 11.677734 L 6.4941406 13 L 6.2890625 12.962891 C 4.8704482 12.71008 3.687413 11.716612 3.1972656 10.369141 C 2.7403868 9.112724 3.0285796 7.7766811 3.7636719 6.7265625 L 3.3691406 6.7265625 C 3.101876 6.7260652 2.8823236 6.5062597 2.8828125 6.2402344 L 2.8828125 5.8671875 C 2.8834574 5.6013473 3.1058056 5.3805353 3.3730469 5.3808594 z " />
+  <g
+     style="stroke:#ffffff;stroke-width:0.39158532;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="g14-2"
+     transform="matrix(-0.09028729,-1.0478869,1.0529738,-0.08985112,-48.182422,73.378083)" />
+</svg>