diff --git a/assets/layers/wayside_cross/wayside_cross.json b/assets/layers/wayside_cross/wayside_cross.json
new file mode 100644
index 0000000000..d5b292460f
--- /dev/null
+++ b/assets/layers/wayside_cross/wayside_cross.json
@@ -0,0 +1,182 @@
+{
+  "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_cross/wayside_cross.svg b/assets/layers/wayside_cross/wayside_cross.svg
new file mode 100644
index 0000000000..78c7341d98
--- /dev/null
+++ b/assets/layers/wayside_cross/wayside_cross.svg
@@ -0,0 +1,25 @@
+<?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"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2">
+   <metadata id="metadata8">
+    <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/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 7,0 C 5.999999,0 6.000001,1 6.000001,1 L 6,4 2,4 l 0,2 4,0 1e-6,8 2.000001,0 -1e-6,-8 4,0 0,-2 -4,0 0,-3 c 0,0 0,-1 -1.000001,-1 z" id="christian" style="fill:#000000;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+</svg>
diff --git a/assets/layers/wayside_cross/wayside_cross.svg.license b/assets/layers/wayside_cross/wayside_cross.svg.license
new file mode 100644
index 0000000000..3a52805b4d
--- /dev/null
+++ b/assets/layers/wayside_cross/wayside_cross.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Geozeisig 
+SPDX-License-Identifier: CC0-1.0
diff --git a/assets/layers/wayside_cross/wayside_cross_example1.jpg b/assets/layers/wayside_cross/wayside_cross_example1.jpg
new file mode 100644
index 0000000000..c7ebdd5222
Binary files /dev/null and b/assets/layers/wayside_cross/wayside_cross_example1.jpg differ
diff --git a/assets/layers/wayside_cross/wayside_cross_example1.jpg.license b/assets/layers/wayside_cross/wayside_cross_example1.jpg.license
new file mode 100644
index 0000000000..41e72fb43e
--- /dev/null
+++ b/assets/layers/wayside_cross/wayside_cross_example1.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Przykuta
+SPDX-License-Identifier: CC-BY-SA-4.0
diff --git a/assets/layers/wayside_cross/wayside_cross_example2.jpg b/assets/layers/wayside_cross/wayside_cross_example2.jpg
new file mode 100644
index 0000000000..959fc66158
Binary files /dev/null and b/assets/layers/wayside_cross/wayside_cross_example2.jpg differ
diff --git a/assets/layers/wayside_cross/wayside_cross_example2.jpg.license b/assets/layers/wayside_cross/wayside_cross_example2.jpg.license
new file mode 100644
index 0000000000..8d09c5bce2
--- /dev/null
+++ b/assets/layers/wayside_cross/wayside_cross_example2.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Markus B
+SPDX-License-Identifier: CC0-1.0
diff --git a/assets/layers/wayside_cross/wayside_cross_example3.jpg b/assets/layers/wayside_cross/wayside_cross_example3.jpg
new file mode 100644
index 0000000000..c0c76d94c2
Binary files /dev/null and b/assets/layers/wayside_cross/wayside_cross_example3.jpg differ
diff --git a/assets/layers/wayside_cross/wayside_cross_example3.jpg.license b/assets/layers/wayside_cross/wayside_cross_example3.jpg.license
new file mode 100644
index 0000000000..3fcb3b74ab
--- /dev/null
+++ b/assets/layers/wayside_cross/wayside_cross_example3.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: HeinzLW
+SPDX-License-Identifier: CC-BY-SA-3.0
diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json
index 4bbbcc29ff..a7b9a94ad3 100644
--- a/assets/layers/wayside_shrine/wayside_shrine.json
+++ b/assets/layers/wayside_shrine/wayside_shrine.json
@@ -180,7 +180,7 @@
           }
         }
       ],
-      "multiAnswer": false,
+      "multiAnswer": true,
       "freeform": {
         "key": "religion",
         "type": "string"
@@ -267,6 +267,7 @@
       "render": {
         "en": "The religious denomination is <b>{denomination}</b>"
       },
+      "multiAnswer": true,
       "freeform": {
         "key": "denomination"
       }
@@ -296,6 +297,7 @@
       "labels": [
         "shrine_questions"
       ],
+      "multiAnswer": true,
       "freeform": {
         "key": "denomination"
       },
@@ -342,6 +344,7 @@
       "labels": [
         "shrine_questions"
       ],
+      "multiAnswer": true,
       "freeform": {
         "key": "denomination"
       },
diff --git a/assets/themes/wayside_shrines/wayside_shrines.json b/assets/themes/wayside_shrines/wayside_shrines.json
index 6894fd1ed8..efccbaeb94 100644
--- a/assets/themes/wayside_shrines/wayside_shrines.json
+++ b/assets/themes/wayside_shrines/wayside_shrines.json
@@ -4,11 +4,12 @@
     "en": "Wayside shrines"
   },
   "description": {
-    "en": "This map shows shrines found on the side of roads and paths, and allows adding new ones"
+    "en": "This map shows shrines and crosses found on the side of roads and paths, and allows adding new ones"
   },
   "icon": "./assets/layers/wayside_shrine/shrine.svg",
   "layers": [
     "wayside_shrine",
+    "wayside_cross",
     {
       "builtin": [
         "artwork"