diff --git a/icons/devices/keyboard-symbolic.symbolic.svg b/icons/devices/input-keyboard-symbolic.symbolic.svg
similarity index 100%
rename from icons/devices/keyboard-symbolic.symbolic.svg
rename to icons/devices/input-keyboard-symbolic.symbolic.svg
diff --git a/icons/devices/audio-microphone.svg b/icons/devices/media-optical-symbolic.symbolic.svg
similarity index 92%
rename from icons/devices/audio-microphone.svg
rename to icons/devices/media-optical-symbolic.symbolic.svg
index 39baa3c..2688428 100644
--- a/icons/devices/audio-microphone.svg
+++ b/icons/devices/media-optical-symbolic.symbolic.svg
@@ -1,16 +1,15 @@
-
-
diff --git a/icons/devices/media-removable-symbolic.symbolic.svg b/icons/devices/media-removable-symbolic.symbolic.svg
new file mode 100644
index 0000000..7dd415c
--- /dev/null
+++ b/icons/devices/media-removable-symbolic.symbolic.svg
@@ -0,0 +1,1928 @@
+
+
diff --git a/icons/devices/phone-apple-iphone-symbolic.symbolic.svg b/icons/devices/phone-apple-iphone-symbolic.symbolic.svg
new file mode 100644
index 0000000..8be4a9f
--- /dev/null
+++ b/icons/devices/phone-apple-iphone-symbolic.symbolic.svg
@@ -0,0 +1,1928 @@
+
+
diff --git a/icons/devices/keyboard.svg b/icons/devices/phone-old-symbolic.symbolic.svg
similarity index 88%
rename from icons/devices/keyboard.svg
rename to icons/devices/phone-old-symbolic.symbolic.svg
index 92a83ab..376eff1 100644
--- a/icons/devices/keyboard.svg
+++ b/icons/devices/phone-old-symbolic.symbolic.svg
@@ -1,16 +1,15 @@
-
-
diff --git a/icons/devices/phone-symbolic.symbolic.svg b/icons/devices/phone-symbolic.symbolic.svg
new file mode 100644
index 0000000..bd20834
--- /dev/null
+++ b/icons/devices/phone-symbolic.symbolic.svg
@@ -0,0 +1,1928 @@
+
+
diff --git a/tasks/link/linkdevices.sh b/tasks/link/linkdevices.sh
index 64c944b..b338934 100755
--- a/tasks/link/linkdevices.sh
+++ b/tasks/link/linkdevices.sh
@@ -2,15 +2,9 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-ln -s audio-microphone.png audio-input-microphone.png
-ln -s input-mouse.png mouse.png
-ln -s media-optical.png drive-optical.png
-ln -s media-optical.png drive-cdrom.png
-ln -s display.png cs-screen.png
-ln -s display.png video-display.png
-ln -s hard-drive.png drive-harddisk.png
-ln -s hard-drive.png harddrive.png
-ln -s hard-drive.png gtk-harddisk.png
-ln -s keyboard.png input-keyboard.png
ln -s drive-harddisk-symbolic.symbolic.png drive-harddisk-usb-symbolic.symbolic.png
ln -s drive-harddisk-symbolic.symbolic.png drive-harddisk-system-symbolic.symbolic.png
+ln -s media-optical-symbolic.symbolic.png media-optical-dvd-symbolic.symbolic.png
+ln -s media-optical-symbolic.symbolic.png media-optical-bd-symbolic.symbolic.png
+ln -s media-optical-symbolic.symbolic.png media-optical-cd-symbolic.symbolic.png
+ln -s media-optical-symbolic.symbolic.png media-optical-cd-audio-symbolic.symbolic.png