diff --git a/amenity-points.mss b/amenity-points.mss
index 4f65c028f8..20c663d0c9 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -360,8 +360,10 @@
   }
 
   [feature = 'amenity_prison'][zoom >= 17] {
-    point-file: url('symbols/amenity_prison.p.20.png');
-    point-placement: interior;
+    marker-file: url('symbols/prison.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'tourism_viewpoint'][zoom >= 16] {
@@ -1501,7 +1503,7 @@
     text-name: "[name]";
     text-size: 10;
     text-fill: #734a08;
-    text-dy: 16;
+    text-dy: 12;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
     text-wrap-width: @standard-wrap-width;
diff --git a/symbols/amenity_prison.p.20.png b/symbols/amenity_prison.p.20.png
deleted file mode 100644
index 05425fb64e..0000000000
Binary files a/symbols/amenity_prison.p.20.png and /dev/null differ
diff --git a/symbols/prison.16.svg b/symbols/prison.16.svg
new file mode 100644
index 0000000000..ec7e760b7f
--- /dev/null
+++ b/symbols/prison.16.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16">
+  <path
+     d="M 1,1 1,15 15,15 15,1 1,1 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 4.2009277,10.13501 4,10.5625 4,11 L 4,14 2,14 2,2 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 6,14 6,2 z m 5,0 3,0 0,12 -2,0 0,-3 C 12,10.5625 11.799072,10.13501 11.5,9.78125 L 11.5,14 11,14 11,2 z M 8,4 C 7.3991523,4 6.8666154,4.2680514 6.5,4.6875 l 0,2.625 C 6.8666154,7.7319486 7.3991523,8 8,8 8.6008474,8 9.1333845,7.7319486 9.5,7.3125 l 0,-2.625 C 9.1333845,4.2680514 8.6008474,4 8,4 z" />
+</svg>