diff --git a/assets/layers/postboxes/postbox_wall.svg b/assets/layers/postboxes/postbox_wall.svg
new file mode 100644
index 000000000..5cf19e6df
--- /dev/null
+++ b/assets/layers/postboxes/postbox_wall.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="214.0625"
+   height="250"
+   viewBox="0 0 214.0625 250"
+   version="1.1"
+   id="svg20"
+   sodipodi:docname="postbox_wall.svg"
+   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.5626667"
+     inkscape:cx="106.8686"
+     inkscape:cy="168.62201"
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg20" />
+  <defs
+     id="defs2">
+    <filter
+       id="alpha"
+       filterUnits="objectBoundingBox"
+       x="0"
+       y="0"
+       width="1"
+       height="1">
+      <feColorMatrix
+         type="matrix"
+         in="SourceGraphic"
+         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
+         id="feColorMatrix1" />
+    </filter>
+    <mask
+       id="mask0">
+      <g
+         filter="url(#alpha)"
+         id="g1">
+        <rect
+           x="0"
+           y="0"
+           width="375"
+           height="375"
+           style="fill:#000000;fill-opacity:0.15;stroke:none"
+           id="rect1" />
+      </g>
+    </mask>
+    <clipPath
+       id="clip1">
+      <rect
+         x="0"
+         y="0"
+         width="375"
+         height="375"
+         id="rect2" />
+    </clipPath>
+    <g
+       id="surface5"
+       clip-path="url(#clip1)">
+      <path
+         style="fill:#453f3a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 283.59375,346.875 c 0,6.90234 -43.02344,12.5 -96.09375,12.5 -53.07031,0 -96.09375,-5.59766 -96.09375,-12.5 0,-6.90234 43.02344,-12.5 96.09375,-12.5 53.07031,0 96.09375,5.59766 96.09375,12.5 z m 0,0"
+         id="path2" />
+    </g>
+  </defs>
+  <path
+     style="fill:#ff613f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 185.15625,246.09375 h -156.25 c -14.0625,0 -25,-10.9375 -25,-25 V 28.90625 c 0,-14.0625 10.9375,-25 25,-25 h 156.25 c 14.0625,0 25,10.9375 25,25 v 192.1875 c 0,14.0625 -10.9375,25 -25,25 z m 0,0"
+     id="path3" />
+  <path
+     style="fill:#ff856e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 185.15625,3.90625 h -156.25 c -14.0625,0 -25,10.9375 -25,25 V 48.4375 c 0,-14.0625 10.9375,-25 25,-25 h 156.25 c 14.0625,0 25,10.9375 25,25 V 28.90625 c 0,-14.0625 -10.9375,-25 -25,-25 z m 0,0"
+     id="path4" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="m 185.15625,246.09375 h -156.25 c -14.0625,0 -25,-10.9375 -25,-25 V 28.90625 c 0,-14.0625 10.9375,-25 25,-25 h 156.25 c 14.0625,0 25,10.9375 25,25 v 192.1875 c 0,14.0625 -10.9375,25 -25,25 z m 0,0"
+     id="path5" />
+  <path
+     style="fill:#636668;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="M 173.4375,94.53125 H 40.625 c -4.6875,0 -8.59375,-3.90625 -8.59375,-8.59375 V 75.78125 c 0,-4.6875 3.90625,-8.59375 8.59375,-8.59375 h 132.8125 c 4.6875,0 8.59375,3.90625 8.59375,8.59375 V 85.9375 c 0,5.46875 -3.90625,8.59375 -8.59375,8.59375 z m 0,0"
+     id="path9" />
+  <path
+     style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="M 173.4375,67.96875 H 40.625 c -4.6875,0 -8.59375,3.90625 -8.59375,8.59375 v 10.15625 c 0,-4.6875 3.90625,-8.59375 8.59375,-8.59375 h 132.8125 c 4.6875,0 8.59375,3.90625 8.59375,8.59375 V 76.5625 c 0,-5.46875 -3.90625,-8.59375 -8.59375,-8.59375 z m 0,0"
+     id="path10" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="M 173.4375,94.53125 H 40.625 c -4.6875,0 -8.59375,-3.90625 -8.59375,-8.59375 V 75.78125 c 0,-4.6875 3.90625,-8.59375 8.59375,-8.59375 h 132.8125 c 4.6875,0 8.59375,3.90625 8.59375,8.59375 V 85.9375 c 0,5.46875 -3.90625,8.59375 -8.59375,8.59375 z m 0,0"
+     id="path11" />
+  <path
+     style="fill:#de3f21;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="M 184.375,32.8125 H 29.6875 c -4.6875,0 -8.59375,3.90625 -8.59375,8.59375 C 21.09375,46.09375 25,50 29.6875,50 H 184.375 c 4.6875,0 8.59375,-3.90625 8.59375,-8.59375 0,-4.6875 -3.90625,-8.59375 -8.59375,-8.59375 z m 0,0"
+     id="path12" />
+  <path
+     style="fill:#ff613f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="M 29.6875,41.40625 H 184.375 c 3.125,0 6.25,1.5625 7.8125,4.6875 0.78125,-1.5625 0.78125,-3.125 0.78125,-4.6875 0,-4.6875 -3.90625,-8.59375 -8.59375,-8.59375 H 29.6875 c -4.6875,0 -8.59375,3.90625 -8.59375,8.59375 0,1.5625 0.78125,3.125 0.78125,4.6875 1.5625,-3.125 4.6875,-4.6875 7.8125,-4.6875 z m 0,0"
+     id="path13" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="M 184.375,32.8125 H 29.6875 c -4.6875,0 -8.59375,3.90625 -8.59375,8.59375 C 21.09375,46.09375 25,50 29.6875,50 H 184.375 c 4.6875,0 8.59375,-3.90625 8.59375,-8.59375 0,-4.6875 -3.90625,-8.59375 -8.59375,-8.59375 z m 0,0"
+     id="path14" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 182.03125,146.875 h -76.5625 c -3.125,0 -6.25,-1.5625 -7.8125,-4.6875 L 64.0625,67.96875 h 88.28125 l 32.8125,72.65625 c 1.5625,3.125 -0.78125,6.25 -3.125,6.25 z m 0,0"
+     id="path15" />
+  <path
+     style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 160.9375,85.15625 -8.59375,-17.1875 H 64.0625 l 8.59375,17.1875 z m 0,0"
+     id="path16" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="m 182.03125,146.875 h -76.5625 c -3.125,0 -6.25,-1.5625 -7.8125,-4.6875 L 64.0625,67.96875 h 88.28125 l 32.8125,72.65625 c 1.5625,3.125 -0.78125,6.25 -3.125,6.25 z m 0,0"
+     id="path17" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="m 185.15625,144.53125 -58.59375,-48.4375 6.25,-28.125"
+     id="path18" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="m 135.15625,103.90625 -34.375,41.40625"
+     id="path19" />
+  <path
+     style="fill:none;stroke:#453f3a;stroke-width:7.8125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+     d="M 128.125,88.28125 87.5,67.96875"
+     id="path20" />
+</svg>
diff --git a/assets/layers/postboxes/postbox_wall.svg.license b/assets/layers/postboxes/postbox_wall.svg.license
new file mode 100644
index 000000000..f33e45616
--- /dev/null
+++ b/assets/layers/postboxes/postbox_wall.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Vincent Le Moign; https://twitter.com/webalys
+SPDX-License-Identifier: CC-BY-4.0
\ No newline at end of file
diff --git a/assets/layers/postboxes/postboxes.json b/assets/layers/postboxes/postboxes.json
index e3fbab4d0..6afc2bcce 100644
--- a/assets/layers/postboxes/postboxes.json
+++ b/assets/layers/postboxes/postboxes.json
@@ -48,17 +48,45 @@
       "cs": "Poštovní schránka"
     }
   },
+  "keywords": {
+    "en": ["post","post box","letter","letterbox"],
+    "nl": ["brieven","post","brief","brievenbus","pakjes"]
+  },
   "pointRendering": [
     {
-      "iconSize": "40,40",
+      "iconSize": {
+        "render": "40,40",
+        "mappings": [
+          {
+            "if": "_referencing_ways~*",
+            "then": "25,25"
+          }
+        ]
+      },
       "location": [
         "point",
         "centroid"
       ],
-      "anchor": "bottom",
+      "anchor": {
+        "render": "bottom",
+        "mappings": [
+          {
+            "if": "_referencing_ways~*",
+            "then": "center"
+          }
+        ]
+      },
       "marker": [
         {
-          "icon": "./assets/layers/postboxes/postbox.svg"
+          "icon": {
+            "render": "./assets/layers/postboxes/postbox.svg",
+            "mappings": [
+              {
+                "if": "_referencing_ways~*",
+                "then": "./assets/layers/postboxes/postbox_wall.svg"
+              }
+            ]
+          }
         }
       ]
     }
@@ -87,6 +115,18 @@
         "fr": "une boîte à lettres",
         "cs": "poštovní schránka"
       }
+    },
+    {
+      "tags": [
+        "amenity=post_box"
+      ],
+      "title": {
+        "en": "a postbox on a wall",
+        "nl": "een brievenbus tegen een muur"
+      },
+      "snapToLayer": [
+        "walls_and_buildings"
+      ]
     }
   ],
   "tagRenderings": [
@@ -94,6 +134,18 @@
     {
       "id": "minimap",
       "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
+    },
+    {
+      "id": "operator",
+      "question": {
+        "en": "Who operates this postbox?"
+      },
+      "render": {
+        "en": "This postbox is operated by <b>{operator}</b>"
+      },
+      "freeform": {
+        "key": "operator"
+      }
     }
   ],
   "deletion": {
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index bacdf1ce4..2bd49cac5 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -169,7 +169,7 @@
         "nl": "Is dit een postkantoor?"
       },
       "#condition": "If it is a post office, it'll won't be a post partner...",
-      "condition":   "amenity!=post_office",
+      "condition": "amenity!=post_office",
       "mappings": [
         {
           "if": "post_office=post_partner",