diff --git a/assets/layers/wayside_cross/license_info.json b/assets/layers/wayside_cross/license_info.json
deleted file mode 100644
index 69a8199fb..000000000
--- a/assets/layers/wayside_cross/license_info.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "path": "wayside_cross_example1.jpg",
-    "license": "CC-BY-SA-4.0",
-    "authors": [
-      "Przykuta"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Gor%C4%99dy_krzy%C5%BCe_13.07.2009_p.jpg"
-    ]
-  },
-  {
-    "path": wayside_cross.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Geozeisig"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Christian-16.svg"
-    ]
-  },
-  {
-    "path": "wayside_cross_example2.jpg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Markus B"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Wegkreuz.jpg"
-    ]
-  },
-  {
-    "path": "wayside_cross_example3.jpg",
-    "license": "CC-BY-SA 3.0",
-    "authors": [
-      "HeinzLW"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Schaederkreuz.jpg"
-    ]
-  }
-]
diff --git a/assets/layers/wayside_cross/wayside_cross.json b/assets/layers/wayside_cross/wayside_cross.json
deleted file mode 100644
index d5b292460..000000000
--- a/assets/layers/wayside_cross/wayside_cross.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-  "minzoom": 15,
-  "pointRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "marker": [
-        {
-          "icon": "circle",
-          "color": "white"
-        },
-        {
-          "icon": "./assets/layers/wayside_cross/wayside_cross.svg"
-        }
-      ]
-    }
-  ],
-  "tagRenderings": [
-    "images",
-    {
-      "question": {
-        "en": "What is the name of this wayside cross?"
-      },
-      "id": "wayside_cross_name",
-      "render": {
-        "en": "This wayside cross is called {name}"
-      },
-      "freeform": {
-        "key": "name"
-      }
-    },
-    {
-      "question": {
-        "en": "What is the inscription on this cross?"
-      },
-      "id": "wayside_cross_inscription",
-      "freeform": {
-        "key": "inscription"
-      },
-      "render": {
-        "en": "The inscription on this shrine is: {inscription}"
-      }
-    },
-    {
-      "question": {
-        "en": "What's the Christian denomination of this cross?"
-      },
-      "id": "wayside_cross_denomination",
-      "labels": [
-        "shrine_questions"
-      ],
-      "mappings": [
-        {
-          "if": "denomination=catholic",
-          "then": {
-            "en": "The religious subdenomination is Catholic"
-          }
-        },
-        {
-          "if": "denomination=roman_catholic",
-          "then": {
-            "en": "The religious subdenomination is Roman Catholic"
-          }
-        },
-        {
-          "if": "denomination=orthodox",
-          "then": {
-            "en": "The religious subdenomination is Orthodox"
-          }
-        },
-        {
-          "if": "denomination=greek_orthodox",
-          "then": {
-            "en": "The religious subdenomination is Greek-Orthodox"
-          }
-        },
-        {
-          "if": "denomination=russian_orthodox",
-          "then": {
-            "en": "The religious subdenomination is Russian-Orthodox"
-          }
-        },
-        {
-          "if": "denomination=serbian_orthodox",
-          "then": {
-            "en": "The religious subdenomination is Serbian Orthodox"
-          }
-        },
-        {
-          "if": "denomination=protestant",
-          "then": {
-            "en": "The religious subdenomination is Protestant"
-          }
-        },
-        {
-          "if": "denomination=anglican",
-          "then": {
-            "en": "The religious subdenomination is Anglican"
-          }
-        },
-        {
-          "if": "denomination=adventist",
-          "then": {
-            "en": "The religious subdenomination is Adventist"
-          }
-        },
-        {
-          "if": "denomination=evangelical",
-          "then": {
-            "en": "The religious subdenomination is evangelical"
-          }
-        }
-      ],
-      "render": {
-        "en": "The religious denomination is <b>{denomination}</b>"
-      },
-      "multiAnswer": true,
-      "freeform": {
-        "key": "denomination"
-      }
-    }
-  ],
-  "lineRendering": [
-    {
-      "width": 1,
-      "color": "blue"
-    }
-  ],
-  "credits": "Bastian Greshake Tzovaras",
-  "credits:uid": 20617622,
-  "source": {
-    "osmTags": "historic=wayside_cross"
-  },
-  "id": "wayside_cross",
-  "name": {
-    "en": "Wayside crosses"
-  },
-  "description": {
-    "en": "Wayside crosses are (often historic) Christian crosses found along the road in many parts of the world."
-  },
-  "title": {
-    "render": {
-      "en": "Wayside Cross {name}"
-    }
-  },
-  "presets": [
-    {
-      "title": {
-        "en": "a wayside cross"
-      },
-      "tags": [
-        "historic=wayside_cross",
-        "religion=christian"
-      ],
-      "description": {
-        "en": "A wayside cross is a christian cross that is placed by a road or pathway."
-      },
-      "exampleImages": [
-        "./assets/layers/wayside_cross/wayside_cross_example1.jpg",
-        "./assets/layers/wayside_cross/wayside_cross_example2.jpg",
-        "./assets/layers/wayside_cross/wayside_cross_example3.jpg"
-      ]
-    },
-    {
-      "title": {
-        "en": "a wayside cross mounted on a wall"
-      },
-      "tags": [
-        "religion=christian",
-        "historic=wayside_cross"
-      ],
-      "snapToLayer": [
-        "walls_and_buildings"
-      ],
-      "description": {
-        "en": "A wayside cross is a christian cross that is placed by a road or pathway. This cross is mounted on a wall"
-      }
-    }
-  ]
-}
diff --git a/assets/layers/wayside_shrine/license_info.json b/assets/layers/wayside_shrine/license_info.json
index 5ed910b3e..fbb4904af 100644
--- a/assets/layers/wayside_shrine/license_info.json
+++ b/assets/layers/wayside_shrine/license_info.json
@@ -48,5 +48,45 @@
     "sources": [
       "https://source.mapcomplete.org/MapComplete/MapComplete/pulls/2349/files#diff-a27dbd36795c9186dfd9f614f3a7f06709b64d2c"
     ]
+  },
+  {
+    "path": "wayside_cross_example1.jpg",
+    "license": "CC-BY-SA-4.0",
+    "authors": [
+      "Przykuta"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Gor%C4%99dy_krzy%C5%BCe_13.07.2009_p.jpg"
+    ]
+  },
+  {
+    "path": wayside_cross.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Geozeisig"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Christian-16.svg"
+    ]
+  },
+  {
+    "path": "wayside_cross_example2.jpg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Markus B"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Wegkreuz.jpg"
+    ]
+  },
+  {
+    "path": "wayside_cross_example3.jpg",
+    "license": "CC-BY-SA 3.0",
+    "authors": [
+      "HeinzLW"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Schaederkreuz.jpg"
+    ]
   }
-]
\ No newline at end of file
+]
diff --git a/assets/layers/wayside_cross/wayside_cross.svg b/assets/layers/wayside_shrine/wayside_cross.svg
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross.svg
rename to assets/layers/wayside_shrine/wayside_cross.svg
diff --git a/assets/layers/wayside_cross/wayside_cross.svg.license b/assets/layers/wayside_shrine/wayside_cross.svg.license
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross.svg.license
rename to assets/layers/wayside_shrine/wayside_cross.svg.license
diff --git a/assets/layers/wayside_cross/wayside_cross_example1.jpg b/assets/layers/wayside_shrine/wayside_cross_example1.jpg
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross_example1.jpg
rename to assets/layers/wayside_shrine/wayside_cross_example1.jpg
diff --git a/assets/layers/wayside_cross/wayside_cross_example1.jpg.license b/assets/layers/wayside_shrine/wayside_cross_example1.jpg.license
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross_example1.jpg.license
rename to assets/layers/wayside_shrine/wayside_cross_example1.jpg.license
diff --git a/assets/layers/wayside_cross/wayside_cross_example2.jpg b/assets/layers/wayside_shrine/wayside_cross_example2.jpg
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross_example2.jpg
rename to assets/layers/wayside_shrine/wayside_cross_example2.jpg
diff --git a/assets/layers/wayside_cross/wayside_cross_example2.jpg.license b/assets/layers/wayside_shrine/wayside_cross_example2.jpg.license
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross_example2.jpg.license
rename to assets/layers/wayside_shrine/wayside_cross_example2.jpg.license
diff --git a/assets/layers/wayside_cross/wayside_cross_example3.jpg b/assets/layers/wayside_shrine/wayside_cross_example3.jpg
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross_example3.jpg
rename to assets/layers/wayside_shrine/wayside_cross_example3.jpg
diff --git a/assets/layers/wayside_cross/wayside_cross_example3.jpg.license b/assets/layers/wayside_shrine/wayside_cross_example3.jpg.license
similarity index 100%
rename from assets/layers/wayside_cross/wayside_cross_example3.jpg.license
rename to assets/layers/wayside_shrine/wayside_cross_example3.jpg.license
diff --git a/assets/themes/wayside_shrines/wayside_shrines.json b/assets/themes/wayside_shrines/wayside_shrines.json
index efccbaeb9..79fbd72db 100644
--- a/assets/themes/wayside_shrines/wayside_shrines.json
+++ b/assets/themes/wayside_shrines/wayside_shrines.json
@@ -8,8 +8,7 @@
   },
   "icon": "./assets/layers/wayside_shrine/shrine.svg",
   "layers": [
-    "wayside_shrine",
-    "wayside_cross",
+    "wayside_shrine"
     {
       "builtin": [
         "artwork"