diff --git a/amenity-points.mss b/amenity-points.mss
index 12b736bd35..6134757b30 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -353,15 +353,23 @@
     marker-clip: false;
   }
 
-  [feature = 'man_made_mast']{
+  [feature = 'man_made_mast'] {
     [zoom >= 15][height > 80],
     [zoom >= 16][height > 40],
     [zoom >= 17][height > 20],
     [zoom >= 18] {
-      marker-file: url('symbols/mast.svg');
-      marker-fill: @man-made-icon;
-      marker-placement: interior;
-      marker-clip: false;
+      ["tower:type" != 'lighting'] {  
+        marker-file: url('symbols/mast.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;
+      }
+      ["tower:type" = 'lighting'][zoom >= 18] {
+        marker-file: url('symbols/mast_lighting.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;
+      }      
       ["tower:type" = 'communication'] {
         marker-file: url('symbols/mast_communications.svg');
       }
@@ -373,16 +381,24 @@
     [zoom >= 14][height > 50],
     [zoom >= 15][height > 30],
     [zoom >= 17] {
-      marker-file: url('symbols/tower_generic.svg');
-      marker-fill: @man-made-icon;
-      marker-placement: interior;
-      marker-clip: false;
+      ["tower:type" != 'lighting'] {
+        marker-file: url('symbols/tower_generic.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;
+      }
       ["tower:type" = 'defensive'] {
         marker-file: url('symbols/tower_defensive.svg');  
       }
       ["tower:type" = 'observation'] {
         marker-file: url('symbols/tower_observation.svg');  
       }
+      ["tower:type" = 'lighting'][zoom >= 18] {
+        marker-file: url('symbols/tower_lighting.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;        
+      }      
       ["tower:construction" = 'lattice'] {
         marker-file: url('symbols/tower_lattice.svg');
       }
@@ -393,7 +409,7 @@
         }
       }
     }
-   }
+  }
 
   [feature = 'tourism_museum'][zoom >= 16] {
     marker-file: url('symbols/museum.svg');
diff --git a/symbols/mast_lighting.svg b/symbols/mast_lighting.svg
new file mode 100644
index 0000000000..bbdfa1ec65
--- /dev/null
+++ b/symbols/mast_lighting.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"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <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>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="visibility:hidden;fill:none;stroke:none" />
+  <path
+     id="path829"
+     d="M 7 1 C 6.4022075 1 6 1.4692172 6 2 L 6 9 L 3.1132812 14 L 4.2675781 14 L 6 11 L 6 14 L 8 14 L 8 11 L 9.7324219 14 L 10.886719 14 L 8 9 L 8 2 C 8 1.5039063 7.5977925 1 7 1 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854766 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956656 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z " />
+</svg>
diff --git a/symbols/tower_lighting.svg b/symbols/tower_lighting.svg
new file mode 100644
index 0000000000..4f247f4ffa
--- /dev/null
+++ b/symbols/tower_lighting.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">
+  <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>
+  <defs
+     id="defs6" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="path828"
+     d="M 7 1 C 6.4022075 1 6 1.4692172 6 2 L 6 11 L 5 11 L 5 12 L 3 12 L 3 14 L 11 14 L 11 12 L 9 12 L 9 11 L 8 11 L 8 2 C 8 1.5039063 7.5977925 1 7 1 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854767 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956657 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z " />
+</svg>