diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json
index 73d19f753..b4d99a755 100644
--- a/assets/layers/address/address.json
+++ b/assets/layers/address/address.json
@@ -120,8 +120,14 @@
   ],
   "mapRendering": [
     {
+      "label": {
+        "render": "<div style='margin-top: -42px; color: white' class='rounded-full p-1 font-bold relative'>{addr:housenumber}</div>",
+        "condition": "addr:housenumber~*"
+      },
+      "iconSize": "50,50,center",
       "icon": {
-        "render": "./assets/themes/uk_addresses/housenumber_ok.svg",
+        "render": "./assets/layers/address/housenumber_blank.svg",
+
         "mappings": [
           {
             "if": {
@@ -139,11 +145,8 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "40,40,center"
-      },
       "location": [
-        "point"
+        "point","centroid"
       ]
     },
     {
diff --git a/assets/layers/address/housenumber_blank.svg b/assets/layers/address/housenumber_blank.svg
new file mode 100644
index 000000000..3cc6a0b2e
--- /dev/null
+++ b/assets/layers/address/housenumber_blank.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 171.5778 87.883003"
+   id="svg12"
+   sodipodi:docname="housenumber_text.svg"
+   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+   width="171.5778"
+   height="87.883003"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="2.2561926"
+     inkscape:cx="-16.620922"
+     inkscape:cy="-20.166718"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12"
+     inkscape:pagecheckerboard="0" />
+  <path
+     d="m 14.044,0 h 143.48981 c 7.7801,0 14.044,6.2634 14.044,14.044 v 59.795 c 0,7.7801 -6.2634,14.044 -14.044,14.044 H 14.044 C 6.2639,87.883 0,81.6196 0,73.839 V 14.044 C 0,6.2639 6.2634,0 14.044,0 Z"
+     style="fill:#495aad;paint-order:normal"
+     id="path6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     d="m 8.747,22.773 v 42.233 c 7.0389,0 14.078,7.0389 14.078,14.078 h 125.81781 c 0,-7.0389 7.0389,-14.078 14.078,-14.078 V 22.773 c -7.0389,0 -14.078,-7.0389 -14.078,-14.078 H 22.825 c 0,7.0389 -7.0389,14.078 -14.078,14.078 z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#ffffff;stroke-width:5.0152"
+     sodipodi:nodetypes="ccccccccc" />
+</svg>
diff --git a/assets/layers/crab_address/crab_address.json b/assets/layers/crab_address/crab_address.json
index c7ec3b1f2..07dd7a6cb 100644
--- a/assets/layers/crab_address/crab_address.json
+++ b/assets/layers/crab_address/crab_address.json
@@ -15,9 +15,10 @@
         "point",
         "centroid"
       ],
-      "iconSize": "15,15,center",
+      "iconSize": "50,50,center",
+      "icon": "./assets/layers/crab_address/housenumber_blank.svg",
       "label": {
-        "render": "<div style='background:#faa' class='rounded-full'>{HNRLABEL}</div>"
+        "render": "<div style='margin-top: -42px; color: white' class='rounded-full p-1 font-bold relative'>{HNRLABEL}</div>"
       }
     }
   ],
@@ -27,7 +28,6 @@
       "render": {
         "nl": "Volgens het CRAB ligt hier <b>{STRAATNM}</b> {HUISNR} (label: {HNRLABEL})"
       }
-    },
-    "all_tags"
+    }
   ]
 }
\ No newline at end of file