diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 50cbdf03b6..66d0470c9c 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -22,7 +22,21 @@
       "de": "Defibrillator"
     }
   },
-  "icon": "./assets/themes/aed/aed.svg",
+  "icon": {
+    "render": "./assets/themes/aed/aed.svg",
+    "mappings": [
+      {
+        "if": {
+          "and": [
+            "survey:date~*"
+          ]
+        },
+        "then": {
+          "en": "./assets/layers/defibrillator/aed_checked.svg"
+        }
+      }
+    ]
+  },
   "color": "#0000ff",
   "presets": [
     {
@@ -92,12 +106,6 @@
         "nl": "Toegankelijkheid is {access}",
         "de": "Zugang ist {access}"
       },
-      "condition": {
-        "or": [
-          "indoor=yes",
-          "access~*"
-        ]
-      },
       "freeform": {
         "key": "access",
         "addExtraTags": [
@@ -149,6 +157,47 @@
             "nl": "Niet toegankelijk voor het publiek (bv. enkel voor personneel, de eigenaar, ...)",
             "de": "Nicht für die Öffentlichkeit zugänglich (z.B. nur für das Personal, die Eigentümer, ...)"
           }
+        },
+        {
+          "if": "access=no",
+          "then": {
+            "en": "Not accessible, possibly only for professional use",
+            "nl": "Niet toegankelijk, mogelijk enkel voor professionals"
+          }
+        }
+      ]
+    },
+    {
+      "render": {
+        "en": "There is no info about the type of device",
+        "nl": "Er is geen info over het soort toestel"
+      },
+      "question": {
+        "en": "Is this a a regular automatic defibrillator or a manual defibrillator for professionals only?",
+        "nl": "Is dit een gewone automatische defibrillator of een manueel toestel enkel voor professionals?"
+      },
+      "freeform": {
+        "key": "defibrillator"
+      },
+      "condition": {
+        "and": [
+          "access=no"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "defibrillator=manual",
+          "then": {
+            "en": "This is a manual defibrillator for professionals",
+            "nl": "Dit is een manueel toestel enkel voor professionals"
+          }
+        },
+        {
+          "if": "defibrillator=automatic",
+          "then": {
+            "en": "This is a normal automatic defibrillator",
+            "nl": "Dit is een gewone automatische defibrillator"
+          }
         }
       ]
     },
@@ -172,7 +221,7 @@
         "type": "int"
       },
       "render": {
-        "en": "This defibrallator is on floor {level}",
+        "en": "This defibrillator is on floor {level}",
         "ca": "Aquest desfibril·lador és a la planta {level}",
         "es": "El desfibrilador se encuentra en la planta {level}",
         "fr": "Ce défibrillateur est à l'étage {level}",
@@ -182,21 +231,218 @@
     },
     {
       "render": {
-        "nl": "<i>Meer informatie over de locatie:</i><br/>{defibrillator:location}",
-        "en": "<i>Extra information about the location:</i><br/>{defibrillator:location}"
+        "nl": "<i>Meer informatie over de locatie (lokale taal):</i><br/>{defibrillator:location}",
+        "en": "<i>Extra information about the location (in the local languagel):</i><br/>{defibrillator:location}"
       },
       "question": {
-        "en": "Please give some explanation on where the defibrillator can be found",
+        "en": "Please give some explanation on where the defibrillator can be found (in the local language)",
         "ca": "Dóna detalls d'on es pot trobar el desfibril·lador",
-        "es": "Da detalles de dónde se puede encontrar el desfibrilador",
-        "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur",
-        "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator",
-        "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist"
+        "es": "Da detalles de dónde se puede encontrar el desfibrilador (en el idioma local)",
+        "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur (dans la langue local)",
+        "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator (in de plaatselijke taal)",
+        "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist (in der lokalen Sprache)"
       },
       "freeform": {
         "type": "text",
         "key": "defibrillator:location"
       }
+    },
+    {
+      "render": {
+        "nl": "<i>Meer informatie over de locatie (in het Engels):</i><br/>{defibrillator:location:en}",
+        "en": "<i>Extra information about the location (in English):</i><br/>{defibrillator:location:en}"
+      },
+      "question": {
+        "en": "Please give some explanation on where the defibrillator can be found (in English)",
+        "ca": "Dóna detalls d'on es pot trobar el desfibril·lador",
+        "es": "Da detalles de dónde se puede encontrar el desfibrilador (en ingles)",
+        "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur (en englais)",
+        "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator (in het Engels)",
+        "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist (auf Englisch)"
+      },
+      "freeform": {
+        "type": "text",
+        "key": "defibrillator:location:en"
+      }
+    },
+    {
+      "render": {
+        "nl": "<i>Meer informatie over de locatie (in het Frans):</i><br/>{defibrillator:location:fr}",
+        "en": "<i>Extra information about the location (in French):</i><br/>{defibrillator:location:fr}"
+      },
+      "question": {
+        "en": "Please give some explanation on where the defibrillator can be found (in French)",
+        "ca": "Dóna detalls d'on es pot trobar el desfibril·lador",
+        "es": "Da detalles de dónde se puede encontrar el desfibrilador (en frances)",
+        "fr": "Veuillez indiquez plus précisément où se situe le défibrillateur (en français)",
+        "nl": "Gelieve meer informatie te geven over de exacte locatie van de defibrillator (in het Frans)",
+        "de": "Bitte geben Sie einige Erläuterungen dazu, wo der Defibrillator zu finden ist (auf Französisch)"
+      },
+      "freeform": {
+        "type": "text",
+        "key": "defibrillator:location:fr"
+      }
+    },
+    {
+      "question": {
+        "nl": "Is deze defibrillator rolstoeltoegankelijk?",
+        "en": "Is this defibrillator accessible with a wheelchair?"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "wheelchair=designated"
+            ]
+          },
+          "then": {
+            "nl": "Deze defibrillator is speciaal aangepast voor gebruikers van een rolstoel",
+            "en": "This defibrillator is specially adapated for wheelchair users"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "wheelchair=yes"
+            ]
+          },
+          "then": {
+            "nl": "Deze defibrillator is vlot bereikbaar met een rolstoel",
+            "en": "This defibrillator is easily reachable with a wheelchair"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "wheelchair=limited"
+            ]
+          },
+          "then": {
+            "nl": "Je kan er raken met een rolstoel, maar het is niet makkelijk",
+            "en": "It is possible to reach the defibrillator in a wheelchair, but it is not easy"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "wheelchair=no"
+            ]
+          },
+          "then": {
+            "nl": "Niet rolstoeltoegankelijk",
+            "en": "This defibrillator is not reachable with a wheelchair"
+          }
+        }
+      ]
+    },
+    {
+      "render": {
+        "nl": "Officieel identificatienummer van het toestel: <i>{ref}</i>",
+        "en": "Official identification number of the device: <i>{ref}</i>"
+      },
+      "question": {
+        "en": "What is the official identification number of the device? (if visible on device)",
+        "nl": "Wat is het officieel identificatienummer van het toestel? (indien zichtbaar op toestel)"
+      },
+      "freeform": {
+        "type": "text",
+        "key": "ref"
+      }
+    },
+    {
+      "render": {
+        "en": "Email for questions about this defibrillator: <a href='mailto:{email}'>{email}</a>",
+        "nl": "Email voor vragen over deze defibrillator: <a href='mailto:{email}'>{email}</a>"
+      },
+      "question": {
+        "en": "What is the email for questions about this defibrillator?",
+        "nl": "Wat is het email-adres voor vragen over deze defibrillator"
+      },
+      "freeform": {
+        "key": "email",
+        "type": "email"
+      }
+    },
+    {
+      "render": {
+        "en": "Telephone for questions about this defibrillator: <a href='tel:{phone}'>{phone}</a>",
+        "fr": "Numéro de téléphone pour questions sur le défibrillateur: <a href='tel:{phone}'>{phone}</a>",
+        "nl": "Telefoonnummer voor vragen over deze defibrillator: <a href='tel:{phone}'>{phone}</a>"
+      },
+      "question": {
+        "en": "What is the phone number for questions about this defibrillator?",
+        "fr": "Quel est le numéro de téléphone pour questions sur le défibrillateur?",
+        "nl": "Wat is het telefoonnummer voor vragen over deze defibrillator"
+      },
+      "freeform": {
+        "key": "phone",
+        "type": "phone"
+      }
+    },
+    {
+      "render": {
+        "en": "{opening_hours_table(opening_hours)}",
+        "nl": "{opening_hours_table(opening_hours)}"
+      },
+      "question": {
+        "en": "At what times is this defibrillator available? (use 24/7 to indicate it's always available)",
+        "nl": "Wanneer is deze defibrillator beschikbaar? (schrijf 24/7 om aan te geven dat hij steeds beschikbaar is)"
+      },
+      "freeform": {
+        "key": "opening_hours",
+        "type": "opening_hours"
+      }
+    },
+    {
+      "render": {
+        "en": "Additional information: {description}",
+        "nl": "Aanvullende info: {description}"
+      },
+      "question": {
+        "en": "Is there any useful information for users that you haven't been able to describe above? (leave blank if no)",
+        "nl": "Is er nog iets bijzonder aan deze defibrillator dat je nog niet hebt kunnen meegeven? (laat leeg indien niet)"
+      },
+      "freeform": {
+        "key": "description",
+        "type": "text"
+      }
+    },
+    {
+      "question":{
+        "en": "When was this defibrillator last surveyed?",
+        "nl": "Wanneer is deze defibrillator het laatst gecontroleerd in OpenStreetMap?"
+      },
+      "render": {
+        "en": "This defibrillator was last surveyed on {survey:date}",
+        "nl": "Deze defibrillator is nagekeken in OSM op {survey:date}"
+      },
+      "freeform": {
+        "key": "survey:date",
+        "type": "date"
+      },
+      "mappings": [
+        {
+          "if": "survey:date:={_now:date}",
+          "then": {
+            "en": "Checked today!",
+            "nl": "Vandaag nagekeken!"
+          }
+        }
+      ]
+    },
+    {
+      "render": {
+        "en": "Extra information for OpenStreetMap experts: {fixme}",
+        "nl": "Extra informatie voor OpenStreetMap experts: {fixme}"
+      },
+      "question": {
+        "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
+        "nl": "Is er iets mis met de informatie over deze defibrillator dat je hier niet opgelost kreeg? (laat hier een berichtje achter voor OpenStreetMap experts)"
+      },
+      "freeform": {
+        "key": "fixme",
+        "type": "text"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/defibrillator/license_info.json b/assets/layers/defibrillator/license_info.json
new file mode 100644
index 0000000000..d00218caa7
--- /dev/null
+++ b/assets/layers/defibrillator/license_info.json
@@ -0,0 +1,13 @@
+[
+  {
+    "authors": [
+      "MaxxL"
+    ],
+    "path": "aed_checked.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:ISO_7010_E010.svg",
+      "https://raw.githubusercontent.com/osmbe/play/master/mapcomplete/aed_checked.svg"
+    ]
+  }
+]
\ No newline at end of file