diff --git a/assets/layers/police/license_info.json b/assets/layers/police/license_info.json
new file mode 100644
index 000000000..e1d743c53
--- /dev/null
+++ b/assets/layers/police/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "police.svg",
+    "license": "CC-BY 4.0",
+    "authors": [
+      "Twemoji"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Twemoji12_1f693.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/police/police.json b/assets/layers/police/police.json
new file mode 100644
index 000000000..a79631991
--- /dev/null
+++ b/assets/layers/police/police.json
@@ -0,0 +1,142 @@
+{
+  "id": "police",
+  "name": {
+    "en": "Police stations"
+  },
+  "description": {
+    "en": "Many types of police facilities "
+  },
+  "source": {
+    "osmTags": {
+      "or": [
+        "amenity=police",
+        "police~*"
+      ]
+    }
+  },
+  "minzoom": 10,
+  "title": {
+    "render": {
+      "en": "{name}"
+    }
+  },
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "#00000000"
+        },
+        {
+          "icon": "./assets/layers/police/police.svg"
+        }
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "width": 1,
+      "color": "blue"
+    }
+  ],
+  "presets": [
+    {
+      "tags": [
+        "amenity=police"
+      ],
+      "title": {
+        "en": "a police office"
+      },
+      "description": {
+        "en": "A police office where the general public can enter for inquiries"
+      }
+    },
+    {
+      "tags": [
+        "police=checkpoint"
+      ],
+      "title": {
+        "en": "a police checkpoint"
+      },
+      "description": {
+        "en": "A place where police performs checks on travelling people"
+      }
+    },
+    {
+      "tags": [
+        "police=offices"
+      ],
+      "title": {
+        "en": "an administrative, police backoffice"
+      },
+      "description": {
+        "en": "An administrative police office without services for the general public."
+      }
+    },
+    {
+      "tags": [
+        "police=detention"
+      ],
+      "title": "a police detention center",
+      "description": {
+        "en": "A jail run by the police without public services. People are detained here for a short time (at most a few days), e.g. for small misdemeanors, disturbance of the public order or awaiting a trial"
+      }
+    },
+    {
+      "tags": [
+        "police=naval_base"
+      ],
+      "title": "a police naval base",
+      "description": {
+        "en": "A naval or maritime base for the maritime police; often with a pier and police boats nearby"
+      }
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    "reviews",
+    {
+      "question": {
+        "en": "What is the name of this police facility?"
+      },
+      "id": "police_name",
+      "render": {
+        "en": "<b>{name}</b>"
+      },
+      "freeform": {
+        "key": "name"
+      }
+    },
+    "{preset_type_select()}",
+    "contact",
+    "opening_hours",
+    {
+      "question": {
+        "en": "Does this police office have detention facilities?"
+      },
+      "id": "4_z2nrdhy6tyyh4fd",
+      "condition": "amenity=police",
+      "mappings": [
+        {
+          "if": "detention=yes",
+          "then": {
+            "en": "This police office has some cells to detain people"
+          }
+        },
+        {
+          "if": "detention=no",
+          "then": {
+            "en": "This police office does not have cells to detain people"
+          }
+        }
+      ]
+    }
+  ],
+  "deletion": true,
+  "allowMove": true,
+  "enableMorePrivacy": true
+}
diff --git a/assets/layers/police/police.svg b/assets/layers/police/police.svg
new file mode 100644
index 000000000..cbf344d7c
--- /dev/null
+++ b/assets/layers/police/police.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M32 22s-2-8-5-8H16c-3 0-7 7-7 7s-8 1-8 5v2c0 .09.021.175.026.263C.417 28.605 0 29.251 0 30c0 1.104.896 2 2 2h30c2.209 0 4-1.791 4-4v-2c0-2.209-1.791-4-4-4z"/><path fill="#292F33" d="M1 26v2c0 .09.021.175.026.263C.417 28.605 0 29.251 0 30c0 1.104.896 2 2 2h30c2.209 0 4-1.791 4-4v-2c0-.348-.059-.679-.142-1H1.201c-.117.312-.201.641-.201 1z"/><path fill="#66757F" d="M15.91 32c.055-.326.09-.658.09-1 0-3.313-2.686-6-6-6-3.313 0-6 2.687-6 6 0 .342.035.674.09 1h11.82zm17 0c.055-.326.09-.658.09-1 0-3.313-2.687-6-6-6s-6 2.687-6 6c0 .342.035.674.09 1h11.82z"/><circle fill="#292F33" cx="10" cy="31" r="4"/><circle fill="#E1E8ED" cx="10" cy="31" r="2"/><circle fill="#292F33" cx="27" cy="31" r="4"/><circle fill="#E1E8ED" cx="27" cy="31" r="2"/><path fill="#DD2E44" d="M21 13c0 .552-.447 1-1 1h-3c-.552 0-1-.448-1-1s.448-1 1-1h3c.553 0 1 .448 1 1z"/><path fill="#55ACEE" d="M22 13c0 .552-.447 1-1 1h-2c-.552 0-1-.448-1-1s.448-1 1-1h2c.553 0 1 .448 1 1zm1 8h7s-2-5-3-5h-4v5zm-2-5h-5c-2 0-5 5-5 5h10v-5z"/></svg>
\ No newline at end of file
diff --git a/assets/layers/police/police.svg.license b/assets/layers/police/police.svg.license
new file mode 100644
index 000000000..77a8edb48
--- /dev/null
+++ b/assets/layers/police/police.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Twemoji
+SPDX-License-Identifier: CC-BY 4.0
\ No newline at end of file
diff --git a/assets/themes/disaster_response/disaster_response.json b/assets/themes/disaster_response/disaster_response.json
index 23ba39a20..f39fccf12 100644
--- a/assets/themes/disaster_response/disaster_response.json
+++ b/assets/themes/disaster_response/disaster_response.json
@@ -18,8 +18,15 @@
   "socialImage": "./assets/themes/disaster_response/social.svg",
   "layers": [
     "hospital",
+    "pharmacy",
+    "doctors",
     "assembly_point",
-    "disaster_response"
+    "disaster_response",
+    "police",
+    "fire_station",
+    "ambulancestation",
+    "extinguisher",
+    "hydrant"
   ],
   "docs": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities"
-}
\ No newline at end of file
+}
diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json
index 684c36660..83fd347e5 100644
--- a/assets/themes/surveillance/surveillance.json
+++ b/assets/themes/surveillance/surveillance.json
@@ -59,7 +59,8 @@
       "override": {
         "minzoom": 12
       }
-    }
+    },
+    "police"
   ],
   "enableMorePrivacy": true
 }