diff --git a/assets/layers/guidepost/guidepost.json b/assets/layers/guidepost/guidepost.json
index 6fd27bcc4..daa687c5d 100644
--- a/assets/layers/guidepost/guidepost.json
+++ b/assets/layers/guidepost/guidepost.json
@@ -48,6 +48,50 @@
     }
   ],
   "tagRenderings": [
-    "images"
+    "images",
+    {
+      "id": "type",
+      "question": {
+        "en": "What kind of routes are shown on this guidepost?"
+      },
+      "multiAnswer": true,
+      "mappings": [
+        {
+          "if": "bicycle=yes",
+          "ifnot": "bicycle=",
+          "then": {
+            "en": "This guidepost shows bicycle routes"
+          }
+        },
+        {
+          "if": "hiking=yes",
+          "ifnot": "hiking=",
+          "then": {
+            "en": "This guidepost shows hiking routes"
+          }
+        },
+        {
+          "if": "mtb=yes",
+          "ifnot": "mtb=",
+          "then": {
+            "en": "This guidepost shows mountain bike routes"
+          }
+        },
+        {
+          "if": "horse=yes",
+          "ifnot": "horse=",
+          "then": {
+            "en": "This guidepost shows horse riding routes"
+          }
+        },
+        {
+          "if": "ski=yes",
+          "ifnot": "ski=",
+          "then": {
+            "en": "This guidepost shows ski routes"
+          }
+        }
+      ]
+    }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/route_marker/bicycle_route_marker.jpg b/assets/layers/route_marker/bicycle_route_marker.jpg
new file mode 100644
index 000000000..6a576df9f
Binary files /dev/null and b/assets/layers/route_marker/bicycle_route_marker.jpg differ
diff --git a/assets/layers/route_marker/bicycle_route_marker.jpg.license b/assets/layers/route_marker/bicycle_route_marker.jpg.license
new file mode 100644
index 000000000..28cb665ca
--- /dev/null
+++ b/assets/layers/route_marker/bicycle_route_marker.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Segubi
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/route_marker/license_info.json b/assets/layers/route_marker/license_info.json
index e8f5acb07..0786ccda3 100644
--- a/assets/layers/route_marker/license_info.json
+++ b/assets/layers/route_marker/license_info.json
@@ -1,4 +1,14 @@
 [
+  {
+    "path": "bicycle_route_marker.jpg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Segubi"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Route_marker_Germany_Zwischenwegweiser_Radverkehrsnetz_NRW.jpg"
+    ]
+  },
   {
     "path": "route_marker.svg",
     "license": "CC0-1.0",
@@ -6,5 +16,13 @@
       "Robin van der Linde"
     ],
     "sources": []
+  },
+  {
+    "path": "walking_route_marker.jpg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
   }
 ]
\ No newline at end of file
diff --git a/assets/layers/route_marker/route_marker.json b/assets/layers/route_marker/route_marker.json
index b30833a93..39e495195 100644
--- a/assets/layers/route_marker/route_marker.json
+++ b/assets/layers/route_marker/route_marker.json
@@ -21,7 +21,11 @@
       ],
       "description": {
         "en": "A route marker is a small marker often found along official hiking/cycling/riding/skiing routes to indicate the direction of the route."
-      }
+      },
+      "exampleImages": [
+        "./assets/layers/route_marker/bicycle_route_marker.jpg",
+        "./assets/layers/route_marker/walking_route_marker.jpg"
+      ]
     }
   ],
   "deletion": true,
@@ -54,35 +58,35 @@
       "mappings": [
         {
           "if": "bicycle=yes",
-          "ifnot": "biycle=no",
+          "ifnot": "biycle=",
           "then": {
             "en": "This is a route marker for a bicycle route."
           }
         },
         {
           "if": "hiking=yes",
-          "ifnot": "hiking=no",
+          "ifnot": "hiking=",
           "then": {
             "en": "This is a route marker for a hiking route."
           }
         },
         {
           "if": "mtb=yes",
-          "ifnot": "mtb=no",
+          "ifnot": "mtb=",
           "then": {
             "en": "This is a route marker for a mountain bike route."
           }
         },
         {
           "if": "horse=yes",
-          "ifnot": "horse=no",
+          "ifnot": "horse=",
           "then": {
             "en": "This is a route marker for a horse riding route."
           }
         },
         {
           "if": "ski=yes",
-          "ifnot": "ski=no",
+          "ifnot": "ski=",
           "then": {
             "en": "This is a route marker for a ski route."
           }
diff --git a/assets/layers/route_marker/walking_route_marker.jpg b/assets/layers/route_marker/walking_route_marker.jpg
new file mode 100644
index 000000000..b26325314
Binary files /dev/null and b/assets/layers/route_marker/walking_route_marker.jpg differ
diff --git a/assets/layers/route_marker/walking_route_marker.jpg.license b/assets/layers/route_marker/walking_route_marker.jpg.license
new file mode 100644
index 000000000..75299f884
--- /dev/null
+++ b/assets/layers/route_marker/walking_route_marker.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Robin van der Linde
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json
index 5d208d1c7..846938918 100644
--- a/assets/themes/cyclenodes/cyclenodes.json
+++ b/assets/themes/cyclenodes/cyclenodes.json
@@ -269,8 +269,36 @@
         "guidepost"
       ],
       "override": {
-        "minzoom": 16
-      }
+        "minzoom": 16,
+        "source": {
+          "osmTags": {
+            "and": [
+              "information=guidepost",
+              "bicycle=yes"
+            ]
+          }
+        },
+        "presets": [
+          {
+            "tags": [
+              "tourism=information",
+              "information=guidepost",
+              "bicycle=yes"
+            ]
+          }
+        ],
+        "name": {
+          "en": "Cycling guideposts"
+        },
+        "title": {
+          "render": {
+            "en": "Cycling guidepost"
+          }
+        }
+      },
+      "hideTagRenderingsWithLabels": [
+        "type"
+      ]
     },
     {
       "builtin": "route_marker",
@@ -291,7 +319,10 @@
             ],
             "title": {
               "en": "a route marker for a node to node link"
-            }
+            },
+            "=exampleImages": [
+              "./assets/layers/route_marker/bicycle_route_marker.jpg"
+            ]
           }
         ]
       }
diff --git a/assets/themes/walkingnodes/walkingnodes.json b/assets/themes/walkingnodes/walkingnodes.json
index b433bc3fa..b6df0d224 100644
--- a/assets/themes/walkingnodes/walkingnodes.json
+++ b/assets/themes/walkingnodes/walkingnodes.json
@@ -51,10 +51,10 @@
           {
             "if": "ref~*",
             "then": {
-              "en": "node to node link <strong>{ref}</strong>",
+              "en": "Node to node link <strong>{ref}</strong>",
               "de": "Knotenpunktverbindung <strong>{ref}</strong>",
               "es": "enlace nodo a nodo <strong>{ref}</strong>",
-              "nl": "node-naar-node verbinding <strong>{ref}</strong>",
+              "nl": "Node-naar-node verbinding <strong>{ref}</strong>",
               "fr": "lien noeud à noeud <strong>{ref}</strong>",
               "ca": "Enllaç node a node <strong>{ref}</strong>",
               "cs": "propojení mezi uzly <strong>{ref}</strong>",
@@ -223,8 +223,36 @@
         "guidepost"
       ],
       "override": {
-        "minzoom": 16
-      }
+        "minzoom": 16,
+        "source": {
+          "osmTags": {
+            "and": [
+              "information=guidepost",
+              "hiking=yes"
+            ]
+          }
+        },
+        "presets": [
+          {
+            "tags": [
+              "tourism=information",
+              "information=guidepost",
+              "hiking=yes"
+            ]
+          }
+        ],
+        "name": {
+          "en": "Hiking guideposts"
+        },
+        "title": {
+          "render": {
+            "en": "Hiking guidepost"
+          }
+        }
+      },
+      "hideTagRenderingsWithLabels": [
+        "type"
+      ]
     },
     {
       "builtin": "route_marker",
@@ -245,7 +273,10 @@
             ],
             "title": {
               "en": "a route marker for a node to node link"
-            }
+            },
+            "=exampleImages": [
+              "./assets/layers/route_marker/walking_route_marker.jpg"
+            ]
           }
         ]
       }