diff --git a/src/components/Map/index.jsx b/src/components/Map/index.jsx
index 17ec4d42e..49cfeaa7b 100644
--- a/src/components/Map/index.jsx
+++ b/src/components/Map/index.jsx
@@ -2,7 +2,7 @@ import * as Leaflet from 'leaflet';
 import {GeoSearchControl} from 'leaflet-geosearch';
 import PropTypes from 'prop-types';
 import {useContext, useEffect, useRef} from 'react';
-import {defineMessages, useIntl} from 'react-intl';
+import {useIntl} from 'react-intl';
 import {FeatureGroup, MapContainer, TileLayer, useMap} from 'react-leaflet';
 import {EditControl} from 'react-leaflet-draw';
 import {useGeolocation} from 'react-use';
@@ -20,36 +20,11 @@ import {getBEMClassName} from 'utils';
 import NearestAddress from './NearestAddress';
 import './map.scss';
 import OpenFormsProvider from './provider';
-
-const searchControlMessages = defineMessages({
-  buttonLabel: {
-    description: "The leaflet map's search button areaLabel text.",
-    defaultMessage: 'Map component search button',
-  },
-  searchLabel: {
-    description: "The leaflet map's input fields placeholder message.",
-    defaultMessage: 'Enter address, please',
-  },
-  notFound: {
-    description: "The leaflet map's location not found message.",
-    defaultMessage: 'Sorry, that address could not be found.',
-  },
-});
-
-const leafletGestureHandlingText = defineMessages({
-  touch: {
-    description: 'Gesturehandeling phone touch message.',
-    defaultMessage: 'Use two fingers to move the map',
-  },
-  scroll: {
-    description: 'Gesturehandeling pc scroll message.',
-    defaultMessage: 'Use ctrl + scroll to zoom the map',
-  },
-  scrollMac: {
-    description: 'Gesturehandeling mac scroll message.',
-    defaultMessage: 'Use \u2318 + scroll to zoom the map',
-  },
-});
+import {
+  applyLeafletTranslations,
+  leafletGestureHandlingText,
+  searchControlMessages,
+} from './translations';
 
 const useDefaultCoordinates = () => {
   // FIXME: can't call hooks conditionally
@@ -95,6 +70,8 @@ const LeaftletMap = ({
   const modifiers = disabled ? ['disabled'] : [];
   const className = getBEMClassName('leaflet-map', modifiers);
 
+  applyLeafletTranslations(intl);
+
   const onFeatureCreate = event => {
     updateGeoJsonFeature(event.layer);
   };
diff --git a/src/components/Map/translations.js b/src/components/Map/translations.js
new file mode 100644
index 000000000..3aec19e8c
--- /dev/null
+++ b/src/components/Map/translations.js
@@ -0,0 +1,202 @@
+import * as Leaflet from 'leaflet';
+import {defineMessages} from 'react-intl';
+
+const searchControlMessages = defineMessages({
+  buttonLabel: {
+    description: "The leaflet map's search button areaLabel text.",
+    defaultMessage: 'Map component search button',
+  },
+  searchLabel: {
+    description: "The leaflet map's input fields placeholder message.",
+    defaultMessage: 'Enter address, please',
+  },
+  notFound: {
+    description: "The leaflet map's location not found message.",
+    defaultMessage: 'Sorry, that address could not be found.',
+  },
+});
+
+const leafletGestureHandlingText = defineMessages({
+  touch: {
+    description: 'Gesturehandeling phone touch message.',
+    defaultMessage: 'Use two fingers to move the map',
+  },
+  scroll: {
+    description: 'Gesturehandeling pc scroll message.',
+    defaultMessage: 'Use ctrl + scroll to zoom the map',
+  },
+  scrollMac: {
+    description: 'Gesturehandeling mac scroll message.',
+    defaultMessage: 'Use \u2318 + scroll to zoom the map',
+  },
+});
+
+const leafletEditToolbarMessages = defineMessages({
+  saveText: {
+    description: 'Edit toolbar save message.',
+    defaultMessage: 'Save',
+  },
+  saveTitle: {
+    description: 'Edit toolbar save tooltip.',
+    defaultMessage: 'Save changes',
+  },
+  cancelText: {
+    description: 'Edit toolbar cancel message.',
+    defaultMessage: 'Cancel',
+  },
+  cancelTitle: {
+    description: 'Edit toolbar cancel tooltip.',
+    defaultMessage: 'Cancel changes',
+  },
+  clearAllText: {
+    description: 'Edit toolbar clearAll message.',
+    defaultMessage: 'Remove all',
+  },
+  clearAllTitle: {
+    description: 'Edit toolbar clearAll tooltip.',
+    defaultMessage: 'Remove all shapes',
+  },
+  remove: {
+    description: 'Edit toolbar remove button tooltip.',
+    defaultMessage: 'Remove shapes',
+  },
+  removeDisabled: {
+    description: 'Edit toolbar remove button disabled tooltip.',
+    defaultMessage: 'No shapes to remove',
+  },
+});
+
+const leafletDrawToolbarMessages = defineMessages({
+  actionsText: {
+    description: 'Draw toolbar cancel button message.',
+    defaultMessage: 'Cancel',
+  },
+  actionsTitle: {
+    description: 'Draw toolbar cancel button tooltip.',
+    defaultMessage: 'Cancel drawing',
+  },
+  finishText: {
+    description: 'Draw toolbar finish button message.',
+    defaultMessage: 'Finish',
+  },
+  finishTitle: {
+    description: 'Draw toolbar finish button tooltip.',
+    defaultMessage: 'Finish drawing',
+  },
+  undoText: {
+    description: 'Draw toolbar undo button message.',
+    defaultMessage: 'Remove last point',
+  },
+  undoTitle: {
+    description: 'Draw toolbar undo button tooltip.',
+    defaultMessage: 'Remove last drawn point',
+  },
+  polyline: {
+    description: 'Draw toolbar polyline button tooltip.',
+    defaultMessage: 'Line',
+  },
+  polygon: {
+    description: 'Draw toolbar polygon button tooltip.',
+    defaultMessage: 'Shape (polygon)',
+  },
+  marker: {
+    description: 'Draw toolbar marker button tooltip.',
+    defaultMessage: 'Marker',
+  },
+});
+
+const leafletDrawHandlerMessages = defineMessages({
+  markerTooltipStart: {
+    description: 'Draw handler marker tooltip start.',
+    defaultMessage: 'Click map to place marker',
+  },
+  polylineTooltipStart: {
+    description: 'Draw handler polyline tooltip start.',
+    defaultMessage: 'Click to start drawing line',
+  },
+  polylineTooltipContinue: {
+    description: 'Draw handler polyline tooltip continue.',
+    defaultMessage: 'Click to continue drawing line',
+  },
+  polylineTooltipEnd: {
+    description: 'Draw handler polyline tooltip end.',
+    defaultMessage: 'Click last point to finish line',
+  },
+  polygonTooltipStart: {
+    description: 'Draw handler polygon tooltip start.',
+    defaultMessage: 'Click to start drawing shape',
+  },
+  polygonTooltipContinue: {
+    description: 'Draw handler polygon tooltip continue.',
+    defaultMessage: 'Click to continue drawing shape',
+  },
+  polygonTooltipEnd: {
+    description: 'Draw handler polygon tooltip end.',
+    defaultMessage: 'Click first point to finish shape',
+  },
+});
+
+const applyLeafletTranslations = intl => {
+  // We have to do the translations via Leaflet
+  // https://github.com/alex3165/react-leaflet-draw/issues/179
+  Leaflet.drawLocal.edit.toolbar = {
+    actions: {
+      save: {
+        text: intl.formatMessage(leafletEditToolbarMessages.saveText),
+        title: intl.formatMessage(leafletEditToolbarMessages.saveTitle),
+      },
+      cancel: {
+        text: intl.formatMessage(leafletEditToolbarMessages.cancelText),
+        title: intl.formatMessage(leafletEditToolbarMessages.cancelTitle),
+      },
+      clearAll: {
+        text: intl.formatMessage(leafletEditToolbarMessages.clearAllText),
+        title: intl.formatMessage(leafletEditToolbarMessages.clearAllTitle),
+      },
+    },
+    buttons: {
+      remove: intl.formatMessage(leafletEditToolbarMessages.remove),
+      removeDisabled: intl.formatMessage(leafletEditToolbarMessages.removeDisabled),
+    },
+  };
+  Leaflet.drawLocal.draw.toolbar = {
+    actions: {
+      text: intl.formatMessage(leafletDrawToolbarMessages.actionsText),
+      title: intl.formatMessage(leafletDrawToolbarMessages.actionsTitle),
+    },
+    finish: {
+      text: intl.formatMessage(leafletDrawToolbarMessages.finishText),
+      title: intl.formatMessage(leafletDrawToolbarMessages.finishTitle),
+    },
+    undo: {
+      text: intl.formatMessage(leafletDrawToolbarMessages.undoText),
+      title: intl.formatMessage(leafletDrawToolbarMessages.undoTitle),
+    },
+    buttons: {
+      polyline: intl.formatMessage(leafletDrawToolbarMessages.polyline),
+      polygon: intl.formatMessage(leafletDrawToolbarMessages.polygon),
+      marker: intl.formatMessage(leafletDrawToolbarMessages.marker),
+    },
+  };
+  Leaflet.drawLocal.draw.handlers.marker = {
+    tooltip: {
+      start: intl.formatMessage(leafletDrawHandlerMessages.markerTooltipStart),
+    },
+  };
+  Leaflet.drawLocal.draw.handlers.polyline = {
+    tooltip: {
+      start: intl.formatMessage(leafletDrawHandlerMessages.polylineTooltipStart),
+      cont: intl.formatMessage(leafletDrawHandlerMessages.polylineTooltipContinue),
+      end: intl.formatMessage(leafletDrawHandlerMessages.polylineTooltipEnd),
+    },
+  };
+  Leaflet.drawLocal.draw.handlers.polygon = {
+    tooltip: {
+      start: intl.formatMessage(leafletDrawHandlerMessages.polygonTooltipStart),
+      cont: intl.formatMessage(leafletDrawHandlerMessages.polygonTooltipContinue),
+      end: intl.formatMessage(leafletDrawHandlerMessages.polygonTooltipEnd),
+    },
+  };
+};
+
+export {searchControlMessages, leafletGestureHandlingText, applyLeafletTranslations};
diff --git a/src/i18n/compiled/en.json b/src/i18n/compiled/en.json
index 69d4d9e5d..a8d22545c 100644
--- a/src/i18n/compiled/en.json
+++ b/src/i18n/compiled/en.json
@@ -43,12 +43,30 @@
       "value": "."
     }
   ],
+  "+KBbXH": [
+    {
+      "type": 0,
+      "value": "Click to start drawing shape"
+    }
+  ],
+  "+W79Dr": [
+    {
+      "type": 0,
+      "value": "Click to continue drawing line"
+    }
+  ],
   "+uwsgF": [
     {
       "type": 0,
       "value": "Location and time"
     }
   ],
+  "/yX9Xl": [
+    {
+      "type": 0,
+      "value": "Cancel drawing"
+    }
+  ],
   "0j8tMq": [
     {
       "type": 0,
@@ -81,6 +99,12 @@
       "value": "Something went wrong while presenting the login option. Please contact the municipality."
     }
   ],
+  "2D6ubj": [
+    {
+      "type": 0,
+      "value": "Line"
+    }
+  ],
   "2HHJrq": [
     {
       "type": 0,
@@ -117,6 +141,12 @@
       "value": "Loading..."
     }
   ],
+  "4ZOmtU": [
+    {
+      "type": 0,
+      "value": "Save changes"
+    }
+  ],
   "4gPdgK": [
     {
       "type": 0,
@@ -129,6 +159,12 @@
       "value": "Verify"
     }
   ],
+  "4ui8R+": [
+    {
+      "type": 0,
+      "value": "Click last point to finish line"
+    }
+  ],
   "5uh2hS": [
     {
       "type": 0,
@@ -155,6 +191,12 @@
       "value": "Check and co-sign submission"
     }
   ],
+  "62SBjV": [
+    {
+      "type": 0,
+      "value": "Shape (polygon)"
+    }
+  ],
   "6GNK65": [
     {
       "type": 0,
@@ -449,6 +491,12 @@
       "value": "provider"
     }
   ],
+  "B/W1uC": [
+    {
+      "type": 0,
+      "value": "Remove shapes"
+    }
+  ],
   "BL1Ehr": [
     {
       "type": 0,
@@ -479,6 +527,12 @@
       "value": "This form is currently undergoing maintenance and can not be accessed at the moment."
     }
   ],
+  "D6TdPW": [
+    {
+      "type": 0,
+      "value": "Click map to place marker"
+    }
+  ],
   "DBTNgI": [
     {
       "type": 0,
@@ -665,6 +719,18 @@
       "value": "Inloggen bij deze organisatie is niet gelukt. Probeert u het later nog een keer. Lukt het nog steeds niet? Log in bij Mijn DigiD. Zo controleert u of uw DigiD goed werkt. Mogelijk is er een storing bij de organisatie waar u inlogt."
     }
   ],
+  "HY6Irs": [
+    {
+      "type": 0,
+      "value": "Cancel changes"
+    }
+  ],
+  "HgLr1F": [
+    {
+      "type": 0,
+      "value": "Cancel"
+    }
+  ],
   "HhcSoc": [
     {
       "type": 0,
@@ -677,6 +743,12 @@
       "value": "Invalid input."
     }
   ],
+  "Hkq6NE": [
+    {
+      "type": 0,
+      "value": "Finish drawing"
+    }
+  ],
   "I6ok5N": [
     {
       "type": 0,
@@ -973,6 +1045,12 @@
       "value": "Payment"
     }
   ],
+  "N2sZnS": [
+    {
+      "type": 0,
+      "value": "Save"
+    }
+  ],
   "OnfuIr": [
     {
       "options": {
@@ -1005,6 +1083,12 @@
       "value": "withAsterisk"
     }
   ],
+  "Op4orj": [
+    {
+      "type": 0,
+      "value": "No shapes to remove"
+    }
+  ],
   "P194bo": [
     {
       "type": 0,
@@ -1031,6 +1115,12 @@
       "value": "Invalid input."
     }
   ],
+  "Q6/Lj7": [
+    {
+      "type": 0,
+      "value": "Remove last drawn point"
+    }
+  ],
   "QPdaOi": [
     {
       "type": 0,
@@ -1223,6 +1313,12 @@
       "value": "."
     }
   ],
+  "U5+FHP": [
+    {
+      "type": 0,
+      "value": "Cancel"
+    }
+  ],
   "UyEKdQ": [
     {
       "type": 0,
@@ -1297,6 +1393,12 @@
       "value": "."
     }
   ],
+  "Y3jHZm": [
+    {
+      "type": 0,
+      "value": "Remove last point"
+    }
+  ],
   "YcC4PD": [
     {
       "type": 0,
@@ -1423,6 +1525,12 @@
       "value": "Contact details"
     }
   ],
+  "bRtoG6": [
+    {
+      "type": 0,
+      "value": "Remove all"
+    }
+  ],
   "bgfiRG": [
     {
       "type": 0,
@@ -1465,6 +1573,12 @@
       "value": "Back to form start"
     }
   ],
+  "dNGw+S": [
+    {
+      "type": 0,
+      "value": "Click to continue drawing shape"
+    }
+  ],
   "eAmrdi": [
     {
       "type": 0,
@@ -1483,6 +1597,12 @@
       "value": "Processing..."
     }
   ],
+  "fJVa0u": [
+    {
+      "type": 0,
+      "value": "Marker"
+    }
+  ],
   "fWjfVm": [
     {
       "type": 0,
@@ -2075,6 +2195,12 @@
       "value": "Find address"
     }
   ],
+  "sYb+eZ": [
+    {
+      "type": 0,
+      "value": "Remove all shapes"
+    }
+  ],
   "senRv3": [
     {
       "type": 0,
@@ -2215,12 +2341,24 @@
       "value": "Amount"
     }
   ],
+  "vfKvuS": [
+    {
+      "type": 0,
+      "value": "Click first point to finish shape"
+    }
+  ],
   "wwsWUp": [
     {
       "type": 0,
       "value": "How do you rate this form?"
     }
   ],
+  "xh+7Vv": [
+    {
+      "type": 0,
+      "value": "Finish"
+    }
+  ],
   "y31iyC": [
     {
       "type": 0,
@@ -2247,6 +2385,12 @@
       "value": "Return to main website"
     }
   ],
+  "zpHAro": [
+    {
+      "type": 0,
+      "value": "Click to start drawing line"
+    }
+  ],
   "zvoXSU": [
     {
       "type": 0,
diff --git a/src/i18n/compiled/nl.json b/src/i18n/compiled/nl.json
index a57a85100..d1524570a 100644
--- a/src/i18n/compiled/nl.json
+++ b/src/i18n/compiled/nl.json
@@ -43,12 +43,30 @@
       "value": " actief."
     }
   ],
+  "+KBbXH": [
+    {
+      "type": 0,
+      "value": "Klik om een veelhoek (polygoon) te tekenen"
+    }
+  ],
+  "+W79Dr": [
+    {
+      "type": 0,
+      "value": "Klik om verder te tekenen"
+    }
+  ],
   "+uwsgF": [
     {
       "type": 0,
       "value": "Afspraakdetails"
     }
   ],
+  "/yX9Xl": [
+    {
+      "type": 0,
+      "value": "Tekeningen annuleren"
+    }
+  ],
   "0j8tMq": [
     {
       "type": 0,
@@ -81,6 +99,12 @@
       "value": "Er is iets fout gegaan bij het presenteren van de inlogopties. Neem alstublieft contact met ons op."
     }
   ],
+  "2D6ubj": [
+    {
+      "type": 0,
+      "value": "Lijn"
+    }
+  ],
   "2HHJrq": [
     {
       "type": 0,
@@ -117,6 +141,12 @@
       "value": "Opties ophalen..."
     }
   ],
+  "4ZOmtU": [
+    {
+      "type": 0,
+      "value": "Wijzigingen opslaan"
+    }
+  ],
   "4gPdgK": [
     {
       "type": 0,
@@ -129,6 +159,12 @@
       "value": "Bevestigen"
     }
   ],
+  "4ui8R+": [
+    {
+      "type": 0,
+      "value": "Klik het laatste punt om de lijn te voltooien"
+    }
+  ],
   "5uh2hS": [
     {
       "type": 0,
@@ -155,6 +191,12 @@
       "value": "Controle en medeondertekenen inzending"
     }
   ],
+  "62SBjV": [
+    {
+      "type": 0,
+      "value": "Veelhoek (polygoon)"
+    }
+  ],
   "6GNK65": [
     {
       "type": 0,
@@ -449,6 +491,12 @@
       "value": "provider"
     }
   ],
+  "B/W1uC": [
+    {
+      "type": 0,
+      "value": "Verwijder vormen"
+    }
+  ],
   "BL1Ehr": [
     {
       "type": 0,
@@ -479,6 +527,12 @@
       "value": "Dit formulier is momenteel in onderhoud en daardoor tijdelijk niet beschikbaar."
     }
   ],
+  "D6TdPW": [
+    {
+      "type": 0,
+      "value": "Klik op de kaart om een pin/punt te plaatsen"
+    }
+  ],
   "DBTNgI": [
     {
       "type": 0,
@@ -665,6 +719,18 @@
       "value": "Inloggen bij deze organisatie is niet gelukt. Probeert u het later nog een keer. Lukt het nog steeds niet? Log in bij Mijn DigiD. Zo controleert u of uw DigiD goed werkt. Mogelijk is er een storing bij de organisatie waar u inlogt."
     }
   ],
+  "HY6Irs": [
+    {
+      "type": 0,
+      "value": "Wijzigingen annuleren"
+    }
+  ],
+  "HgLr1F": [
+    {
+      "type": 0,
+      "value": "Annuleer"
+    }
+  ],
   "HhcSoc": [
     {
       "type": 0,
@@ -677,6 +743,12 @@
       "value": "Ongeldige invoer."
     }
   ],
+  "Hkq6NE": [
+    {
+      "type": 0,
+      "value": "Tekening voltooien"
+    }
+  ],
   "I6ok5N": [
     {
       "type": 0,
@@ -973,6 +1045,12 @@
       "value": "Betalen"
     }
   ],
+  "N2sZnS": [
+    {
+      "type": 0,
+      "value": "Opslaan"
+    }
+  ],
   "OnfuIr": [
     {
       "options": {
@@ -1005,6 +1083,12 @@
       "value": "withAsterisk"
     }
   ],
+  "Op4orj": [
+    {
+      "type": 0,
+      "value": "Geen vormen om te verwijderen"
+    }
+  ],
   "P194bo": [
     {
       "type": 0,
@@ -1031,6 +1115,12 @@
       "value": "Ongeldige invoer."
     }
   ],
+  "Q6/Lj7": [
+    {
+      "type": 0,
+      "value": "Verwijder het laatst getekende punt"
+    }
+  ],
   "QPdaOi": [
     {
       "type": 0,
@@ -1223,6 +1313,12 @@
       "value": " lang zijn."
     }
   ],
+  "U5+FHP": [
+    {
+      "type": 0,
+      "value": "Annuleer"
+    }
+  ],
   "UyEKdQ": [
     {
       "type": 0,
@@ -1297,6 +1393,12 @@
       "value": " zijn."
     }
   ],
+  "Y3jHZm": [
+    {
+      "type": 0,
+      "value": "Verwijder laatste punt"
+    }
+  ],
   "YcC4PD": [
     {
       "type": 0,
@@ -1427,6 +1529,12 @@
       "value": "Je gegevens"
     }
   ],
+  "bRtoG6": [
+    {
+      "type": 0,
+      "value": "Verwijder alles"
+    }
+  ],
   "bgfiRG": [
     {
       "type": 0,
@@ -1469,6 +1577,12 @@
       "value": "Terug naar begin"
     }
   ],
+  "dNGw+S": [
+    {
+      "type": 0,
+      "value": "Klik om verder te tekenen"
+    }
+  ],
   "eAmrdi": [
     {
       "type": 0,
@@ -1487,6 +1601,12 @@
       "value": "Bezig..."
     }
   ],
+  "fJVa0u": [
+    {
+      "type": 0,
+      "value": "Pin/punt"
+    }
+  ],
   "fWjfVm": [
     {
       "type": 0,
@@ -2079,6 +2199,12 @@
       "value": "Zoek adres"
     }
   ],
+  "sYb+eZ": [
+    {
+      "type": 0,
+      "value": "Verwijder alle vormen van de kaart"
+    }
+  ],
   "senRv3": [
     {
       "type": 0,
@@ -2219,12 +2345,24 @@
       "value": "Aantal personen"
     }
   ],
+  "vfKvuS": [
+    {
+      "type": 0,
+      "value": "Klik op het eerste punt, om de veelhoek te voltooien"
+    }
+  ],
   "wwsWUp": [
     {
       "type": 0,
       "value": "Wat vind je van dit formulier?"
     }
   ],
+  "xh+7Vv": [
+    {
+      "type": 0,
+      "value": "Voltooi"
+    }
+  ],
   "y31iyC": [
     {
       "type": 0,
@@ -2251,6 +2389,12 @@
       "value": "Terug naar de website"
     }
   ],
+  "zpHAro": [
+    {
+      "type": 0,
+      "value": "Klik om een lijk te tekenen"
+    }
+  ],
   "zvoXSU": [
     {
       "type": 0,
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index 965f9c360..c075c5ed0 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -9,11 +9,26 @@
     "description": "Form save modal body text",
     "originalDefault": "Enter your email address to get an email to resume the form at a later date. This can be done on any device where you open the link. The link remains valid for {numberOfDays, plural, one {1 day} other {{numberOfDays} days}}."
   },
+  "+KBbXH": {
+    "defaultMessage": "Click to start drawing shape",
+    "description": "Draw handler polygon tooltip start.",
+    "originalDefault": "Click to start drawing shape"
+  },
+  "+W79Dr": {
+    "defaultMessage": "Click to continue drawing line",
+    "description": "Draw handler polyline tooltip continue.",
+    "originalDefault": "Click to continue drawing line"
+  },
   "+uwsgF": {
     "defaultMessage": "Location and time",
     "description": "Appointments navbar title for 'location and time' step",
     "originalDefault": "Location and time"
   },
+  "/yX9Xl": {
+    "defaultMessage": "Cancel drawing",
+    "description": "Draw toolbar cancel button tooltip.",
+    "originalDefault": "Cancel drawing"
+  },
   "0j8tMq": {
     "defaultMessage": "Log out",
     "description": "Log out button text",
@@ -29,6 +44,11 @@
     "description": "Co-sign auth option not available on form",
     "originalDefault": "Something went wrong while presenting the login option. Please contact the municipality."
   },
+  "2D6ubj": {
+    "defaultMessage": "Line",
+    "description": "Draw toolbar polyline button tooltip.",
+    "originalDefault": "Line"
+  },
   "2HHJrq": {
     "defaultMessage": "Invalid function arguments",
     "description": "ZOD 'invalid_arguments' error message",
@@ -59,6 +79,11 @@
     "description": "(Async) select options loading message",
     "originalDefault": "Loading..."
   },
+  "4ZOmtU": {
+    "defaultMessage": "Save changes",
+    "description": "Edit toolbar save tooltip.",
+    "originalDefault": "Save changes"
+  },
   "4gPdgK": {
     "defaultMessage": "Bad",
     "description": "GovMetric rating text",
@@ -69,6 +94,11 @@
     "description": "Email verification: verify code button text",
     "originalDefault": "Verify"
   },
+  "4ui8R+": {
+    "defaultMessage": "Click last point to finish line",
+    "description": "Draw handler polyline tooltip end.",
+    "originalDefault": "Click last point to finish line"
+  },
   "5uh2hS": {
     "defaultMessage": "Appointment cancellation failed",
     "description": "Appointment cancellation error message",
@@ -84,6 +114,11 @@
     "description": "Check overview and co-sign",
     "originalDefault": "Check and co-sign submission"
   },
+  "62SBjV": {
+    "defaultMessage": "Shape (polygon)",
+    "description": "Draw toolbar polygon button tooltip.",
+    "originalDefault": "Shape (polygon)"
+  },
   "6GNK65": {
     "defaultMessage": "There was an authentication and/or permission problem.",
     "description": "Authentication error message",
@@ -214,6 +249,11 @@
     "description": "Login button label",
     "originalDefault": "Login with {provider}"
   },
+  "B/W1uC": {
+    "defaultMessage": "Remove shapes",
+    "description": "Edit toolbar remove button tooltip.",
+    "originalDefault": "Remove shapes"
+  },
   "BL1Ehr": {
     "defaultMessage": "Invalid.",
     "description": "ZOD 'invalid_string' error message, regex validation",
@@ -239,6 +279,11 @@
     "description": "Maintenance mode message",
     "originalDefault": "This form is currently undergoing maintenance and can not be accessed at the moment."
   },
+  "D6TdPW": {
+    "defaultMessage": "Click map to place marker",
+    "description": "Draw handler marker tooltip start.",
+    "originalDefault": "Click map to place marker"
+  },
   "DBTNgI": {
     "defaultMessage": "d",
     "description": "Placeholder for day part of a date",
@@ -364,6 +409,16 @@
     "description": "DigiD error message. MUST BE THIS EXACT STRING!",
     "originalDefault": "Inloggen bij deze organisatie is niet gelukt. Probeert u het later nog een keer. Lukt het nog steeds niet? Log in bij Mijn DigiD. Zo controleert u of uw DigiD goed werkt. Mogelijk is er een storing bij de organisatie waar u inlogt."
   },
+  "HY6Irs": {
+    "defaultMessage": "Cancel changes",
+    "description": "Edit toolbar cancel tooltip.",
+    "originalDefault": "Cancel changes"
+  },
+  "HgLr1F": {
+    "defaultMessage": "Cancel",
+    "description": "Draw toolbar cancel button message.",
+    "originalDefault": "Cancel"
+  },
   "HhcSoc": {
     "defaultMessage": "Save and resume later",
     "description": "Form save modal title",
@@ -374,6 +429,11 @@
     "description": "ZOD 'too_big' error message, generic",
     "originalDefault": "Invalid input."
   },
+  "Hkq6NE": {
+    "defaultMessage": "Finish drawing",
+    "description": "Draw toolbar finish button tooltip.",
+    "originalDefault": "Finish drawing"
+  },
   "I6ok5N": {
     "defaultMessage": "Invalid {validation, select, email {email} url {url} datetime {date and time} ip {IP address} other {validation} }.",
     "description": "ZOD 'invalid_string' error message, validation other than regex",
@@ -484,11 +544,21 @@
     "description": "Payment page title",
     "originalDefault": "Payment"
   },
+  "N2sZnS": {
+    "defaultMessage": "Save",
+    "description": "Edit toolbar save message.",
+    "originalDefault": "Save"
+  },
   "OnfuIr": {
     "defaultMessage": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}",
     "description": "Form field label, field not required",
     "originalDefault": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
   },
+  "Op4orj": {
+    "defaultMessage": "No shapes to remove",
+    "description": "Edit toolbar remove button disabled tooltip.",
+    "originalDefault": "No shapes to remove"
+  },
   "P194bo": {
     "defaultMessage": "Invalid input: must start with \"{startsWith}\".",
     "description": "ZOD 'invalid_string' error message, with startsWith",
@@ -504,6 +574,11 @@
     "description": "ZOD 'too_small' error message, generic",
     "originalDefault": "Invalid input."
   },
+  "Q6/Lj7": {
+    "defaultMessage": "Remove last drawn point",
+    "description": "Draw toolbar undo button tooltip.",
+    "originalDefault": "Remove last drawn point"
+  },
   "QPdaOi": {
     "defaultMessage": "No results found",
     "description": "Select 'no options' message",
@@ -574,6 +649,11 @@
     "description": "ZOD 'too_small' error message, for strings",
     "originalDefault": "String must contain {exact, select, true {exactly} other {{inclusive, select, true {at least} other {more than}}} } {minimum, plural, one {{minimum} character} other {{minimum} characters}}."
   },
+  "U5+FHP": {
+    "defaultMessage": "Cancel",
+    "description": "Edit toolbar cancel message.",
+    "originalDefault": "Cancel"
+  },
   "UyEKdQ": {
     "defaultMessage": "Product {number}/{total}",
     "description": "Appointments: single product label/header",
@@ -619,6 +699,11 @@
     "description": "ZOD 'too_big' error message, for dates",
     "originalDefault": "Date must be smaller than or equal to {maximum}."
   },
+  "Y3jHZm": {
+    "defaultMessage": "Remove last point",
+    "description": "Draw toolbar undo button message.",
+    "originalDefault": "Remove last point"
+  },
   "YcC4PD": {
     "defaultMessage": "Choose language",
     "description": "Language selection heading",
@@ -669,6 +754,11 @@
     "description": "Appointments: contact details step title",
     "originalDefault": "Contact details"
   },
+  "bRtoG6": {
+    "defaultMessage": "Remove all",
+    "description": "Edit toolbar clearAll message.",
+    "originalDefault": "Remove all"
+  },
   "bgfiRG": {
     "defaultMessage": "You've started the payment process.",
     "description": "payment started status",
@@ -704,6 +794,11 @@
     "description": "return to form start link after 403",
     "originalDefault": "Back to form start"
   },
+  "dNGw+S": {
+    "defaultMessage": "Click to continue drawing shape",
+    "description": "Draw handler polygon tooltip continue.",
+    "originalDefault": "Click to continue drawing shape"
+  },
   "eAmrdi": {
     "defaultMessage": "Loading...",
     "description": "Loading content text",
@@ -719,6 +814,11 @@
     "description": "Checking background processing status title",
     "originalDefault": "Processing..."
   },
+  "fJVa0u": {
+    "defaultMessage": "Marker",
+    "description": "Draw toolbar marker button tooltip.",
+    "originalDefault": "Marker"
+  },
   "fWjfVm": {
     "defaultMessage": "Please hold on while we're processing your submission.",
     "description": "Checking background processing status body",
@@ -989,6 +1089,11 @@
     "description": "The leaflet map's input fields placeholder message.",
     "originalDefault": "Enter address, please"
   },
+  "sYb+eZ": {
+    "defaultMessage": "Remove all shapes",
+    "description": "Edit toolbar clearAll tooltip.",
+    "originalDefault": "Remove all shapes"
+  },
   "senRv3": {
     "defaultMessage": "You're about to cancel your appointment on <b>{date}</b> at <b>{time}</b>. Please fill out your email address for verification purposes.",
     "description": "Appointment cancellation body text",
@@ -1039,11 +1144,21 @@
     "description": "Appointments: product amount field label",
     "originalDefault": "Amount"
   },
+  "vfKvuS": {
+    "defaultMessage": "Click first point to finish shape",
+    "description": "Draw handler polygon tooltip end.",
+    "originalDefault": "Click first point to finish shape"
+  },
   "wwsWUp": {
     "defaultMessage": "How do you rate this form?",
     "description": "GovMetric snippet header",
     "originalDefault": "How do you rate this form?"
   },
+  "xh+7Vv": {
+    "defaultMessage": "Finish",
+    "description": "Draw toolbar finish button message.",
+    "originalDefault": "Finish"
+  },
   "y31iyC": {
     "defaultMessage": "Invalid literal value, expected {expected}.",
     "description": "ZOD 'invalid_literal' error message",
@@ -1059,6 +1174,11 @@
     "description": "Back to main website link title",
     "originalDefault": "Return to main website"
   },
+  "zpHAro": {
+    "defaultMessage": "Click to start drawing line",
+    "description": "Draw handler polyline tooltip start.",
+    "originalDefault": "Click to start drawing line"
+  },
   "zvoXSU": {
     "defaultMessage": "Nearest address: <address></address>",
     "description": "Reverse geocoded address result display",
diff --git a/src/i18n/messages/nl.json b/src/i18n/messages/nl.json
index 4ef35f536..b2e835870 100644
--- a/src/i18n/messages/nl.json
+++ b/src/i18n/messages/nl.json
@@ -9,11 +9,26 @@
     "description": "Form save modal body text",
     "originalDefault": "Enter your email address to get an email to resume the form at a later date. This can be done on any device where you open the link. The link remains valid for {numberOfDays, plural, one {1 day} other {{numberOfDays} days}}."
   },
+  "+KBbXH": {
+    "defaultMessage": "Klik om een veelhoek (polygoon) te tekenen",
+    "description": "Draw handler polygon tooltip start.",
+    "originalDefault": "Click to start drawing shape"
+  },
+  "+W79Dr": {
+    "defaultMessage": "Klik om verder te tekenen",
+    "description": "Draw handler polyline tooltip continue.",
+    "originalDefault": "Click to continue drawing line"
+  },
   "+uwsgF": {
     "defaultMessage": "Afspraakdetails",
     "description": "Appointments navbar title for 'location and time' step",
     "originalDefault": "Location and time"
   },
+  "/yX9Xl": {
+    "defaultMessage": "Tekeningen annuleren",
+    "description": "Draw toolbar cancel button tooltip.",
+    "originalDefault": "Cancel drawing"
+  },
   "0j8tMq": {
     "defaultMessage": "Uitloggen",
     "description": "Log out button text",
@@ -29,6 +44,11 @@
     "description": "Co-sign auth option not available on form",
     "originalDefault": "Something went wrong while presenting the login option. Please contact the municipality."
   },
+  "2D6ubj": {
+    "defaultMessage": "Lijn",
+    "description": "Draw toolbar polyline button tooltip.",
+    "originalDefault": "Line"
+  },
   "2HHJrq": {
     "defaultMessage": "Ongeldige functie-argumenten",
     "description": "ZOD 'invalid_arguments' error message",
@@ -59,6 +79,11 @@
     "description": "(Async) select options loading message",
     "originalDefault": "Loading..."
   },
+  "4ZOmtU": {
+    "defaultMessage": "Wijzigingen opslaan",
+    "description": "Edit toolbar save tooltip.",
+    "originalDefault": "Save changes"
+  },
   "4gPdgK": {
     "defaultMessage": "Slecht",
     "description": "GovMetric rating text",
@@ -69,6 +94,11 @@
     "description": "Email verification: verify code button text",
     "originalDefault": "Verify"
   },
+  "4ui8R+": {
+    "defaultMessage": "Klik het laatste punt om de lijn te voltooien",
+    "description": "Draw handler polyline tooltip end.",
+    "originalDefault": "Click last point to finish line"
+  },
   "5uh2hS": {
     "defaultMessage": "Afspraak annuleren mislukt",
     "description": "Appointment cancellation error message",
@@ -84,6 +114,11 @@
     "description": "Check overview and co-sign",
     "originalDefault": "Check and co-sign submission"
   },
+  "62SBjV": {
+    "defaultMessage": "Veelhoek (polygoon)",
+    "description": "Draw toolbar polygon button tooltip.",
+    "originalDefault": "Shape (polygon)"
+  },
   "6GNK65": {
     "defaultMessage": "Je moet ingelogd zijn voor deze actie.",
     "description": "Authentication error message",
@@ -216,6 +251,11 @@
     "description": "Login button label",
     "originalDefault": "Login with {provider}"
   },
+  "B/W1uC": {
+    "defaultMessage": "Verwijder vormen",
+    "description": "Edit toolbar remove button tooltip.",
+    "originalDefault": "Remove shapes"
+  },
   "BL1Ehr": {
     "defaultMessage": "Ongeldig.",
     "description": "ZOD 'invalid_string' error message, regex validation",
@@ -241,6 +281,11 @@
     "description": "Maintenance mode message",
     "originalDefault": "This form is currently undergoing maintenance and can not be accessed at the moment."
   },
+  "D6TdPW": {
+    "defaultMessage": "Klik op de kaart om een pin/punt te plaatsen",
+    "description": "Draw handler marker tooltip start.",
+    "originalDefault": "Click map to place marker"
+  },
   "DBTNgI": {
     "defaultMessage": "d",
     "description": "Placeholder for day part of a date",
@@ -369,6 +414,16 @@
     "isTranslated": true,
     "originalDefault": "Inloggen bij deze organisatie is niet gelukt. Probeert u het later nog een keer. Lukt het nog steeds niet? Log in bij Mijn DigiD. Zo controleert u of uw DigiD goed werkt. Mogelijk is er een storing bij de organisatie waar u inlogt."
   },
+  "HY6Irs": {
+    "defaultMessage": "Wijzigingen annuleren",
+    "description": "Edit toolbar cancel tooltip.",
+    "originalDefault": "Cancel changes"
+  },
+  "HgLr1F": {
+    "defaultMessage": "Annuleer",
+    "description": "Draw toolbar cancel button message.",
+    "originalDefault": "Cancel"
+  },
   "HhcSoc": {
     "defaultMessage": "Opslaan en later verdergaan",
     "description": "Form save modal title",
@@ -379,6 +434,11 @@
     "description": "ZOD 'too_big' error message, generic",
     "originalDefault": "Invalid input."
   },
+  "Hkq6NE": {
+    "defaultMessage": "Tekening voltooien",
+    "description": "Draw toolbar finish button tooltip.",
+    "originalDefault": "Finish drawing"
+  },
   "I6ok5N": {
     "defaultMessage": "Ongeldig{validation, select, email { e-mailadres} url {e URL} datetime {e datumtijd} ip { IP address} other { validation} }.",
     "description": "ZOD 'invalid_string' error message, validation other than regex",
@@ -491,11 +551,21 @@
     "description": "Payment page title",
     "originalDefault": "Payment"
   },
+  "N2sZnS": {
+    "defaultMessage": "Opslaan",
+    "description": "Edit toolbar save message.",
+    "originalDefault": "Save"
+  },
   "OnfuIr": {
     "defaultMessage": "{withAsterisk, select, true {<label></label>} other {<label></label> (niet verplicht)}}",
     "description": "Form field label, field not required",
     "originalDefault": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
   },
+  "Op4orj": {
+    "defaultMessage": "Geen vormen om te verwijderen",
+    "description": "Edit toolbar remove button disabled tooltip.",
+    "originalDefault": "No shapes to remove"
+  },
   "P194bo": {
     "defaultMessage": "De ingevoerde waarde moet beginnen met \"{startsWith}\".",
     "description": "ZOD 'invalid_string' error message, with startsWith",
@@ -511,6 +581,11 @@
     "description": "ZOD 'too_small' error message, generic",
     "originalDefault": "Invalid input."
   },
+  "Q6/Lj7": {
+    "defaultMessage": "Verwijder het laatst getekende punt",
+    "description": "Draw toolbar undo button tooltip.",
+    "originalDefault": "Remove last drawn point"
+  },
   "QPdaOi": {
     "defaultMessage": "Geen beschikbare keuzes",
     "description": "Select 'no options' message",
@@ -581,6 +656,11 @@
     "description": "ZOD 'too_small' error message, for strings",
     "originalDefault": "String must contain {exact, select, true {exactly} other {{inclusive, select, true {at least} other {more than}}} } {minimum, plural, one {{minimum} character} other {{minimum} characters}}."
   },
+  "U5+FHP": {
+    "defaultMessage": "Annuleer",
+    "description": "Edit toolbar cancel message.",
+    "originalDefault": "Cancel"
+  },
   "UyEKdQ": {
     "defaultMessage": "Product {number}/{total}",
     "description": "Appointments: single product label/header",
@@ -627,6 +707,11 @@
     "description": "ZOD 'too_big' error message, for dates",
     "originalDefault": "Date must be smaller than or equal to {maximum}."
   },
+  "Y3jHZm": {
+    "defaultMessage": "Verwijder laatste punt",
+    "description": "Draw toolbar undo button message.",
+    "originalDefault": "Remove last point"
+  },
   "YcC4PD": {
     "defaultMessage": "Taal kiezen",
     "description": "Language selection heading",
@@ -678,6 +763,11 @@
     "description": "Appointments: contact details step title",
     "originalDefault": "Contact details"
   },
+  "bRtoG6": {
+    "defaultMessage": "Verwijder alles",
+    "description": "Edit toolbar clearAll message.",
+    "originalDefault": "Remove all"
+  },
   "bgfiRG": {
     "defaultMessage": "Je hebt de betaling gestart.",
     "description": "payment started status",
@@ -713,6 +803,11 @@
     "description": "return to form start link after 403",
     "originalDefault": "Back to form start"
   },
+  "dNGw+S": {
+    "defaultMessage": "Klik om verder te tekenen",
+    "description": "Draw handler polygon tooltip continue.",
+    "originalDefault": "Click to continue drawing shape"
+  },
   "eAmrdi": {
     "defaultMessage": "Laden...",
     "description": "Loading content text",
@@ -728,6 +823,11 @@
     "description": "Checking background processing status title",
     "originalDefault": "Processing..."
   },
+  "fJVa0u": {
+    "defaultMessage": "Pin/punt",
+    "description": "Draw toolbar marker button tooltip.",
+    "originalDefault": "Marker"
+  },
   "fWjfVm": {
     "defaultMessage": "Een moment geduld alstublieft. De inzending wordt verwerkt.",
     "description": "Checking background processing status body",
@@ -1001,6 +1101,11 @@
     "description": "The leaflet map's input fields placeholder message.",
     "originalDefault": "Enter address, please"
   },
+  "sYb+eZ": {
+    "defaultMessage": "Verwijder alle vormen van de kaart",
+    "description": "Edit toolbar clearAll tooltip.",
+    "originalDefault": "Remove all shapes"
+  },
   "senRv3": {
     "defaultMessage": "Je staat op het punt je afspraak op <b>{date}</b> om <b>{time}</b> te annuleren. Vul je e-mailadres in ter controle.",
     "description": "Appointment cancellation body text",
@@ -1051,11 +1156,21 @@
     "description": "Appointments: product amount field label",
     "originalDefault": "Amount"
   },
+  "vfKvuS": {
+    "defaultMessage": "Klik op het eerste punt, om de veelhoek te voltooien",
+    "description": "Draw handler polygon tooltip end.",
+    "originalDefault": "Click first point to finish shape"
+  },
   "wwsWUp": {
     "defaultMessage": "Wat vind je van dit formulier?",
     "description": "GovMetric snippet header",
     "originalDefault": "How do you rate this form?"
   },
+  "xh+7Vv": {
+    "defaultMessage": "Voltooi",
+    "description": "Draw toolbar finish button message.",
+    "originalDefault": "Finish"
+  },
   "y31iyC": {
     "defaultMessage": "Ongeldige letterlijke waarde, verwachtte {expected}.",
     "description": "ZOD 'invalid_literal' error message",
@@ -1071,6 +1186,11 @@
     "description": "Back to main website link title",
     "originalDefault": "Return to main website"
   },
+  "zpHAro": {
+    "defaultMessage": "Klik om een lijk te tekenen",
+    "description": "Draw handler polyline tooltip start.",
+    "originalDefault": "Click to start drawing line"
+  },
   "zvoXSU": {
     "defaultMessage": "Adres in de buurt: <address></address>",
     "description": "Reverse geocoded address result display",