diff --git a/assets/layers/disaster_response/CivilDefence.svg b/assets/layers/disaster_response/CivilDefence.svg
new file mode 100644
index 0000000000..3cfd381768
--- /dev/null
+++ b/assets/layers/disaster_response/CivilDefence.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="700" height="700" viewBox="-350 -350 700 700">
+<circle fill="#FFAA00" r="350"/>
+<path fill="#003680" d="M249.41531629,144H-249.41531629L0-288z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/layers/disaster_response/CivilDefence.svg.license b/assets/layers/disaster_response/CivilDefence.svg.license
new file mode 100644
index 0000000000..54aed41888
--- /dev/null
+++ b/assets/layers/disaster_response/CivilDefence.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: https://commons.wikimedia.org/wiki/User:MStankie
+SPDX-License-Identifier: LicenseRef-TRIVIAL
\ No newline at end of file
diff --git a/assets/layers/disaster_response/disaster_response.json b/assets/layers/disaster_response/disaster_response.json
new file mode 100644
index 0000000000..2dfc16a952
--- /dev/null
+++ b/assets/layers/disaster_response/disaster_response.json
@@ -0,0 +1,70 @@
+{
+  "id": "disaster_response",
+  "title": {
+    "en": "Disaster response organization",
+    "it": "Organizzazione per la risposta ai disastri"
+  },
+  "description": {
+    "en": "This layer contains organizations that have the main objective to help the civil population during and after natural or anthropogenic disasters by working in the affected area.",
+    "it": "Questo livello contiene organizzazioni che hanno come obiettivo principale quello di aiutare la popolazione civile durante e dopo disastri naturali o antropogenici, lavorando nell'area colpita."
+  },
+  "docs": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Ddisaster_response",
+  "minzoom": 10,
+  "lineRendering": [
+    {
+      "color": "#6BC4F7",
+      "width": 3
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a disaster response organization",
+        "it": "un'organizzazione per la risposta ai disastri"
+      },
+      "tags": [
+        "emergency=disaster_response"
+      ]
+    }
+  ],
+  "source": {
+    "osmTags": {
+      "and": [
+        "emergency=disaster_response"
+      ]
+    }
+  },
+  "pointRendering": [
+    {
+      "iconSize": "40,40",
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "anchor": "bottom",
+      "marker": [
+        {
+          "icon": "./assets/themes/disaster_response/CivilDefence.svg"
+        }
+      ]
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    "website",
+    {
+      "id": "disaster_response_name",
+      "freeform": {
+        "key": "name"
+      },
+      "question": {
+        "en": "What is the name of this organization?",
+        "it": "Qual è il nome di questa organizzazione?"
+      },
+      "render": {
+        "en": "This organization is named <b>{name}</b>",
+        "it": "Questa organizzazione si chiama <b>{name}</b>"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/disaster_response/license_info.json b/assets/layers/disaster_response/license_info.json
new file mode 100644
index 0000000000..a11d701d0b
--- /dev/null
+++ b/assets/layers/disaster_response/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "CivilDefence.svg",
+    "license": "TRIVIAL",
+    "authors": [
+      "https://commons.wikimedia.org/wiki/User:MStankie"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:CivilDefence.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/disaster_response/disaster_response.json b/assets/themes/disaster_response/disaster_response.json
index d330e1eff1..58e787aa82 100644
--- a/assets/themes/disaster_response/disaster_response.json
+++ b/assets/themes/disaster_response/disaster_response.json
@@ -6,7 +6,7 @@
   "docs": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities",
   "icon": "./assets/themes/disaster_response/CivilDefence.svg",
   "id": "disaster_response",
-  "socialImage": "./assets/themes/disaster_response/social.jpg",
+  "socialImage": "./assets/themes/disaster_response/social.svg",
   "title": {
     "en": "Disaster response",
     "it": "Risposta ai disastri"
@@ -14,111 +14,6 @@
   "layers": [
     "hospital",
     "assembly_point",
-    {
-      "id": "disaster_response",
-      "title": "Disaster response",
-      "description": {
-        "en": "This layer contains organizations that have the main objective to help the civil population during and after natural or anthropogenic disasters by working in the affected area.",
-        "it": "Questo livello contiene organizzazioni che hanno come obiettivo principale quello di aiutare la popolazione civile durante e dopo disastri naturali o antropogenici, lavorando nell'area colpita."
-      },
-      "docs": "https://wiki.openstreetmap.org/wiki/Tag:emergency%3Ddisaster_response",
-      "source": {
-        "osmTags": {
-          "and": [
-            "emergency=disaster_response"
-          ]
-        }
-      },
-      "minzoom": 10,
-      "lineRendering": [
-        {
-          "color": "#6BC4F7",
-          "width": 3
-        }
-      ],
-      "pointRendering": [
-        {
-          "iconSize": "40,40",
-          "location": [
-            "point",
-            "centroid"
-          ],
-          "anchor": "bottom",
-          "marker": [
-            {
-              "icon": "./assets/themes/disaster_response/CivilDefence.svg"
-            }
-          ]
-        }
-      ],
-      "tagRenderings": [
-        "images",
-        "website",
-        {
-          "id": "disaster_response_name",
-          "freeform": {
-            "key": "name"
-          },
-          "question": {
-            "en": "What is the name of this organization?",
-            "it": "Qual è il nome di questa organizzazione?"
-          },
-          "render": {
-            "en": "This organization is named <b>{name}</b>",
-            "it": "Questa organizzazione si chiama <b>{name}</b>"
-          }
-        }
-      ]
-    },
-    {
-      "id": "ses_station",
-      "title": "SES station",
-      "description": {
-        "en": "This layer contains stations of State Emergency Service (an Australian volunteer organization) mapped using a DEPRECATED tagging scheme.",
-        "it": "Questo livello contiene stazioni del State Emergency Service (un'organizzazione australiana di volontari) mappate utilizzando uno schema di tagging DEPRECATO."
-      },
-      "docs": "https://wiki.openstreetmap.org/wiki/Tag%3Aemergency%3Dses_station",
-      "source": {
-        "osmTags": {
-          "and": [
-            "emergency=ses_station"
-          ]
-        }
-      },
-      "minzoom": 10,
-      "pointRendering": [
-        {
-          "iconSize": "40,40",
-          "location": [
-            "point",
-            "centroid"
-          ],
-          "anchor": "bottom",
-          "marker": [
-            {
-              "icon": "./assets/themes/disaster_response/CivilDefence.svg"
-            }
-          ]
-        }
-      ],
-      "tagRenderings": [
-        "images",
-        "website",
-        {
-          "id": "ses_station_name",
-          "freeform": {
-            "key": "name"
-          },
-          "question": {
-            "en": "What is the name of this organization?",
-            "it": "Qual è il nome di questa organizzazione?"
-          },
-          "render": {
-            "en": "This organization is named <b>{name}</b>",
-            "it": "Questa organizzazione si chiama <b>{name}</b>"
-          }
-        }
-      ]
-    }
+    "disaster_response"
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/disaster_response/license_info.json b/assets/themes/disaster_response/license_info.json
index 37eb5bd05e..36d8fd3991 100644
--- a/assets/themes/disaster_response/license_info.json
+++ b/assets/themes/disaster_response/license_info.json
@@ -10,13 +10,15 @@
     ]
   },
   {
-    "path": "social.jpg",
-    "license": "CC0-1.0",
+    "path": "social.svg",
+    "license": "TRIVIAL",
     "authors": [
-      "United States Agency for International Development"
+      "Geneva Convention",
+      "https://commons.wikimedia.org/wiki/User:MStankie",
+      "https://commons.wikimedia.org/wiki/User:The_Navigators"
     ],
     "sources": [
-      "https://commons.wikimedia.org/wiki/File:A_commune_level_disaster_response_drill_(27239207134).jpg"
+      "https://commons.wikimedia.org/wiki/File:Geneva_Convention_Civil_Defence_Symbol_-_Flag.svg"
     ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/disaster_response/social.jpg b/assets/themes/disaster_response/social.jpg
deleted file mode 100644
index 4001b00b65..0000000000
Binary files a/assets/themes/disaster_response/social.jpg and /dev/null differ
diff --git a/assets/themes/disaster_response/social.jpg.license b/assets/themes/disaster_response/social.jpg.license
deleted file mode 100644
index 08b6dec461..0000000000
--- a/assets/themes/disaster_response/social.jpg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: United States Agency for International Development
-SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/disaster_response/social.svg b/assets/themes/disaster_response/social.svg
new file mode 100644
index 0000000000..86a0036b5b
--- /dev/null
+++ b/assets/themes/disaster_response/social.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="974.348px" height="649.889px" viewBox="-136 50.534 974.348 649.889" enable-background="new -136 50.534 974.348 649.889" xml:space="preserve">
+<rect x="-136" y="50.534" fill="#FFAA00" width="974.348" height="649.889"/>
+<path fill="#003680" d="M599.416,591.479H100.584l249.416-432L599.416,591.479z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/themes/disaster_response/social.svg.license b/assets/themes/disaster_response/social.svg.license
new file mode 100644
index 0000000000..ad1a666df4
--- /dev/null
+++ b/assets/themes/disaster_response/social.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Geneva Convention; https://commons.wikimedia.org/wiki/User:MStankie; https://commons.wikimedia.org/wiki/User:The_Navigators
+SPDX-License-Identifier: LicenseRef-TRIVIAL
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 9add3959dc..30c38f4d70 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -484,7 +484,21 @@
         }
     },
     "assembly_point": {
+        "description": "This layer contains assembly points and waiting areas where all employees, passengers or a large crowd assemble in case of an emergency.",
+        "presets": {
+            "0": {
+                "title": "an assembly point"
+            }
+        },
         "tagRenderings": {
+            "assembly_point_name": {
+                "question": "What is the name of this assembly point?",
+                "render": "This assembly point is named <b>{name}</b>"
+            },
+            "assembly_point_operator": {
+                "question": "What organization operates this assembly point?",
+                "render": "This assembly point is operated by <b>{operator}</b>"
+            },
             "disaster_type": {
                 "mappings": {
                     "0": {
@@ -501,10 +515,6 @@
                     }
                 },
                 "question": "For which disaster type is this assembly point meant?"
-            },
-            "operator": {
-                "question": "What organization operates this assembly point?",
-                "render": "This assembly point is operated by {operator}"
             }
         },
         "title": "Emergency assembly points"
@@ -3753,6 +3763,21 @@
         "description": "This layer visualizes directions",
         "name": "Direction visualization"
     },
+    "disaster_response": {
+        "description": "This layer contains organizations that have the main objective to help the civil population during and after natural or anthropogenic disasters by working in the affected area.",
+        "presets": {
+            "0": {
+                "title": "a disaster response organization"
+            }
+        },
+        "tagRenderings": {
+            "disaster_response_name": {
+                "question": "What is the name of this organization?",
+                "render": "This organization is named <b>{name}</b>"
+            }
+        },
+        "title": "Disaster response organization"
+    },
     "doctors": {
         "description": "This layer shows doctor offices",
         "name": "Doctors",
diff --git a/langs/layers/it.json b/langs/layers/it.json
index d24655427e..b82abd85c9 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -143,7 +143,21 @@
         }
     },
     "assembly_point": {
+        "description": "Questo livello contiene punti di raccolta e aree di attesa in cui tutti i dipendenti, i passeggeri o una grande folla si riuniscono in caso di emergenza.",
+        "presets": {
+            "0": {
+                "title": "un punto di raccolta"
+            }
+        },
         "tagRenderings": {
+            "assembly_point_name": {
+                "question": "Qual è il nome di questo punto di raccolta?",
+                "render": "Questo punto di raccolta si chiama <b>{name}</b>"
+            },
+            "assembly_point_operator": {
+                "question": "Quale organizzazione gestisce questo punto di raccolta?",
+                "render": "Questo punto di raccolta è gestita da <b>{operator}</b>"
+            },
             "disaster_type": {
                 "mappings": {
                     "0": {
@@ -159,14 +173,10 @@
                         "then": "Frana"
                     }
                 },
-                "question": "Per quali tipi di disastro è pensata questa area di attesa?"
-            },
-            "operator": {
-                "question": "Quale organizzazione gestisce questa area di attesa?",
-                "render": "Questa area di attesa è gestita da {operator}"
+                "question": "Per quali tipi di disastro è pensato questo punto di raccolta?"
             }
         },
-        "title": "Aree di attesa per emergenze"
+        "title": "Punti di raccolta per emergenze"
     },
     "atm": {
         "description": "Sportello Bancomat per prelevare denaro",
@@ -1305,6 +1315,21 @@
         "description": "Questo livello visualizza le direzioni",
         "name": "Visualizzazione della direzione"
     },
+    "disaster_response": {
+        "description": "Questo livello contiene organizzazioni che hanno come obiettivo principale quello di aiutare la popolazione civile durante e dopo disastri naturali o antropogenici, lavorando nell'area colpita.",
+        "presets": {
+            "0": {
+                "title": "un'organizzazione per la risposta ai disastri"
+            }
+        },
+        "tagRenderings": {
+            "disaster_response_name": {
+                "question": "Qual è il nome di questa organizzazione?",
+                "render": "Questa organizzazione si chiama <b>{name}</b>"
+            }
+        },
+        "title": "Organizzazione per la risposta ai disastri"
+    },
     "drinking_water": {
         "name": "Acqua potabile",
         "presets": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 85d87b62cb..be7c82c189 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -632,7 +632,7 @@
         "title": "Cyclofix - a map for cyclists"
     },
     "disaster_response": {
-        "description": "This theme contains elements meant for disaster risk reduction and response.",
+        "description": "This map contains elements meant for disaster preparedness and response.",
         "title": "Disaster response"
     },
     "drinking_water": {
diff --git a/langs/themes/it.json b/langs/themes/it.json
index 395c61d05d..6fc0f4e43a 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -402,7 +402,7 @@
         "title": "Cyclofix - una mappa libera per chi va in bici"
     },
     "disaster_response": {
-        "description": "Questo tema contiene elementi pensati per la riduzione del rischio e per la risposta ai disastri.",
+        "description": "Questa mappa contiene elementi pensati per la preparazione e risposta ai disastri.",
         "title": "Risposta ai disastri"
     },
     "drinking_water": {