diff --git a/amenity-points.mss b/amenity-points.mss
index c17c596bbe..1adf5bdeb0 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -834,7 +834,7 @@
   }
 
   [feature = 'shop'] {
-    [shop != 'mall'][zoom >= 17],
+    [shop != 'mall'][shop != 'massage'][zoom >= 17],
     [shop = 'supermarket'][zoom >= 16],
     [shop = 'department_store'][zoom >= 16] {
       marker-placement: interior;
@@ -842,7 +842,7 @@
       marker-fill: @shop-icon;
     }
 
-    [zoom >= 17][zoom < 18][shop != 'supermarket'][shop != 'department_store'][shop != 'mall'] {
+    [zoom >= 17][zoom < 18][shop != 'supermarket'][shop != 'department_store'][shop != 'mall'][shop != 'massage'] {
       marker-width: 4;
       marker-line-width: 0;
     }
@@ -1065,6 +1065,11 @@
     [shop = 'interior_decoration'][zoom >= 18] {
       marker-file: url('symbols/shop/interior_decoration.svg');
     }
+
+    [shop = 'massage'][zoom >= 18] {
+      marker-file: url('symbols/shop/massage.svg');
+      marker-fill: @leisure-green;
+    }
     
     [shop = 'medical_supply'][zoom >= 18]{
       marker-file: url('symbols/shop/medical_supply.svg');
@@ -2502,6 +2507,7 @@
   [feature = 'shop_perfumery'],
   [feature = 'shop_furniture'],
   [feature = 'shop_kiosk'],
+  [feature = 'shop_massage'],
   [feature = 'shop_medical_supply'],
   [feature = 'shop_mobile_phone'],
   [feature = 'shop_motorcycle'],
@@ -2543,6 +2549,9 @@
       [feature = 'shop_car_repair'] {
         text-fill: @amenity-brown;
       }
+      [feature = 'shop_massage'] {
+        text-fill: @leisure-green;
+      }
     }
   }
 
diff --git a/project.mml b/project.mml
index c8ba94af20..8175c02020 100644
--- a/project.mml
+++ b/project.mml
@@ -1527,7 +1527,8 @@ 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', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
+                               'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 
+                               'interior_decoration', 'video', 'paint', 'massage') 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 +1661,8 @@ 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', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
+                               'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 
+                               'interior_decoration', 'video', 'paint', 'massage') THEN shop
                                ELSE 'other' END AS shop,
             NULL AS way_pixels
           FROM planet_osm_point
@@ -2063,7 +2065,8 @@ 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', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
+                                            'coffee', 'tyres', 'pastry', 'chocolate', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 
+                                            'charity', 'second_hand', 'interior_decoration', 'video', 'paint', 'massage') 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 +2233,8 @@ 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', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
+                                                'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 
+                                                'interior_decoration', 'video', 'paint', 'massage') 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/massage.svg b/symbols/shop/massage.svg
new file mode 100644
index 0000000000..2e4395a288
--- /dev/null
+++ b/symbols/shop/massage.svg
@@ -0,0 +1,31 @@
+<?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>
+  <path
+     id="rect823"
+     d="M 5.5449219 1 A 1.5 1.5 0 0 0 4.0449219 2.5 A 1.5 1.5 0 0 0 5.5449219 4 A 1.5 1.5 0 0 0 7.0449219 2.5 A 1.5 1.5 0 0 0 5.5449219 1 z M 4.3300781 4.5097656 C 3.9406791 4.5609641 3.5894805 4.8289578 3.4570312 5.2148438 L 2.1582031 9 L 4.2265625 9 L 5.1738281 6.2421875 L 6.1914062 7.2890625 C 6.2070166 7.3051225 6.2270579 7.3126522 6.2441406 7.3261719 C 6.261156 7.3411298 6.2816192 7.3506327 6.3007812 7.3632812 C 6.330583 7.3808944 6.3585151 7.399261 6.390625 7.4101562 C 6.4071604 7.416766 6.4199583 7.4286562 6.4375 7.4335938 L 8.3613281 7.9746094 C 8.6279666 8.0496622 8.9034628 7.8955447 8.9785156 7.6289062 C 9.0535685 7.3622678 8.899451 7.0887247 8.6328125 7.0136719 L 6.8242188 6.5039062 L 5.1660156 4.7988281 C 5.154409 4.7868872 5.1393915 4.7820212 5.1269531 4.7714844 C 5.0172038 4.665986 4.8878893 4.5779543 4.7246094 4.5351562 C 4.5930588 4.5006749 4.4598778 4.4926995 4.3300781 4.5097656 z M 11.5 8 A 1.5 1.5 0 0 0 10 9.5 A 1.5 1.5 0 0 0 11.5 11 A 1.5 1.5 0 0 0 13 9.5 A 1.5 1.5 0 0 0 11.5 8 z M 1 10 C 0.446 10 0 10.446 0 11 C 0 11.554 0.446 12 1 12 L 5.5390625 12 L 7 12 L 9.1953125 12 L 11.253906 12.949219 C 11.320888 12.980138 11.391036 12.992352 11.458984 12.992188 C 11.473179 12.993388 11.485484 13 11.5 13 L 13.5 13 C 13.777 13 14 12.777 14 12.5 C 14 12.223 13.777 12 13.5 12 L 11.560547 12 L 7.34375 10.052734 C 7.2612144 10.014635 7.1762784 10.011013 7.09375 10.019531 C 7.0613102 10.016383 7.0332933 10 7 10 L 3.8828125 10 L 1.8144531 10 L 1 10 z "
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.7492063" />
+</svg>