diff --git a/assets/layers/street_lamps/bent_pole_1.svg b/assets/layers/street_lamps/bent_pole_1.svg
new file mode 100644
index 0000000000..ed33e232bf
--- /dev/null
+++ b/assets/layers/street_lamps/bent_pole_1.svg
@@ -0,0 +1,100 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   viewBox="0 0 105.83333 105.83334"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="bent-pole-1.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="91.636778"
+     inkscape:cy="228.62622"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g869"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g864"
+       transform="translate(-9.1324516,-2.7737965)">
+      <g
+         id="g869">
+        <g
+           id="g1550"
+           transform="matrix(1.75,0,0,1.75,-46.536839,-41.767847)">
+          <g
+             id="g1544">
+            <path
+               style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="M 50.142868,82.148796 V 39.815463 C 50.424145,33.62186 52.916667,31.75 59.53125,30.427083 L 76.729167,27.78125"
+               id="path837"
+               sodipodi:nodetypes="cccc" />
+          </g>
+          <path
+             style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             id="path857"
+             sodipodi:type="arc"
+             sodipodi:cx="66.672424"
+             sodipodi:cy="41.538971"
+             sodipodi:rx="4.6302085"
+             sodipodi:ry="2.9244671"
+             sodipodi:start="0"
+             sodipodi:end="3.1415927"
+             sodipodi:open="true"
+             sodipodi:arc-type="chord"
+             d="m 71.302633,41.538971 a 4.6302085,2.9244671 0 0 1 -2.315104,2.532663 4.6302085,2.9244671 0 0 1 -4.630209,0 4.6302085,2.9244671 0 0 1 -2.315104,-2.532663 z"
+             transform="rotate(-9)" />
+          <rect
+             style="fill:#000000;stroke:#000000;stroke-width:0.866025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect859"
+             width="7.9375"
+             height="3.9687498"
+             x="46.302082"
+             y="80.697914" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/street_lamps/bent_pole_2.svg b/assets/layers/street_lamps/bent_pole_2.svg
new file mode 100644
index 0000000000..f41cdeaf9b
--- /dev/null
+++ b/assets/layers/street_lamps/bent_pole_2.svg
@@ -0,0 +1,138 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   viewBox="0 0 105.83333 105.83334"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="bent-pole-2.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="141.74396"
+     inkscape:cy="178.45475"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g969"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g864"
+       transform="translate(-9.1324516,-2.7737965)">
+      <g
+         id="g969"
+         transform="translate(11.842268)">
+        <g
+           id="g1568"
+           transform="matrix(1.75,0,0,1.75,-37.655138,-41.767847)">
+          <g
+             id="g908">
+            <g
+               id="g1555">
+              <path
+                 style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 d="M 50.20685,82.148797 50.142868,39.815463 C 50.424145,33.62186 52.916667,31.75 59.53125,30.427083 L 76.729167,27.78125"
+                 id="path837"
+                 sodipodi:nodetypes="cccc" />
+              <path
+                 style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                 id="path857"
+                 sodipodi:type="arc"
+                 sodipodi:cx="66.672424"
+                 sodipodi:cy="41.538971"
+                 sodipodi:rx="4.6302085"
+                 sodipodi:ry="2.9244671"
+                 sodipodi:start="0"
+                 sodipodi:end="3.1415927"
+                 sodipodi:open="true"
+                 sodipodi:arc-type="chord"
+                 transform="rotate(-9)"
+                 d="m 71.302633,41.538971 a 4.6302085,2.9244671 0 0 1 -2.315104,2.532663 4.6302085,2.9244671 0 0 1 -4.630209,0 4.6302085,2.9244671 0 0 1 -2.315104,-2.532663 z" />
+              <rect
+                 style="fill:#000000;stroke:#000000;stroke-width:0.866025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                 id="rect859"
+                 width="7.9375"
+                 height="3.9687498"
+                 x="46.302082"
+                 y="80.697914" />
+            </g>
+          </g>
+          <g
+             id="g957"
+             transform="translate(11.641669,6.6145832)">
+            <g
+               id="g908-0"
+               transform="translate(-94.985418,38.364583)">
+              <g
+                 id="g947"
+                 transform="matrix(-1,0,0,1,183.75745,-44.851203)">
+                <g
+                   id="g942">
+                  <path
+                     style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="M 50.270833,39.6875 C 50.55211,33.493897 52.916667,31.75 59.53125,30.427083 L 76.729167,27.78125"
+                     id="path837-4"
+                     sodipodi:nodetypes="ccc" />
+                  <path
+                     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="path857-5"
+                     sodipodi:type="arc"
+                     sodipodi:cx="66.672424"
+                     sodipodi:cy="41.538971"
+                     sodipodi:rx="4.6302085"
+                     sodipodi:ry="2.9244671"
+                     sodipodi:start="0"
+                     sodipodi:end="3.1415927"
+                     sodipodi:open="true"
+                     sodipodi:arc-type="chord"
+                     transform="rotate(-9)"
+                     d="m 71.302633,41.538971 a 4.6302085,2.9244671 0 0 1 -2.315104,2.532663 4.6302085,2.9244671 0 0 1 -4.630209,0 4.6302085,2.9244671 0 0 1 -2.315104,-2.532663 z" />
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/street_lamps/license_info.json b/assets/layers/street_lamps/license_info.json
index d157db54d7..34ca9cd83a 100644
--- a/assets/layers/street_lamps/license_info.json
+++ b/assets/layers/street_lamps/license_info.json
@@ -1,4 +1,28 @@
 [
+  {
+    "path": "bent_pole_1.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
+  {
+    "path": "bent_pole_2.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
+  {
+    "path": "straight_pole.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
   {
     "path": "street_lamp.svg",
     "license": "CC0",
diff --git a/assets/layers/street_lamps/straight_pole.svg b/assets/layers/street_lamps/straight_pole.svg
new file mode 100644
index 0000000000..c59f755d6c
--- /dev/null
+++ b/assets/layers/street_lamps/straight_pole.svg
@@ -0,0 +1,160 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100mm"
+   height="100mm"
+   viewBox="0 0 99.999987 99.999992"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="straight_pole.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4340417"
+     inkscape:cx="-22.578158"
+     inkscape:cy="290.51848"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g888"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="mm"
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g864"
+       transform="translate(-9.1324516,-2.7737965)">
+      <g
+         id="g869">
+        <g
+           id="g1550"
+           transform="matrix(1.75,0,0,1.75,-46.536839,-41.767847)">
+          <g
+             id="g1605"
+             transform="matrix(1.35,0,0,1.35,-21.342788,-16.055652)">
+            <g
+               id="g888"
+               transform="matrix(1.25,0,0,1.25,-15.134304,-18.038165)">
+              <g
+                 id="g905">
+                <g
+                   id="g871"
+                   transform="translate(-0.08664166)">
+                  <path
+                     style="fill:none;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="M 60.651853,71.512113 V 45.305764"
+                     id="path1416"
+                     sodipodi:nodetypes="cc" />
+                  <rect
+                     style="fill:#000000;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="rect1421"
+                     width="4.5357146"
+                     height="2.2678573"
+                     x="58.355999"
+                     y="69.272255" />
+                </g>
+                <g
+                   id="g1446" />
+                <g
+                   id="g867"
+                   transform="translate(-3.5449738e-7,8.1221356)">
+                  <path
+                     style="fill:#ffff00;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="path1426"
+                     sodipodi:type="arc"
+                     sodipodi:cx="60.537212"
+                     sodipodi:cy="34.523796"
+                     sodipodi:rx="3.779762"
+                     sodipodi:ry="2.2678573"
+                     sodipodi:start="0"
+                     sodipodi:end="3.1415927"
+                     sodipodi:open="true"
+                     sodipodi:arc-type="chord"
+                     d="m 64.316974,34.523796 a 3.779762,2.2678573 0 0 1 -1.889881,1.964022 3.779762,2.2678573 0 0 1 -3.779762,0 3.779762,2.2678573 0 0 1 -1.889881,-1.964022 z" />
+                  <rect
+                     style="fill:none;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="rect1428"
+                     width="7.5595241"
+                     height="0.75595242"
+                     x="56.757454"
+                     y="32.255939" />
+                  <g
+                     id="g1585">
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 57.211024,37.547605 -1.511905,1.965477"
+                       id="path1456"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 55.85031,36.489273 -2.419048,1.209523"
+                       id="path1460"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 58.874119,38.303558 -0.604762,2.267857"
+                       id="path1462"
+                       sodipodi:nodetypes="cc" />
+                  </g>
+                  <g
+                     id="g1590">
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 63.863406,37.547605 1.511905,1.965477"
+                       id="path1456-5"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 65.22412,36.489273 2.419048,1.209523"
+                       id="path1460-2"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 62.200311,38.303558 0.604762,2.267857"
+                       id="path1462-5"
+                       sodipodi:nodetypes="cc" />
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json
index 26b093261f..32383d616c 100644
--- a/assets/layers/street_lamps/street_lamps.json
+++ b/assets/layers/street_lamps/street_lamps.json
@@ -23,7 +23,29 @@
             }
         ]
     },
-    "icon": "./assets/layers/street_lamps/street_lamp.svg",
+    "icon": {
+        "render": "./assets/layers/street_lamps/straight_pole.svg",
+        "mappings": [
+            {
+                "if": {
+                    "and": [
+                        "lamp_mount=bent_mast",
+                        "light:count=1"
+                    ]
+                },
+                "then": "./assets/layers/street_lamps/bent_pole_1.svg"
+            },
+            {
+                "if": {
+                    "and": [
+                        "lamp_mount=bent_mast",
+                        "light:count=2"
+                    ]
+                },
+                "then": "./assets/layers/street_lamps/bent_pole_2.svg"
+            }
+        ]
+    },
     "iconOverlays": [
         {
             "if": "light:colour=white",