diff --git a/amenity-points.mss b/amenity-points.mss
index ee53c58938..cc605455b9 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -574,8 +574,10 @@
   }
 
   [feature = 'man_made_lighthouse'][zoom >= 15] {
-    point-file: url('symbols/lighthouse.p.20.png');
-    point-placement: interior;
+    marker-file: url('symbols/lighthouse.16.svg');
+    marker-placement: interior;
+    marker-clip: false;
+    marker-fill: @transportation-icon;
   }
 
   [feature = 'natural_peak'][zoom >= 11] {
diff --git a/symbols/lighthouse.16.svg b/symbols/lighthouse.16.svg
new file mode 100644
index 0000000000..eb7eae4cf9
--- /dev/null
+++ b/symbols/lighthouse.16.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="100%"
+   height="100%"
+   viewBox="0 0 16 16"
+   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="16"
+     height="16"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 8.0003065,1 -3,1.5 c -0.465049,1.5 -0.465049,2.5 0,4.5 l 1,0 -1,8 6.0000005,0 -1,-8 1,0 c 0.530187,-2 0.530187,-3 0,-4.5 L 8.0003065,1 z m -6.28125,1.46875 c -0.167266,0.084188 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07646,-0.030824 -0.131745,-0.028062 -0.1875,0 z m 12.3750005,0 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 C 14.58738,2.8142024 14.399879,2.3454524 14.094057,2.46875 z M 5.5003065,3 10.500307,3 c 0.259083,1 0.259083,2 0,3 L 5.5003065,6 c -0.259083,-1 -0.259083,-2 0,-3 z m -3.75,1.25 c -0.329742,0 -0.329742,0.5 0,0.5 l 2,0 c 0.330396,0 0.329742,-0.5 0,-0.5 l -2,0 z m 10.5000005,0 c -0.329742,0 -0.330396,0.5 0,0.5 l 2,0 c 0.329741,0 0.329741,-0.5 0,-0.5 l -2,0 z m -8.6562505,1.125 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 C 4.0873785,5.7204524 3.8998785,5.2517024 3.5940565,5.375 z m 8.6250005,0 c -0.167266,0.084187 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07645,-0.030824 -0.131745,-0.028062 -0.1875,0 z"
+     id="lighthouse"
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/lighthouse.p.20.png b/symbols/lighthouse.p.20.png
deleted file mode 100644
index f2e268fcbb..0000000000
Binary files a/symbols/lighthouse.p.20.png and /dev/null differ