diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
new file mode 100644
index 000000000..2c34b4538
--- /dev/null
+++ b/assets/layers/doctors/doctors.json
@@ -0,0 +1,76 @@
+{
+    "id": "doctors",
+    "name": {
+        "en": "doctors"
+    },
+    "title": {
+        "render": {
+            "en": "Doctors Office {name}"
+        }
+    },
+    "source": {
+        "osmTags": {
+            "and": [
+                "amenity=doctors"
+            ]
+        }
+    },
+    "minzoom": 13,
+    "tagRenderings": [
+        "images",
+        "opening_hours",
+        "phone",
+        "email",
+        "website",
+        {
+            "id": "specialty",
+            "render": {
+                "en": "This doctor is specialized in {healthcare:speciality}"
+            },
+            "question": {
+                "en": "What is this doctor specialized in?"
+            },
+            "freeform": {
+                "key": "healthcare:speciality"
+            },
+            "mappings": [
+                {
+                    "if": "healthcare:speciality=general",
+                    "then": {
+                        "en": "This is a general practitioner"
+                    }
+                },
+                {
+                    "if": "healthcare:speciality=gynaecology",
+                    "then": {
+                        "en": "This is a gynaecologist"
+                    }
+                },
+                {
+                    "if": "healthcare:speciality=psychiatry",
+                    "then": {
+                        "en": "This is a psychiatrist"
+                    }
+                },
+                {
+                    "if": "healthcare:speciality=paediatrics",
+                    "then": {
+                        "en": "This is a paediatrician"
+                    }
+                }
+            ]
+        }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "pin:#6BC4F7;./assets/layers/doctors/doctors.svg"
+            },
+            "iconSize": "40,40,bottom",
+            "location": [
+                "point",
+                "centroid"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/assets/layers/doctors/doctors.svg b/assets/layers/doctors/doctors.svg
new file mode 100644
index 000000000..94516a688
--- /dev/null
+++ b/assets/layers/doctors/doctors.svg
@@ -0,0 +1,20 @@
+<?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="500"
+   height="500"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,1 C 5.83929,1 4.667834,1.5047052 3.875,2.5 3.187514,3.3630449 3,4 2.90625,5.0000004 0.01009,5.0238004 0,6.0817104 0,13 l 14,0 C 14,6.0817104 13.9899,5.0237504 11.09375,5.0000004 11,4 10.795537,3.3460958 10.125,2.5 9.334655,1.5027279 8.16071,1 7,1 z M 7,3 C 8.281412,2.99511 9,4 9.0625,5.0000004 l -4.125,0 C 5,4 5.718588,3.0048937 7,3 z m -1,3.0000004 2,0 L 8,8 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"
+     id="doctor" style="fill:#BF0000" />
+</svg>
diff --git a/assets/layers/doctors/license_info.json b/assets/layers/doctors/license_info.json
new file mode 100644
index 000000000..90889fdc6
--- /dev/null
+++ b/assets/layers/doctors/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "doctors.svg",
+    "license": "cc0",
+    "authors": [
+      "osmcarto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Doctors-14.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/doctors/doctors.json b/assets/themes/doctors/doctors.json
new file mode 100644
index 000000000..7c191b571
--- /dev/null
+++ b/assets/themes/doctors/doctors.json
@@ -0,0 +1,20 @@
+{
+    "id": "doctors",
+    "title": {
+        "en": "Doctors"
+    },
+    "description": {
+        "en": "On this map, publicly accessible doctors offices are shown and can be easily added"
+    },
+    "maintainer": "MapComplete",
+    "icon": "./assets/layers/doctors/doctors.svg",
+    "version": "0",
+    "startLat": 50.8465573,
+    "defaultBackgroundId": "CartoDB.Voyager",
+    "startLon": 4.351697,
+    "startZoom": 16,
+    "widenFactor": 2,
+    "layers": [
+        "doctors"
+    ]
+}
\ No newline at end of file
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index c21ef5df7..56650d440 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -151,6 +151,10 @@
                 "if": "theme=cyclofix",
                 "then": "./assets/themes/cyclofix/logo.svg"
               },
+              {
+                "if": "theme=doctors",
+                "then": "./assets/layers/doctors/doctors.svg"
+              },
               {
                 "if": "theme=drinking_water",
                 "then": "./assets/themes/drinking_water/logo.svg"