diff --git a/assets/themes/cycle_infra/bicycleway.svg b/assets/themes/cycle_infra/bicycleway.svg
new file mode 100644
index 0000000000..dbbc55590a
--- /dev/null
+++ b/assets/themes/cycle_infra/bicycleway.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 128.02 128.07" xmlns="http://www.w3.org/2000/svg">
+ <path d="m119.44 96.041c-17.673 30.611-56.815 41.099-87.426 23.426-30.611-17.673-41.099-56.815-23.426-87.426 17.673-30.611 56.815-41.099 87.426-23.426 30.611 17.673 41.099 56.815 23.426 87.426" fill="#ca72e2" stroke-width=".2"/>
+ <g stroke-width=".2">
+  <path d="m68.002 128.04c3.3659-0.17764 6.7162-0.69606 10-1.395l47.121-81.461c-1.0366-3.1937-1.7042-5.7055-4.1211-9 0 0-53 92-53 91.856z" fill-opacity=".2"/>
+  <path d="m96.003 8.6514c-10.102-5.8323-21.132-8.5793-32.014-8.5666l-55.412 95.977c5.4299 9.4304 13.324 17.609 23.426 23.441 10.084 5.8218 21.092 8.5693 31.955 8.5666l55.441-96.027c-5.4291-9.4089-13.313-17.569-23.396-23.39z" fill="#999"/>
+  <path d="m119.46 32-55.416 95.983c3.2446-3e-3 6.4749-0.24979 9.6645-0.73946l49.943-86.504c-1.1707-3.0071-2.5725-5.9278-4.1919-8.7395z" fill="#fff"/>
+  <path d="m64.034-1.9691e-6c-3.2446 0.0033555-6.4749 0.24979-9.6645 0.73946l-49.943 86.504c1.1707 3.0071 2.5725 5.9278 4.1919 8.7395z" fill="#fff"/>
+ </g>
+ <path d="m53.154 68.99a10.139 10.139 0 0 1-13.85 3.7111 10.139 10.139 0 0 1-3.7111-13.85 10.139 10.139 0 0 1 13.85-3.7111 10.139 10.139 0 0 1 3.7111 13.85m28.615 16.519a10.139 10.139 0 0 1-13.85 3.7111 10.139 10.139 0 0 1-3.7111-13.85 10.139 10.139 0 0 1 13.85-3.7111 10.139 10.139 0 0 1 3.7111 13.85m-24.705-32.295 3.3174 19.883 12.683 7.3225-0.93937-18.51-15.061-8.6955m16.892 5.5248 3.8679 2.2226m-17.442 12.136 13.574-14.358m-29.428 5.205 17.964-15.856 6.3415 3.6613" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" style="paint-order:normal"/>
+</svg>
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index f6adc7bfa0..c35a4fa15e 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -766,7 +766,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "./assets/svg/bug.svg"
+        "render": "./assets/themes/cycle_infra/bicycleway.svg"
       },
       "width": {
         "render": "8"
@@ -875,7 +875,7 @@
           }
         ]
       },
-      "icon": "./assets/svg/bug.svg",
+      "icon": "./assets/themes/cycle_infra/street.svg",
       "width": "5",
       "color": {
         "render": "#aaaaaa",
diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json
index 9f7263bf57..dca558b1fc 100644
--- a/assets/themes/cycle_infra/license_info.json
+++ b/assets/themes/cycle_infra/license_info.json
@@ -78,5 +78,25 @@
     "sources": [
       "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_squeeze.png"
     ]
+  },
+  {
+    "authors": [
+      "Tobias Zwick"
+    ],
+    "path": "street.svg",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/street.svg"
+    ]
+  },
+  {
+    "authors": [
+      "Tobias Zwick"
+    ],
+    "path": "bicycleway.svg",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/bicycleway.svg"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/street.svg b/assets/themes/cycle_infra/street.svg
new file mode 100644
index 0000000000..796df93b2a
--- /dev/null
+++ b/assets/themes/cycle_infra/street.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 128.02 128.07" xmlns="http://www.w3.org/2000/svg">
+ <path d="m119.44 96.041c-17.673 30.611-56.815 41.099-87.426 23.426-30.611-17.673-41.099-56.815-23.426-87.426 17.673-30.611 56.815-41.099 87.426-23.426 30.611 17.673 41.099 56.815 23.426 87.426" fill="#fd5" stroke-width=".2"/>
+ <g>
+  <path d="m96.003 8.6514c-10.102-5.8323-21.132-8.5793-32.014-8.5666l-55.412 95.977c5.4299 9.4304 13.324 17.609 23.426 23.441 10.084 5.8218 21.092 8.5693 31.955 8.5666l55.441-96.027c-5.4291-9.4089-13.313-17.569-23.396-23.39z" fill="#999" stroke-width=".2"/>
+  <path d="m34.547 107.07 6.9282 4-6 10.392-6.9282-4z" fill="#fff" style="paint-order:stroke fill markers"/>
+  <path d="m52.547 75.897 6.9282 4-10 17.321-6.9282-4z" fill="#fff" style="paint-order:stroke fill markers"/>
+  <path d="m68.003 128.04c3.3659-0.17764 6.7162-0.69607 10-1.395l47.121-81.461c-1.0366-3.1937-1.7042-5.7055-4.1211-9 0 0-53 92-53 91.856z" fill-opacity=".2" stroke-width=".2"/>
+  <path d="m70.547 44.72 6.9282 4-10 17.321-6.9282-4z" fill="#fff" style="paint-order:stroke fill markers"/>
+  <path d="m88.547 13.543 6.9282 4-10 17.321-6.9282-4z" fill="#fff" style="paint-order:stroke fill markers"/>
+  <path d="m119.46 32-55.416 95.983c3.2446-3e-3 6.4749-0.24979 9.6645-0.73946l49.943-86.504c-1.1707-3.0071-2.5725-5.9278-4.1919-8.7395z" fill="#fff" stroke-width=".2"/>
+  <path d="m64.034-1.9691e-6c-3.2446 0.0033555-6.4749 0.24979-9.6645 0.73946l-49.943 86.504c1.1707 3.0071 2.5725 5.9278 4.1919 8.7395z" fill="#fff" stroke-width=".2"/>
+ </g>
+</svg>