diff --git a/common-tasks/device-handling.md b/common-tasks/device-handling.md
index da6119f8..fbdab2c1 100644
--- a/common-tasks/device-handling.md
+++ b/common-tasks/device-handling.md
@@ -115,5 +115,5 @@ If no specific `sourceVM:deviceID` combination is given, *all devices of that DE
 
 [security considerations]: /doc/device-considerations/
 [device manager icon]: /attachment/wiki/Devices/media-removable.png
-[eject icon]: https://raw.githubusercontent.com/hrdwrrsk/adwaita-xfce-icon-theme/master/Adwaita-Xfce/22x22/actions/media-eject.png
+[eject icon]: /attachment/wiki/Devices/media-eject.png
 [i4692]: https://github.com/QubesOS/qubes-issues/issues/4692
diff --git a/common-tasks/pci-devices.md b/common-tasks/pci-devices.md
index 2660bb80..089d4bbb 100644
--- a/common-tasks/pci-devices.md
+++ b/common-tasks/pci-devices.md
@@ -136,8 +136,8 @@ or
 [security considerations]: /doc/device-considerations/#pci-security
 [block]:/doc/block-devices-in-qubes-R4.0/
 [USB]:/dock/usb-devices-in-qubes-R4.0/
-[appmenu]: https://raw.githubusercontent.com/QubesOS/qubes-artwork/master/icons/32x32/apps/qubes-appmenu-select.png
-[domain manager icon]: https://raw.githubusercontent.com/QubesOS/qubes-artwork/master/icons/32x32/apps/qubes-logo-icon.png
+[appmenu]: /attachment/wiki/Devices/qubes-appmenu-select.png
+[domain manager icon]: /attachment/wiki/Devices/qubes-logo-icon.png
 [qvm-device]: /doc/device-handling-in-qubes-R4.0/#general-qubes-device-widget-behavior-and-handling
 [side channel attacks]: https://en.wikipedia.org/wiki/Side-channel_attack
 [ml1]: https://groups.google.com/group/qubes-devel/browse_thread/thread/631c4a3a9d1186e3
diff --git a/common-tasks/usb-devices.md b/common-tasks/usb-devices.md
index 0b7d256c..7b7a2ee2 100644
--- a/common-tasks/usb-devices.md
+++ b/common-tasks/usb-devices.md
@@ -132,14 +132,14 @@ Strip the leading `0000:` and pass the rest to the [`qvm-pci` tool][qvm-pci] to
 [block device]: /doc/block-devices-in-qubes-R4.0/
 [security considerations]: /doc/device-considerations/#usb-security
 [usb-challenges]: https://blog.invisiblethings.org/2011/05/31/usb-security-challenges.html
-[usb icon]: https://raw.githubusercontent.com/QubesOS/qubes-desktop-linux-manager/master/icons/22x22/generic-usb.png
+[usb icon]: /attachment/wiki/Devices/generic-usb.png
 [microcontroller programming]: https://www.arduino.cc/en/Main/Howto
 [external audio devices]: /doc/external-audio/
 [optical drives]: /doc/recording-optical-discs/
 [qubes u2f proxy]: /doc/u2f-proxy/
 [4661]: https://github.com/QubesOS/qubes-issues/issues/4661
 [device manager icon]:/attachment/wiki/Devices/media-removable.png
-[eject icon]:https://raw.githubusercontent.com/hrdwrrsk/adwaita-xfce-icon-theme/master/Adwaita-Xfce/22x22/actions/media-eject.png
+[eject icon]:/attachment/wiki/Devices/media-eject.png
 [Installation Section]:#installation-of-qubes-usb-proxy
 [USB-qube howto]: /doc/usb-qube-howto/
 [keyboard setup]: /doc/usb-qube-howto/#enable-a-usb-keyboard-for-login