diff --git a/data/colors.txt b/data/colors.txt
index 4c75526a6e..b2aa5da0d4 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -416,6 +416,8 @@
 2152292681
 2152416835
 2153149782
+2154984050
+2155839359
 2159483932
 2160576191
 2160707771
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 33f112cf5c..1a3199d117 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 3a97ad6738..3615922976 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -11221,11 +11221,50 @@ cont {
 }
 cont {
   name: "amenity-prison"
+  element {
+    scale: 12
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11234,14 +11273,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 18
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11250,14 +11293,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 19
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11266,14 +11313,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 20
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11282,7 +11333,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 1c485c8fdb..2f3e22f109 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 5c1f48c694..f0d2ec2b6f 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -11043,11 +11043,50 @@ cont {
 }
 cont {
   name: "amenity-prison"
+  element {
+    scale: 12
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2154984050
+      priority: 20
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11056,14 +11095,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 18
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11072,14 +11115,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 19
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11088,14 +11135,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 20
+    area {
+      color: 2154984050
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11104,7 +11155,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 9306aa4e7f..0dbea3cee2 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 7f1634996e..b93a7141ef 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -11043,11 +11043,50 @@ cont {
 }
 cont {
   name: "amenity-prison"
+  element {
+    scale: 12
+    area {
+      color: 2155839359
+      priority: 20
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2155839359
+      priority: 20
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2155839359
+      priority: 20
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2155839359
+      priority: 20
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2155839359
+      priority: 20
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2155839359
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11056,14 +11095,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 18
+    area {
+      color: 2155839359
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11072,14 +11115,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 19
+    area {
+      color: 2155839359
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11088,14 +11135,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
   element {
     scale: 20
+    area {
+      color: 2155839359
+      priority: 20
+    }
     symbol {
       name: "prison-m"
-      priority: 1500
+      priority: 2000
     }
     caption {
       primary {
@@ -11104,7 +11155,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8500
+      priority: -8000
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 971098cb58..a80ceee578 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index fa9adabcd3..0dfb0bda57 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -4804,6 +4804,137 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-prison"
+  element {
+    scale: 12
+    area {
+      color: 2154984050
+      priority: 15
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2154984050
+      priority: 15
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2154984050
+      priority: 15
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2154984050
+      priority: 15
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2154984050
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2154984050
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2154984050
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2154984050
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 2154984050
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 8a5064fa37..bef858e2b4 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 51fa95e936..63205504e4 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -4804,6 +4804,137 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-prison"
+  element {
+    scale: 12
+    area {
+      color: 2155839359
+      priority: 15
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2155839359
+      priority: 15
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2155839359
+      priority: 15
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2155839359
+      priority: 15
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2155839359
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2155839359
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2155839359
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2155839359
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 2155839359
+      priority: 15
+    }
+    symbol {
+      name: "prison-m"
+      priority: 520
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9480
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index 6af9f20ebf..ecf102dcc0 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -137,7 +137,7 @@ world  000000000000000000000  +
         police  000000000000000001111  -
         post_box  000000000000000000000  -
         post_office  000000000000000001111  -
-        prison  000000000000000000000  -
+        prison  000000000000111111111  -
         pub  000000000000000000000  -
         public_bath  000000000000000000000  -
         public_bookcase  000000000000000000000  -