diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index ccf29370b4..40a2000050 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -993,6 +993,7 @@ elementary/themes/fdo/emblems/96 \
elementary/themes/fdo/places/16 \
elementary/themes/fdo/places/128 \
elementary/themes/fdo/status/128 \
+elementary/themes/fdo/devices/128 \
elementary/themes/fdo/apps/64
diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index c55ffc188d..dea70e8b08 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -402,33 +402,50 @@ ICO2(CTX, "preferences-other")
//// devices ////////////////////////////////////////////////////////////////
#define CTX "devices"
-// TODO audio-card
-// TODO audio-input-microphone
-// TODO battery
-// TODO camera-photo
+ICO1(CTX, "audio-card", 128)
+ICO1(CTX, "audio-input-microphone", 128)
+ICO1(CTX, "battery", 128)
+ICO1(CTX, "camera", 128)
+ICO1(CTX, "camera-photo", 128)
+ICO1(CTX, "camera-web", 128)
// TODO camera-video
-// TODO camera-web
-// TODO computer
-// TODO drive-harddisk
-// TODO drive-optical
-// TODO drive-removable-media
-// TODO input-gaming
-// TODO input-keyboard
-// TODO input-mouse
-// TODO input-tablet
-// TODO media-flash
-// TODO media-floppy
-// TODO media-optical
-// TODO media-tape
-// TODO modem
-// TODO multimedia-player
-// TODO network-wired
-// TODO network-wireless
-// TODO pda
-// TODO phone
-// TODO printer
-// TODO scanner
-// TODO video-display
+ICO1(CTX, "drive-harddisk", 128)
+ICO1(CTX, "drive-harddisk-ieee1394", 128)
+ICO1(CTX, "drive-harddisk-usb", 128)
+ICO1(CTX, "drive-optical", 128)
+ICO1(CTX, "drive-removable-media", 128)
+ICO1(CTX, "drive-removable-media-ieee1394", 128)
+ICO1(CTX, "drive-removable-media-usb", 128)
+ICO1(CTX, "computer", 128)
+ICO1(CTX, "computer-laptop", 128)
+ICO1(CTX, "multimedia-player", 128)
+ICO1(CTX, "media-optical", 128)
+ICO1(CTX, "media-optical-cd", 128)
+ICO1(CTX, "media-optical-audio", 128)
+ICO1(CTX, "media-optical-dvd", 128)
+ICO1(CTX, "media-optical-bd", 128)
+ICO1(CTX, "media-flash", 128)
+ICO1(CTX, "media-flash-cf", 128)
+ICO1(CTX, "media-flash-ms", 128)
+ICO1(CTX, "media-flash-sd", 128)
+ICO1(CTX, "media-flash-sm", 128)
+ICO1(CTX, "media-floppy", 128)
+ICO1(CTX, "media-zip", 128)
+ICO1(CTX, "media-tape", 128)
+ICO1(CTX, "media-memory", 128)
+ICO1(CTX, "processor", 128)
+ICO1(CTX, "input-mouse", 128)
+ICO1(CTX, "input-tablet", 128)
+ICO1(CTX, "input-keyboard", 128)
+ICO1(CTX, "input-gaming", 128)
+ICO1(CTX, "pda", 128)
+ICO1(CTX, "phone", 128)
+ICO1(CTX, "printer", 128)
+ICO1(CTX, "scanner", 128)
+ICO1(CTX, "modem", 128)
+ICO1(CTX, "video-display", 128)
+ICO1(CTX, "network-wired", 128)
+ICO1(CTX, "network-wireless", 128)
#undef CTX
diff --git a/data/elementary/themes/fdo/devices/128-svg/audio-card.svg b/data/elementary/themes/fdo/devices/128-svg/audio-card.svg
new file mode 100644
index 0000000000..3b520be557
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/audio-card.svg
@@ -0,0 +1,726 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/audio-input-microphone.svg b/data/elementary/themes/fdo/devices/128-svg/audio-input-microphone.svg
new file mode 100644
index 0000000000..ac24e398a6
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/audio-input-microphone.svg
@@ -0,0 +1,774 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/battery.svg b/data/elementary/themes/fdo/devices/128-svg/battery.svg
new file mode 100644
index 0000000000..e16ed648d6
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/battery.svg
@@ -0,0 +1,561 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/camera-photo.svg b/data/elementary/themes/fdo/devices/128-svg/camera-photo.svg
new file mode 100644
index 0000000000..1d3b9cdf7c
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/camera-photo.svg
@@ -0,0 +1,1686 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/camera-web.svg b/data/elementary/themes/fdo/devices/128-svg/camera-web.svg
new file mode 100644
index 0000000000..ef4d8a84bc
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/camera-web.svg
@@ -0,0 +1,1561 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/camera.svg b/data/elementary/themes/fdo/devices/128-svg/camera.svg
new file mode 100644
index 0000000000..73b6875c1f
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/camera.svg
@@ -0,0 +1,1837 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/computer-laptop.svg b/data/elementary/themes/fdo/devices/128-svg/computer-laptop.svg
new file mode 100644
index 0000000000..7efbe68db8
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/computer-laptop.svg
@@ -0,0 +1,8737 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/computer.svg b/data/elementary/themes/fdo/devices/128-svg/computer.svg
new file mode 100644
index 0000000000..ed50774629
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/computer.svg
@@ -0,0 +1,3251 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-harddisk-ieee1394.svg b/data/elementary/themes/fdo/devices/128-svg/drive-harddisk-ieee1394.svg
new file mode 100644
index 0000000000..717a18ab94
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-harddisk-ieee1394.svg
@@ -0,0 +1,792 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-harddisk-usb.svg b/data/elementary/themes/fdo/devices/128-svg/drive-harddisk-usb.svg
new file mode 100644
index 0000000000..0c01a41b38
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-harddisk-usb.svg
@@ -0,0 +1,668 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-harddisk.svg b/data/elementary/themes/fdo/devices/128-svg/drive-harddisk.svg
new file mode 100644
index 0000000000..a104c6fb4a
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-harddisk.svg
@@ -0,0 +1,5044 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-optical.svg b/data/elementary/themes/fdo/devices/128-svg/drive-optical.svg
new file mode 100644
index 0000000000..39c575abd7
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-optical.svg
@@ -0,0 +1,486 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-removable-media-ieee1394.svg b/data/elementary/themes/fdo/devices/128-svg/drive-removable-media-ieee1394.svg
new file mode 100644
index 0000000000..717a18ab94
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-removable-media-ieee1394.svg
@@ -0,0 +1,792 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-removable-media-usb.svg b/data/elementary/themes/fdo/devices/128-svg/drive-removable-media-usb.svg
new file mode 100644
index 0000000000..0c01a41b38
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-removable-media-usb.svg
@@ -0,0 +1,668 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/drive-removable-media.svg b/data/elementary/themes/fdo/devices/128-svg/drive-removable-media.svg
new file mode 100644
index 0000000000..78bf41fbd5
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/drive-removable-media.svg
@@ -0,0 +1,645 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/input-gaming.svg b/data/elementary/themes/fdo/devices/128-svg/input-gaming.svg
new file mode 100644
index 0000000000..aa2f1182db
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/input-gaming.svg
@@ -0,0 +1,1841 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/input-keyboard.svg b/data/elementary/themes/fdo/devices/128-svg/input-keyboard.svg
new file mode 100644
index 0000000000..78735c3fcf
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/input-keyboard.svg
@@ -0,0 +1,1564 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/input-mouse.svg b/data/elementary/themes/fdo/devices/128-svg/input-mouse.svg
new file mode 100644
index 0000000000..9f5c17c429
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/input-mouse.svg
@@ -0,0 +1,1913 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/input-tablet.svg b/data/elementary/themes/fdo/devices/128-svg/input-tablet.svg
new file mode 100644
index 0000000000..dccca7686f
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/input-tablet.svg
@@ -0,0 +1,1400 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-flash-cf.svg b/data/elementary/themes/fdo/devices/128-svg/media-flash-cf.svg
new file mode 100644
index 0000000000..551958112e
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-flash-cf.svg
@@ -0,0 +1,651 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-flash-ms.svg b/data/elementary/themes/fdo/devices/128-svg/media-flash-ms.svg
new file mode 100644
index 0000000000..08b1ff2762
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-flash-ms.svg
@@ -0,0 +1,613 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-flash-sd.svg b/data/elementary/themes/fdo/devices/128-svg/media-flash-sd.svg
new file mode 100644
index 0000000000..2cf0d8863c
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-flash-sd.svg
@@ -0,0 +1,793 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-flash-sm.svg b/data/elementary/themes/fdo/devices/128-svg/media-flash-sm.svg
new file mode 100644
index 0000000000..e009ba507b
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-flash-sm.svg
@@ -0,0 +1,928 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-flash.svg b/data/elementary/themes/fdo/devices/128-svg/media-flash.svg
new file mode 100644
index 0000000000..ef51974f80
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-flash.svg
@@ -0,0 +1,793 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-floppy.svg b/data/elementary/themes/fdo/devices/128-svg/media-floppy.svg
new file mode 100644
index 0000000000..ceb2c45b91
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-floppy.svg
@@ -0,0 +1,1003 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-memory.svg b/data/elementary/themes/fdo/devices/128-svg/media-memory.svg
new file mode 100644
index 0000000000..7ad0541b2f
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-memory.svg
@@ -0,0 +1,1785 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-optical-audio.svg b/data/elementary/themes/fdo/devices/128-svg/media-optical-audio.svg
new file mode 100644
index 0000000000..efe1825584
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-optical-audio.svg
@@ -0,0 +1,1148 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-optical-bd.svg b/data/elementary/themes/fdo/devices/128-svg/media-optical-bd.svg
new file mode 100644
index 0000000000..8146114912
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-optical-bd.svg
@@ -0,0 +1,1156 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-optical-cd.svg b/data/elementary/themes/fdo/devices/128-svg/media-optical-cd.svg
new file mode 100644
index 0000000000..d9dfe4f3cb
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-optical-cd.svg
@@ -0,0 +1,1389 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-optical-dvd.svg b/data/elementary/themes/fdo/devices/128-svg/media-optical-dvd.svg
new file mode 100644
index 0000000000..ca1b74b8cc
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-optical-dvd.svg
@@ -0,0 +1,1226 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-optical.svg b/data/elementary/themes/fdo/devices/128-svg/media-optical.svg
new file mode 100644
index 0000000000..d9dfe4f3cb
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-optical.svg
@@ -0,0 +1,1389 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-tape.svg b/data/elementary/themes/fdo/devices/128-svg/media-tape.svg
new file mode 100644
index 0000000000..47bd257cfc
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-tape.svg
@@ -0,0 +1,1343 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/media-zip.svg b/data/elementary/themes/fdo/devices/128-svg/media-zip.svg
new file mode 100644
index 0000000000..1891947dba
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/media-zip.svg
@@ -0,0 +1,972 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/modem.svg b/data/elementary/themes/fdo/devices/128-svg/modem.svg
new file mode 100644
index 0000000000..1e5c4ab8d6
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/modem.svg
@@ -0,0 +1,1308 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/elementary/themes/fdo/devices/128-svg/multimedia-player.svg b/data/elementary/themes/fdo/devices/128-svg/multimedia-player.svg
new file mode 100644
index 0000000000..8b8ad6f742
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/multimedia-player.svg
@@ -0,0 +1,315 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/network-wired.svg b/data/elementary/themes/fdo/devices/128-svg/network-wired.svg
new file mode 100644
index 0000000000..db110f5534
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/network-wired.svg
@@ -0,0 +1,1012 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/network-wireless.svg b/data/elementary/themes/fdo/devices/128-svg/network-wireless.svg
new file mode 100644
index 0000000000..65c680cd9f
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/network-wireless.svg
@@ -0,0 +1,1074 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/pda.svg b/data/elementary/themes/fdo/devices/128-svg/pda.svg
new file mode 100644
index 0000000000..47b0417c03
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/pda.svg
@@ -0,0 +1,778 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/phone.svg b/data/elementary/themes/fdo/devices/128-svg/phone.svg
new file mode 100644
index 0000000000..b15f139831
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/phone.svg
@@ -0,0 +1,778 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/printer.svg b/data/elementary/themes/fdo/devices/128-svg/printer.svg
new file mode 100644
index 0000000000..a214e92d83
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/printer.svg
@@ -0,0 +1,963 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/processor.svg b/data/elementary/themes/fdo/devices/128-svg/processor.svg
new file mode 100644
index 0000000000..6a179d0cc7
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/processor.svg
@@ -0,0 +1,1147 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/scanner.svg b/data/elementary/themes/fdo/devices/128-svg/scanner.svg
new file mode 100644
index 0000000000..5d12f5aac8
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/scanner.svg
@@ -0,0 +1,1298 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128-svg/video-display.svg b/data/elementary/themes/fdo/devices/128-svg/video-display.svg
new file mode 100644
index 0000000000..b398620f73
--- /dev/null
+++ b/data/elementary/themes/fdo/devices/128-svg/video-display.svg
@@ -0,0 +1,802 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/devices/128/audio-card.png b/data/elementary/themes/fdo/devices/128/audio-card.png
new file mode 100644
index 0000000000..88c40a2443
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/audio-card.png differ
diff --git a/data/elementary/themes/fdo/devices/128/audio-input-microphone.png b/data/elementary/themes/fdo/devices/128/audio-input-microphone.png
new file mode 100644
index 0000000000..995ce789a2
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/audio-input-microphone.png differ
diff --git a/data/elementary/themes/fdo/devices/128/battery.png b/data/elementary/themes/fdo/devices/128/battery.png
new file mode 100644
index 0000000000..7a253f9a05
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/battery.png differ
diff --git a/data/elementary/themes/fdo/devices/128/camera-photo.png b/data/elementary/themes/fdo/devices/128/camera-photo.png
new file mode 100644
index 0000000000..b8c1b1b9a3
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/camera-photo.png differ
diff --git a/data/elementary/themes/fdo/devices/128/camera-web.png b/data/elementary/themes/fdo/devices/128/camera-web.png
new file mode 100644
index 0000000000..995eb2f8b6
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/camera-web.png differ
diff --git a/data/elementary/themes/fdo/devices/128/camera.png b/data/elementary/themes/fdo/devices/128/camera.png
new file mode 100644
index 0000000000..d4aa1b9247
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/camera.png differ
diff --git a/data/elementary/themes/fdo/devices/128/computer-laptop.png b/data/elementary/themes/fdo/devices/128/computer-laptop.png
new file mode 100644
index 0000000000..e662243b5b
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/computer-laptop.png differ
diff --git a/data/elementary/themes/fdo/devices/128/computer.png b/data/elementary/themes/fdo/devices/128/computer.png
new file mode 100644
index 0000000000..ec1f26bf92
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/computer.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-harddisk-ieee1394.png b/data/elementary/themes/fdo/devices/128/drive-harddisk-ieee1394.png
new file mode 100644
index 0000000000..2cf2cb58e5
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-harddisk-ieee1394.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-harddisk-usb.png b/data/elementary/themes/fdo/devices/128/drive-harddisk-usb.png
new file mode 100644
index 0000000000..7f11c42cde
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-harddisk-usb.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-harddisk.png b/data/elementary/themes/fdo/devices/128/drive-harddisk.png
new file mode 100644
index 0000000000..01ea80f294
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-harddisk.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-optical.png b/data/elementary/themes/fdo/devices/128/drive-optical.png
new file mode 100644
index 0000000000..4b3fd2ee50
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-optical.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-removable-media-ieee1394.png b/data/elementary/themes/fdo/devices/128/drive-removable-media-ieee1394.png
new file mode 100644
index 0000000000..2cf2cb58e5
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-removable-media-ieee1394.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-removable-media-usb.png b/data/elementary/themes/fdo/devices/128/drive-removable-media-usb.png
new file mode 100644
index 0000000000..7f11c42cde
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-removable-media-usb.png differ
diff --git a/data/elementary/themes/fdo/devices/128/drive-removable-media.png b/data/elementary/themes/fdo/devices/128/drive-removable-media.png
new file mode 100644
index 0000000000..8e05123519
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/drive-removable-media.png differ
diff --git a/data/elementary/themes/fdo/devices/128/input-gaming.png b/data/elementary/themes/fdo/devices/128/input-gaming.png
new file mode 100644
index 0000000000..2cce4c51d1
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/input-gaming.png differ
diff --git a/data/elementary/themes/fdo/devices/128/input-keyboard.png b/data/elementary/themes/fdo/devices/128/input-keyboard.png
new file mode 100644
index 0000000000..4226b27984
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/input-keyboard.png differ
diff --git a/data/elementary/themes/fdo/devices/128/input-mouse.png b/data/elementary/themes/fdo/devices/128/input-mouse.png
new file mode 100644
index 0000000000..006e0cae34
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/input-mouse.png differ
diff --git a/data/elementary/themes/fdo/devices/128/input-tablet.png b/data/elementary/themes/fdo/devices/128/input-tablet.png
new file mode 100644
index 0000000000..3dd052b7f8
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/input-tablet.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-flash-cf.png b/data/elementary/themes/fdo/devices/128/media-flash-cf.png
new file mode 100644
index 0000000000..e5cee86a45
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-flash-cf.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-flash-ms.png b/data/elementary/themes/fdo/devices/128/media-flash-ms.png
new file mode 100644
index 0000000000..8e2e81aeec
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-flash-ms.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-flash-sd.png b/data/elementary/themes/fdo/devices/128/media-flash-sd.png
new file mode 100644
index 0000000000..bb629eded3
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-flash-sd.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-flash-sm.png b/data/elementary/themes/fdo/devices/128/media-flash-sm.png
new file mode 100644
index 0000000000..f1ff6c76d7
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-flash-sm.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-flash.png b/data/elementary/themes/fdo/devices/128/media-flash.png
new file mode 100644
index 0000000000..bb629eded3
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-flash.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-floppy.png b/data/elementary/themes/fdo/devices/128/media-floppy.png
new file mode 100644
index 0000000000..6032f0b5fc
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-floppy.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-memory.png b/data/elementary/themes/fdo/devices/128/media-memory.png
new file mode 100644
index 0000000000..551738fa6d
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-memory.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-optical-audio.png b/data/elementary/themes/fdo/devices/128/media-optical-audio.png
new file mode 100644
index 0000000000..3e62d5cfdf
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-optical-audio.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-optical-bd.png b/data/elementary/themes/fdo/devices/128/media-optical-bd.png
new file mode 100644
index 0000000000..dcdd34cd6e
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-optical-bd.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-optical-cd.png b/data/elementary/themes/fdo/devices/128/media-optical-cd.png
new file mode 100644
index 0000000000..e1108b1640
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-optical-cd.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-optical-dvd.png b/data/elementary/themes/fdo/devices/128/media-optical-dvd.png
new file mode 100644
index 0000000000..4db1f03aec
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-optical-dvd.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-optical.png b/data/elementary/themes/fdo/devices/128/media-optical.png
new file mode 100644
index 0000000000..e1108b1640
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-optical.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-tape.png b/data/elementary/themes/fdo/devices/128/media-tape.png
new file mode 100644
index 0000000000..df8dfe66d3
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-tape.png differ
diff --git a/data/elementary/themes/fdo/devices/128/media-zip.png b/data/elementary/themes/fdo/devices/128/media-zip.png
new file mode 100644
index 0000000000..e3f729a462
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/media-zip.png differ
diff --git a/data/elementary/themes/fdo/devices/128/modem.png b/data/elementary/themes/fdo/devices/128/modem.png
new file mode 100644
index 0000000000..48976b16b3
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/modem.png differ
diff --git a/data/elementary/themes/fdo/devices/128/multimedia-player.png b/data/elementary/themes/fdo/devices/128/multimedia-player.png
new file mode 100644
index 0000000000..e092bc808b
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/multimedia-player.png differ
diff --git a/data/elementary/themes/fdo/devices/128/network-wired.png b/data/elementary/themes/fdo/devices/128/network-wired.png
new file mode 100644
index 0000000000..7ea984fa3f
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/network-wired.png differ
diff --git a/data/elementary/themes/fdo/devices/128/network-wireless.png b/data/elementary/themes/fdo/devices/128/network-wireless.png
new file mode 100644
index 0000000000..965f38d454
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/network-wireless.png differ
diff --git a/data/elementary/themes/fdo/devices/128/pda.png b/data/elementary/themes/fdo/devices/128/pda.png
new file mode 100644
index 0000000000..c5a0504200
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/pda.png differ
diff --git a/data/elementary/themes/fdo/devices/128/phone.png b/data/elementary/themes/fdo/devices/128/phone.png
new file mode 100644
index 0000000000..52c3135019
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/phone.png differ
diff --git a/data/elementary/themes/fdo/devices/128/printer.png b/data/elementary/themes/fdo/devices/128/printer.png
new file mode 100644
index 0000000000..afb3fe39a5
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/printer.png differ
diff --git a/data/elementary/themes/fdo/devices/128/processor.png b/data/elementary/themes/fdo/devices/128/processor.png
new file mode 100644
index 0000000000..a0cd96b8c7
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/processor.png differ
diff --git a/data/elementary/themes/fdo/devices/128/scanner.png b/data/elementary/themes/fdo/devices/128/scanner.png
new file mode 100644
index 0000000000..78e66934be
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/scanner.png differ
diff --git a/data/elementary/themes/fdo/devices/128/video-display.png b/data/elementary/themes/fdo/devices/128/video-display.png
new file mode 100644
index 0000000000..f01ace6632
Binary files /dev/null and b/data/elementary/themes/fdo/devices/128/video-display.png differ
diff --git a/data/elementary/themes/fdo/index.theme b/data/elementary/themes/fdo/index.theme
index 076b707496..5cdf7aea81 100644
--- a/data/elementary/themes/fdo/index.theme
+++ b/data/elementary/themes/fdo/index.theme
@@ -2,7 +2,7 @@
Name=Enlightenment-X
Inherits=hicolor
Comment=The Enlightenment-X Icon theme. Orig. based on Rave-X, Mint-X and Faenza Icon Themes.
-Directories=actions/128,status/128,places/128,places/16,emblems/96,categories/128,categories/16,apps/64
+Directories=actions/128,status/128,places/128,places/16,devices/128,emblems/96,categories/128,categories/16,apps/64
Example=folder-home
@@ -55,6 +55,13 @@ Type=Scalable
MinSize=16
MaxSize=256
+[devices/128]
+Size=128
+Context=Devices
+Type=Scalable
+MinSize=16
+MaxSize=256
+
[apps/64]
Size=64
Context=Applications
diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c
index 8ac33875e9..a5a5b917bd 100644
--- a/src/bin/elementary/test_icon.c
+++ b/src/bin/elementary/test_icon.c
@@ -416,6 +416,51 @@ _standard_genlist_populate(Evas_Object *gl)
IC("starred")
IC("non-starred")
+ CONTEXT("Devices")
+ IC("audio-card")
+ IC("audio-input-microphone")
+ IC("battery")
+ IC("camera")
+ IC("camera-photo")
+ IC("camera-web")
+ IC("drive-harddisk")
+ IC("drive-harddisk-ieee1394")
+ IC("drive-harddisk-usb")
+ IC("drive-optical")
+ IC("drive-removable-media")
+ IC("drive-removable-media-ieee1394")
+ IC("drive-removable-media-usb")
+ IC("computer")
+ IC("computer-laptop")
+ IC("multimedia-player")
+ IC("media-optical")
+ IC("media-optical-cd")
+ IC("media-optical-audio")
+ IC("media-optical-dvd")
+ IC("media-optical-bd")
+ IC("media-flash")
+ IC("media-flash-cf")
+ IC("media-flash-ms")
+ IC("media-flash-sd")
+ IC("media-flash-sm")
+ IC("media-floppy")
+ IC("media-zip")
+ IC("media-tape")
+ IC("media-memory")
+ IC("processor")
+ IC("input-mouse")
+ IC("input-tablet")
+ IC("input-keyboard")
+ IC("input-gaming")
+ IC("pda")
+ IC("phone")
+ IC("printer")
+ IC("scanner")
+ IC("modem")
+ IC("video-display")
+ IC("network-wired")
+ IC("network-wireless")
+
CONTEXT("Categories")
IC("applications-accessories")
IC("applications-development")