diff --git a/assets/layers/pharmacy/license_info.json b/assets/layers/pharmacy/license_info.json
new file mode 100644
index 000000000..ec982334c
--- /dev/null
+++ b/assets/layers/pharmacy/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "pharmacy.svg",
+    "license": "CC0",
+    "authors": [
+      "OSM-carto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Pharmacy-14.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json
new file mode 100644
index 000000000..d7873aaa7
--- /dev/null
+++ b/assets/layers/pharmacy/pharmacy.json
@@ -0,0 +1,99 @@
+{
+    "id": "pharmacy",
+    "name": {
+        "en": "pharmacy"
+    },
+    "title": {
+        "render": {
+            "en": "{name}"
+        }
+    },
+    "source": {
+        "osmTags": {
+            "and": [
+                "amenity=pharmacy"
+            ]
+        }
+    },
+    "minzoom":13,
+    "tagRenderings": [
+        "images",
+        "opening_hours",
+        "phone",
+        "email",
+        "website",
+        "dispensing",
+        {
+            "id": "wheelchair",
+            "render": {
+                "en": "Easily accessible for wheelchair users: {wheelchair}"
+            },
+            "question": {
+                "en": "Is this pharmacy easy to access on a wheelchair?"
+            },
+            "freeform": {
+                "key": "wheelchair"
+            },
+            "mappings": [
+                {
+                    "if": "wheelchair=yes",
+                    "then": {
+                        "en": "Yes, this pharmacy is easy to access on a wheelchair"
+                    }
+                },
+                {
+                    "if": "wheelchair=no",
+                    "then": {
+                        "en": "No, this pharmacy is easy to access on a wheelchair"
+                    }
+                    
+                },
+                {
+                    "if": "wheelchair=limited",
+                    "then": {
+                        "en": "This pharmacy has limited access for wheelchair users"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "drive_through",
+            "render": {
+                "en": "Pharmacy drive through: {drive_through}"
+            },
+            "question": {
+                "en": "Does this pharmacy have a drive through?"
+            },
+            "freeform": {
+                "key": "drive_through"
+            },
+            "mappings": [
+                {
+                    "if": "drive_through=yes",
+                    "then": {
+                        "en": "Yes, this pharmacy has a drive through"
+                    }
+                },
+                {
+                    "if": "drive_through=no",
+                    "then": {
+                        "en": "No, this pharmacy does not have a drive through"
+                    }
+                    
+                }
+            ]
+        }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/pharmacy/pharmacy.svg"
+            },
+            "iconSize": "40,40,bottom",
+            "location": [
+                "point",
+                "centroid"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/assets/layers/pharmacy/pharmacy.svg b/assets/layers/pharmacy/pharmacy.svg
new file mode 100644
index 000000000..fe46542ad
--- /dev/null
+++ b/assets/layers/pharmacy/pharmacy.svg
@@ -0,0 +1,6 @@
+<?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 4,4 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 4,0 4,3 10,3 10,0 z" id="pharmacy" style="fill:#BF0000"/>
+</svg>
\ No newline at end of file
diff --git a/assets/pharmacy/license_info.json b/assets/pharmacy/license_info.json
new file mode 100644
index 000000000..ec982334c
--- /dev/null
+++ b/assets/pharmacy/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "pharmacy.svg",
+    "license": "CC0",
+    "authors": [
+      "OSM-carto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Pharmacy-14.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/pharmacy/pharmacy.json b/assets/pharmacy/pharmacy.json
new file mode 100644
index 000000000..ae6e97470
--- /dev/null
+++ b/assets/pharmacy/pharmacy.json
@@ -0,0 +1,102 @@
+{
+    "id": "pharmacies",
+    "name": {
+        "en": "pharmacies"
+    },
+    "title": {
+        "render": {
+            "en": "{name}"
+        }
+    },
+    "source": {
+        "osmTags": {
+            "and": [
+                "amenity=pharmacy"
+            ],
+            "or": [
+                "dispensing=yes"
+            ]
+        }
+    },
+    "minzoom":13,
+    "tagRenderings": [
+        "images",
+        "opening_hours",
+        "phone",
+        "email",
+        "website",
+        "dispensing",
+        {
+            "id": "wheelchair",
+            "render": {
+                "en": "Easily accessible for wheelchair users: {wheelchair}"
+            },
+            "question": {
+                "en": "Is this pharmacy easy to access on a wheelchair?"
+            },
+            "freeform": {
+                "key": "wheelchair"
+            },
+            "mappings": [
+                {
+                    "if": "wheelchair=yes",
+                    "then": {
+                        "en": "Yes, this pharmacy is easy to access on a wheelchair"
+                    }
+                },
+                {
+                    "if": "wheelchair=no",
+                    "then": {
+                        "en": "No, this pharmacy is easy to access on a wheelchair"
+                    }
+                    
+                },
+                {
+                    "if": "wheelchair=limited",
+                    "then": {
+                        "en": "This pharmacy has limited access for wheelchair users"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "drive_through",
+            "render": {
+                "en": "Pharmacy drive through: {drive_through}"
+            },
+            "question": {
+                "en": "Does this pharmacy have a drive through?"
+            },
+            "freeform": {
+                "key": "drive_through"
+            },
+            "mappings": [
+                {
+                    "if": "drive_through=yes",
+                    "then": {
+                        "en": "Yes, this pharmacy has a drive through"
+                    }
+                },
+                {
+                    "if": "drive_through=no",
+                    "then": {
+                        "en": "No, this pharmacy does not have a drive through"
+                    }
+                    
+                }
+            ]
+        }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": ""
+            },
+            "iconSize": "40,40,bottom",
+            "location": [
+                "point",
+                "centroid"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/assets/pharmacy/pharmacy.svg b/assets/pharmacy/pharmacy.svg
new file mode 100644
index 000000000..325d83789
--- /dev/null
+++ b/assets/pharmacy/pharmacy.svg
@@ -0,0 +1,6 @@
+<?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 4,4 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 4,0 4,3 10,3 10,0 z" id="pharmacy" style="fill:#BF0000"/>
+</svg>
\ 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 8fc630f67..07f22fdba 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -259,6 +259,10 @@
                 "if": "theme=pets",
                 "then": "./assets/layers/dogpark/dog-park.svg"
               },
+              {
+                "if": "theme=pharmacies",
+                "then": "./assets/layers/pharmacy/pharmacy.svg"
+              },
               {
                 "if": "theme=play_forests",
                 "then": "./assets/layers/play_forest/icon.svg"
diff --git a/assets/themes/pharmacies/pharmacies.json b/assets/themes/pharmacies/pharmacies.json
new file mode 100644
index 000000000..61864106a
--- /dev/null
+++ b/assets/themes/pharmacies/pharmacies.json
@@ -0,0 +1,20 @@
+{
+  "id": "pharmacies",
+  "title": {
+    "en": "pharmacies"
+  },
+  "description": {
+    "en": "On this map, pharmacies are shown and can be easily added"
+  },
+  "maintainer": "MapComplete",
+  "icon": "./assets/layers/pharmacy/pharmacy.svg",
+  "version": "0",
+  "startLat": 50.8465573,
+  "defaultBackgroundId": "CartoDB.Voyager",
+  "startLon": 4.351697,
+  "startZoom": 16,
+  "widenFactor": 2,
+  "layers": [
+    "pharmacy"
+  ]
+}
\ No newline at end of file