diff --git a/assets/layers/wayside_shrine/license_info.json b/assets/layers/wayside_shrine/license_info.json
new file mode 100644
index 000000000..ccb8d0588
--- /dev/null
+++ b/assets/layers/wayside_shrine/license_info.json
@@ -0,0 +1,42 @@
+[
+  {
+    "path": "shrine.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Wanderwütiger"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Carto_shrine.svg"
+    ]
+  },
+  {
+    "path": "shrine_example1.jpg",
+    "license": "CC-BY-SA 4.0",
+    "authors": [
+      "Bastian Greshake Tzovaras"
+    ],
+    "sources": [
+      "https://source.mapcomplete.org/MapComplete/MapComplete/pulls/2349/files#diff-a27dbd36795c9186dfd9f614f3a7f06709b64d2c"
+    ]
+  },
+  {
+    "path": "shrine_example2.jpg",
+    "license": "CC-BY-SA 4.0",
+    "authors": [
+      "Bastian Greshake Tzovaras"
+    ],
+    "sources": [
+      "https://source.mapcomplete.org/MapComplete/MapComplete/pulls/2349/files#diff-a27dbd36795c9186dfd9f614f3a7f06709b64d2c"
+    ]
+  },
+  {
+    "path": "shrine_example3.jpg",
+    "license": "CC-BY-SA 4.0",
+    "authors": [
+      "Bastian Greshake Tzovaras"
+    ],
+    "sources": [
+      "https://source.mapcomplete.org/MapComplete/MapComplete/pulls/2349/files#diff-a27dbd36795c9186dfd9f614f3a7f06709b64d2c"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/wayside_shrines/shrine.svg b/assets/layers/wayside_shrine/shrine.svg
similarity index 100%
rename from assets/layers/wayside_shrines/shrine.svg
rename to assets/layers/wayside_shrine/shrine.svg
diff --git a/assets/layers/wayside_shrines/shrine.svg.license b/assets/layers/wayside_shrine/shrine.svg.license
similarity index 54%
rename from assets/layers/wayside_shrines/shrine.svg.license
rename to assets/layers/wayside_shrine/shrine.svg.license
index 547f873e6..b62bf5783 100644
--- a/assets/layers/wayside_shrines/shrine.svg.license
+++ b/assets/layers/wayside_shrine/shrine.svg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Wanderwütiger
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrines/shrine_example1.jpg b/assets/layers/wayside_shrine/shrine_example1.jpg
similarity index 100%
rename from assets/layers/wayside_shrines/shrine_example1.jpg
rename to assets/layers/wayside_shrine/shrine_example1.jpg
diff --git a/assets/layers/wayside_shrines/shrine_example1.jpg.license b/assets/layers/wayside_shrine/shrine_example1.jpg.license
similarity index 56%
rename from assets/layers/wayside_shrines/shrine_example1.jpg.license
rename to assets/layers/wayside_shrine/shrine_example1.jpg.license
index 0ed57fe73..4094d60f2 100644
--- a/assets/layers/wayside_shrines/shrine_example1.jpg.license
+++ b/assets/layers/wayside_shrine/shrine_example1.jpg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Bastian Greshake Tzovaras
-SPDX-License-Identifier: CC-BY-SA-4.0
+SPDX-License-Identifier: CC-BY-SA 4.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrines/shrine_example2.jpg b/assets/layers/wayside_shrine/shrine_example2.jpg
similarity index 100%
rename from assets/layers/wayside_shrines/shrine_example2.jpg
rename to assets/layers/wayside_shrine/shrine_example2.jpg
diff --git a/assets/layers/wayside_shrines/shrine_example2.jpg.license b/assets/layers/wayside_shrine/shrine_example2.jpg.license
similarity index 56%
rename from assets/layers/wayside_shrines/shrine_example2.jpg.license
rename to assets/layers/wayside_shrine/shrine_example2.jpg.license
index 0ed57fe73..4094d60f2 100644
--- a/assets/layers/wayside_shrines/shrine_example2.jpg.license
+++ b/assets/layers/wayside_shrine/shrine_example2.jpg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Bastian Greshake Tzovaras
-SPDX-License-Identifier: CC-BY-SA-4.0
+SPDX-License-Identifier: CC-BY-SA 4.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrines/shrine_example3.jpg b/assets/layers/wayside_shrine/shrine_example3.jpg
similarity index 100%
rename from assets/layers/wayside_shrines/shrine_example3.jpg
rename to assets/layers/wayside_shrine/shrine_example3.jpg
diff --git a/assets/layers/wayside_shrines/shrine_example3.jpg.license b/assets/layers/wayside_shrine/shrine_example3.jpg.license
similarity index 56%
rename from assets/layers/wayside_shrines/shrine_example3.jpg.license
rename to assets/layers/wayside_shrine/shrine_example3.jpg.license
index 0ed57fe73..4094d60f2 100644
--- a/assets/layers/wayside_shrines/shrine_example3.jpg.license
+++ b/assets/layers/wayside_shrine/shrine_example3.jpg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Bastian Greshake Tzovaras
-SPDX-License-Identifier: CC-BY-SA-4.0
+SPDX-License-Identifier: CC-BY-SA 4.0
\ No newline at end of file
diff --git a/assets/layers/wayside_shrines/wayside_shrines.json b/assets/layers/wayside_shrine/wayside_shrine.json
similarity index 91%
rename from assets/layers/wayside_shrines/wayside_shrines.json
rename to assets/layers/wayside_shrine/wayside_shrine.json
index 521bc9ba7..9006fb921 100644
--- a/assets/layers/wayside_shrines/wayside_shrines.json
+++ b/assets/layers/wayside_shrine/wayside_shrine.json
@@ -4,7 +4,7 @@
     "en": "Wayside Shrines"
   },
   "description": {
-    "en": "Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small small shrines that can be found next to a road or pathway and are frequented by travellers passing by."
+    "en": "Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by."
   },
   "source": {
     "osmTags": "historic=wayside_shrine"
@@ -28,7 +28,7 @@
           "color": "white"
         },
         {
-          "icon": "./assets/layers/wayside_shrines/shrine.svg"
+          "icon": "./assets/layers/wayside_shrine/shrine.svg"
         }
       ]
     }
@@ -51,9 +51,9 @@
         "en": "A wayside shrine typically shows a religious depiction, usually placed by a road or pathway. "
       },
       "exampleImages": [
-        "./assets/layers/wayside_shrines/shrine_example1.jpg",
-        "./assets/layers/wayside_shrines/shrine_example2.jpg",
-        "./assets/layers/wayside_shrines/shrine_example3.jpg"
+        "./assets/layers/wayside_shrine/shrine_example1.jpg",
+        "./assets/layers/wayside_shrine/shrine_example2.jpg",
+        "./assets/layers/wayside_shrine/shrine_example3.jpg"
       ]
     }
   ],
@@ -66,11 +66,19 @@
       "id": "shrine_name",
       "freeform": {
         "key": "name",
-        "type": "string"
+        "type": "string",
+        "addExtraTags": ["noname="]
       },
       "render": {
         "en": "The name of this shrine is <b>{name}</b>"
-      }
+      },
+      "mappings": [{
+        "if": "noname=yes",
+        "alsoShowIf": "name=",
+        "then": {
+          "en": "This shrine does not have a name"
+        }
+      }]
     },
     {
       "question": {
@@ -331,5 +339,9 @@
     "neededChangesets": 1
   },
   "credits": "Bastian Greshake Tzovaras",
-  "credits:uid": 20617622
+  "credits:uid": 20617622,
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  }
 }
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 8bc4511d3..79db547a0 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -602,6 +602,10 @@
                     "if": "theme=waste_basket",
                     "then": "./assets/themes/waste_basket/waste_basket.svg"
                   },
+                  {
+                    "if": "theme=wayside_shrines",
+                    "then": "./assets/layers/wayside_shrine/shrine.svg"
+                  },
                   {
                     "if": "theme=width",
                     "then": "./assets/themes/width/icon.svg"
diff --git a/assets/themes/wayside_shrines/shrine.svg b/assets/themes/wayside_shrines/shrine.svg
deleted file mode 100644
index 1d13b2ef2..000000000
--- a/assets/themes/wayside_shrines/shrine.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="svg109"
-   width="14"
-   height="14"
-   viewBox="0 0 14 14">
-  <metadata
-     id="metadata115">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs113" />
-  <path
-     id="rect816"
-     d="M 7 0 L 5 3 L 5 12 L 9 12 L 9 3 L 7 0 z M 7 3.9980469 A 1 1 0 0 1 8 4.9980469 A 1 1 0 0 0 8 5 L 8 8 L 6 8 L 6 5 A 1 1 0 0 0 6 4.9980469 A 1 1 0 0 1 7 3.9980469 z M 4 13 L 4 14 L 10 14 L 10 13 L 4 13 z "
-     style="opacity:1;fill:#555;fill-opacity:1;stroke:none;stroke-width:0.21650636;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-</svg>
diff --git a/assets/themes/wayside_shrines/shrine.svg.license b/assets/themes/wayside_shrines/shrine.svg.license
deleted file mode 100644
index 547f873e6..000000000
--- a/assets/themes/wayside_shrines/shrine.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: Wanderwütiger
-SPDX-License-Identifier: CC0-1.0
diff --git a/assets/themes/wayside_shrines/wayside_shrines.json b/assets/themes/wayside_shrines/wayside_shrines.json
index 8c1a249a3..980d2773a 100644
--- a/assets/themes/wayside_shrines/wayside_shrines.json
+++ b/assets/themes/wayside_shrines/wayside_shrines.json
@@ -6,8 +6,8 @@
   "description": {
     "en": "This map shows shrines found on the side of roads and paths, and allows adding new ones"
   },
-  "icon": "./assets/themes/wayside_shrines/shrine.svg",
+  "icon": "./assets/layers/wayside_shrine/shrine.svg",
   "layers": [
-    "wayside_shrines"
+    "wayside_shrine"
   ]
 }