diff --git a/amenity-points.mss b/amenity-points.mss
index a5533d89a8..588a1f4049 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -987,8 +987,9 @@
   }
 
   [feature = 'natural_cave_entrance'][zoom >= 15] {
-    point-file: url('symbols/poi_cave.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/cave.14.svg');
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'natural_spring'][zoom >= 14] {
diff --git a/symbols/cave.14.svg b/symbols/cave.14.svg
new file mode 100644
index 0000000000..d4eabc142d
--- /dev/null
+++ b/symbols/cave.14.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"
+   version="1.1"
+   width="14"
+   height="14"
+   id="svg2"
+   enable-background="new">
+  <metadata
+     id="metadata9">
+    <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="defs7" />
+  <path
+     d="M 3,10 C 3,9 5,6 6.9763711,6.0000697 9,6 11,9 11,10 L 7,10 Z M 7,3 C 4,3 0,7 0,10 l 1,0 C 1,7 5,4 7,4 c 2,0 6,3 6,6 l 1,0 C 14,7 10,3 7,3 Z"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+     id="path4185" />
+</svg>
diff --git a/symbols/poi_cave.p.16.png b/symbols/poi_cave.p.16.png
deleted file mode 100644
index aafddbb94b..0000000000
Binary files a/symbols/poi_cave.p.16.png and /dev/null differ