diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json
index 07ead99ef..02a8a9876 100644
--- a/assets/themes/bag/bag.json
+++ b/assets/themes/bag/bag.json
@@ -17,7 +17,7 @@
     "de": "Dieses Thema hilft beim Importieren von BAG-Daten"
   },
   "credits": "Wouter van der Wal",
-  "icon": "./assets/themes/bag_import/logo.svg",
+  "icon": "./assets/themes/bag/logo.svg",
   "startLat": 53.1726,
   "startLon": 7.04545,
   "startZoom": 9,
diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
index dc58e9f62..de0f06a8d 100644
--- a/assets/themes/grb/grb.json
+++ b/assets/themes/grb/grb.json
@@ -15,7 +15,7 @@
     "es": "Este tema es un intento de automatizar la importación GRB.",
     "da": "Dette tema er et forsøg på at hjælpe med at automatisere GRB-importen."
   },
-  "icon": "./assets/themes/grb_import/logo.svg",
+  "icon": "./assets/themes/grb/logo.svg",
   "startLat": 51.0249,
   "startLon": 4.026489,
   "startZoom": 9,
@@ -651,11 +651,11 @@
             "mappings": [
               {
                 "if": "_intersects_with_other_features~*",
-                "then": "./assets/themes/grb_import/warning.svg"
+                "then": "./assets/themes/grb/warning.svg"
               },
               {
                 "if": "addr:housenumber~*",
-                "then": "./assets/themes/grb_import/housenumber_blank.svg"
+                "then": "./assets/themes/grb/housenumber_blank.svg"
               }
             ]
           },
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 94bb3f268..fe37ee177 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,13 +1,16 @@
 {
   "id": "mapcomplete-changes",
   "title": {
-    "en": "Changes made with MapComplete"
+    "en": "Changes made with MapComplete",
+    "de": "Mit MapComplete vorgenommene Änderungen"
   },
   "shortDescription": {
-    "en": "Shows changes made by MapComplete"
+    "en": "Shows changes made by MapComplete",
+    "de": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden"
   },
   "description": {
-    "en": "This maps shows all the changes made with MapComplete"
+    "en": "This maps shows all the changes made with MapComplete",
+    "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen"
   },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
@@ -20,7 +23,10 @@
     {
       "id": "mapcomplete-changes",
       "name": {
-        "en": "Changeset centers"
+        "en": "Changeset centers",
+        "ca": "Centres del conjunt de canvis",
+        "de": "Zentrum der Änderungssätze",
+        "pa_PK": "تبدیلیاں دے کیندر"
       },
       "minzoom": 0,
       "source": {
@@ -31,41 +37,48 @@
       },
       "title": {
         "render": {
-          "en": "Changeset for {theme}"
+          "en": "Changeset for {theme}",
+          "de": "Änderungssatz für {theme}"
         }
       },
       "description": {
-        "en": "Shows all MapComplete changes"
+        "en": "Shows all MapComplete changes",
+        "de": "Zeigt alle MapComplete-Änderungen"
       },
       "tagRenderings": [
         {
           "id": "show_changeset_id",
           "render": {
-            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
+            "de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
           }
         },
         {
           "id": "contributor",
           "question": {
-            "en": "What contributor did make this change?"
+            "en": "What contributor did make this change?",
+            "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
           },
           "freeform": {
             "key": "user"
           },
           "render": {
-            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
+            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
+            "de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
           }
         },
         {
           "id": "theme-id",
           "question": {
-            "en": "What theme was used to make this change?"
+            "en": "What theme was used to make this change?",
+            "de": "Welches Thema wurde für diese Änderung verwendet?"
           },
           "freeform": {
             "key": "theme"
           },
           "render": {
-            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
+            "de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           }
         },
         {
@@ -74,19 +87,23 @@
             "key": "locale"
           },
           "question": {
-            "en": "What locale (language) was this change made in?"
+            "en": "What locale (language) was this change made in?",
+            "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?"
           },
           "render": {
-            "en": "User locale is {locale}"
+            "en": "User locale is {locale}",
+            "de": "Benutzergebietsschema ist {locale}"
           }
         },
         {
           "id": "host",
           "render": {
-            "en": "Change with with <a href='{host}'>{host}</a>"
+            "en": "Change with with <a href='{host}'>{host}</a>",
+            "de": "Geändert über <a href='{host}'>{host}</a>"
           },
           "question": {
-            "en": "What host (website) was this change made with?"
+            "en": "What host (website) was this change made with?",
+            "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
           },
           "freeform": {
             "key": "host"
@@ -118,17 +135,13 @@
                 "if": "theme=aed",
                 "then": "./assets/themes/aed/aed.svg"
               },
-              {
-                "if": "theme=aed_brugge",
-                "then": "./assets/themes/aed/aed.svg"
-              },
               {
                 "if": "theme=artwork",
                 "then": "./assets/themes/artwork/artwork.svg"
               },
               {
                 "if": "theme=bag",
-                "then": "./assets/themes/bag_import/logo.svg"
+                "then": "./assets/themes/bag/logo.svg"
               },
               {
                 "if": "theme=benches",
@@ -228,16 +241,12 @@
               },
               {
                 "if": "theme=grb",
-                "then": "./assets/themes/grb_import/logo.svg"
+                "then": "./assets/themes/grb/logo.svg"
               },
               {
                 "if": "theme=grb_fixme",
                 "then": "./assets/svg/bug.svg"
               },
-              {
-                "if": "theme=missing_streets",
-                "then": "./assets/svg/robot.svg"
-              },
               {
                 "if": "theme=hackerspaces",
                 "then": "./assets/themes/hackerspaces/glider.svg"
@@ -427,7 +436,9 @@
                 }
               ],
               "question": {
-                "en": "Themename contains {search}"
+                "en": "Themename contains {search}",
+                "ca": "El nom de la petició conté {search}",
+                "de": "Themename enthält {search}"
               }
             }
           ]
@@ -443,7 +454,8 @@
                 }
               ],
               "question": {
-                "en": "Made by contributor {search}"
+                "en": "Made by contributor {search}",
+                "de": "Erstellt vom Mitwirkenden {search}"
               }
             }
           ]
@@ -459,7 +471,8 @@
                 }
               ],
               "question": {
-                "en": "<b>Not</b> made by contributor {search}"
+                "en": "<b>Not</b> made by contributor {search}",
+                "de": "<b>Nicht</b> von Mitwirkendem {search}"
               }
             }
           ]
@@ -476,7 +489,8 @@
                 }
               ],
               "question": {
-                "en": "Made before {search}"
+                "en": "Made before {search}",
+                "de": "Erstellt vor {search}"
               }
             }
           ]
@@ -493,7 +507,8 @@
                 }
               ],
               "question": {
-                "en": "Made after {search}"
+                "en": "Made after {search}",
+                "de": "Erstellt nach {search}"
               }
             }
           ]
@@ -509,7 +524,8 @@
                 }
               ],
               "question": {
-                "en": "User language (iso-code) {search}"
+                "en": "User language (iso-code) {search}",
+                "de": "Benutzersprache (ISO-Code) {search}"
               }
             }
           ]
@@ -525,7 +541,8 @@
                 }
               ],
               "question": {
-                "en": "Made with host {search}"
+                "en": "Made with host {search}",
+                "de": "Erstellt mit host {search}"
               }
             }
           ]
@@ -540,7 +557,8 @@
           {
             "id": "link_to_more",
             "render": {
-              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
+              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
+              "de": "Weitere Statistiken finden Sie unter <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
             }
           },
           {
diff --git a/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts b/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts
index 58fb88b0d..e987c3cf1 100644
--- a/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts
+++ b/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts
@@ -294,7 +294,7 @@ describe("ReplaceGeometryAction", () => {
                 mapRendering: [
                     {
                         iconSize: "50,50,center",
-                        icon: "./assets/themes/grb_import/housenumber_blank.svg",
+                        icon: "./assets/themes/grb/housenumber_blank.svg",
                         location: ["point", "centroid"],
                     },
                 ],