diff --git a/assets/layers/doctors/dentist.svg b/assets/layers/doctors/dentist.svg
new file mode 100644
index 0000000000..7c9728084f
--- /dev/null
+++ b/assets/layers/doctors/dentist.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="14"
+   height="14"
+   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,8 c 2,0 2,1 2,3 0,1 -1.009121,3 0,3 1,0 1.751359,-1.142963 2,-3 C 11.248641,9.142963 11,8 11,7 11,5 12,3 12,2 12,1 11.599761,0.21742 11,0 9,0 9,1 7,1 5,1 5,0 3,0 2.400799,0.21742 2,1 2,2 2,3 3,5 3,7 3,8 2.87761,9.57334 3,11 3.12239,12.42666 4,14 5,14 6.008702,14 5,12 5,11 5,9 5,8 7,8 z"
+     id="dentist" style="fill:#BF0000"/>
+</svg>
diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
index 2c34b4538c..e69fb27a41 100644
--- a/assets/layers/doctors/doctors.json
+++ b/assets/layers/doctors/doctors.json
@@ -3,17 +3,33 @@
     "name": {
         "en": "doctors"
     },
+    "source": {
+        "osmTags": {
+            "or": [
+                "amenity=doctors",
+                "amenity=dentist",
+                "healthcare=physiotherapist"
+            ]
+        }
+    },
     "title": {
         "render": {
             "en": "Doctors Office {name}"
-        }
-    },
-    "source": {
-        "osmTags": {
-            "and": [
-                "amenity=doctors"
-            ]
-        }
+        },
+        "mappings": [
+            {
+                "if": "amenity=doctors",
+                "then": "Doctors Office {name}"
+            },
+            {
+                "if": "amenity=dentist",
+                "then": "Dentists office {name}"
+            },
+            {
+                "if": "healthcare=physiotherapist",
+                "then": "Physiotherapists office {name}"
+            }
+        ]
     },
     "minzoom": 13,
     "tagRenderings": [
@@ -23,6 +39,7 @@
         "email",
         "website",
         {
+            "condition": "amenity=doctors",
             "id": "specialty",
             "render": {
                 "en": "This doctor is specialized in {healthcare:speciality}"
@@ -61,12 +78,51 @@
             ]
         }
     ],
+    "presets": [
+        {
+            "title": {
+                "en": "a doctors office"
+            },
+            "tags": [
+                "amenity=doctors"
+            ]
+        },
+        {
+            "title": {
+                "en": "a dentists office"
+            },
+            "tags": [
+                "amenity=dentist"
+            ]
+        },
+        {
+            "title": {
+                "en": "a physiotherapists office"
+            },
+            "tags": [
+                "healthcare=physiotherapist"
+            ]
+        }
+    ],
+    "filter": [
+        {
+            "id": "opened-now",
+            "options": [
+                {
+                    "question": {
+                        "en": "Opened now"
+                    },
+                    "osmTags": "_isOpen=yes"
+                }
+            ]
+        }
+    ],
     "mapRendering": [
         {
             "icon": {
-                "render": "pin:#6BC4F7;./assets/layers/doctors/doctors.svg"
+                "render": "circle:white;./assets/layers/doctors/doctors.svg"
             },
-            "iconSize": "40,40,bottom",
+            "iconSize": "40,40,center",
             "location": [
                 "point",
                 "centroid"