diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index d21a298841..3af67cb559 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -360,23 +360,23 @@ ICO1(CTX, "non-starred") /* */
//// categories /////////////////////////////////////////////////////////////
#define CTX "categories"
-// TODO applications-accessories
-// TODO applications-development
+ICO1(CTX, "applications-accessories")
+ICO1(CTX, "applications-development")
+ICO1(CTX, "applications-games")
+ICO1(CTX, "applications-graphics")
+ICO1(CTX, "applications-internet")
+ICO1(CTX, "applications-multimedia")
+ICO1(CTX, "applications-office")
+ICO1(CTX, "applications-other")
+ICO1(CTX, "applications-science")
+ICO1(CTX, "applications-system")
+ICO1(CTX, "applications-utilities")
+ICO1(CTX, "preferences-desktop")
+ICO1(CTX, "preferences-system")
+ICO1(CTX, "preferences-other")
// TODO applications-engineering
-// TODO applications-games
-// TODO applications-graphics
-// TODO applications-internet
-// TODO applications-multimedia
-// TODO applications-office
-// TODO applications-other
-// TODO applications-science
-// TODO applications-system
-// TODO applications-utilities
-// TODO preferences-desktop
// TODO preferences-desktop-peripherals
// TODO preferences-desktop-personal
-// TODO preferences-other
-// TODO preferences-system
// TODO preferences-system-network
// TODO system-help
#undef CTX
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-accessories.svg b/data/elementary/themes/fdo/categories/scalable/applications-accessories.svg
new file mode 100644
index 0000000000..d88df83b8a
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-accessories.svg
@@ -0,0 +1,1514 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-development.svg b/data/elementary/themes/fdo/categories/scalable/applications-development.svg
new file mode 100644
index 0000000000..daba2b7707
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-development.svg
@@ -0,0 +1,451 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-games.svg b/data/elementary/themes/fdo/categories/scalable/applications-games.svg
new file mode 100644
index 0000000000..c472b564f1
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-games.svg
@@ -0,0 +1,1763 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-graphics.svg b/data/elementary/themes/fdo/categories/scalable/applications-graphics.svg
new file mode 100644
index 0000000000..030cb57d11
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-graphics.svg
@@ -0,0 +1,425 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-internet.svg b/data/elementary/themes/fdo/categories/scalable/applications-internet.svg
new file mode 100644
index 0000000000..279fa46391
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-internet.svg
@@ -0,0 +1,526 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-multimedia.svg b/data/elementary/themes/fdo/categories/scalable/applications-multimedia.svg
new file mode 100644
index 0000000000..dd49c13f62
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-multimedia.svg
@@ -0,0 +1,784 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-office.svg b/data/elementary/themes/fdo/categories/scalable/applications-office.svg
new file mode 100644
index 0000000000..f390d6572e
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-office.svg
@@ -0,0 +1,574 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-other.svg b/data/elementary/themes/fdo/categories/scalable/applications-other.svg
new file mode 100644
index 0000000000..148f4df09c
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-other.svg
@@ -0,0 +1,1437 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-science.svg b/data/elementary/themes/fdo/categories/scalable/applications-science.svg
new file mode 100644
index 0000000000..5455c3acfa
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-science.svg
@@ -0,0 +1,467 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-system.svg b/data/elementary/themes/fdo/categories/scalable/applications-system.svg
new file mode 100644
index 0000000000..b7a951933f
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-system.svg
@@ -0,0 +1,717 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/applications-utilities.svg b/data/elementary/themes/fdo/categories/scalable/applications-utilities.svg
new file mode 120000
index 0000000000..210f51ca2f
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/applications-utilities.svg
@@ -0,0 +1 @@
+applications-accessories.svg
\ No newline at end of file
diff --git a/data/elementary/themes/fdo/categories/scalable/preferences-desktop.svg b/data/elementary/themes/fdo/categories/scalable/preferences-desktop.svg
new file mode 100644
index 0000000000..fc76dda0ee
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/preferences-desktop.svg
@@ -0,0 +1,862 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/categories/scalable/preferences-other.svg b/data/elementary/themes/fdo/categories/scalable/preferences-other.svg
new file mode 120000
index 0000000000..316547baee
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/preferences-other.svg
@@ -0,0 +1 @@
+applications-other.svg
\ No newline at end of file
diff --git a/data/elementary/themes/fdo/categories/scalable/preferences-system.svg b/data/elementary/themes/fdo/categories/scalable/preferences-system.svg
new file mode 120000
index 0000000000..9a40701e83
--- /dev/null
+++ b/data/elementary/themes/fdo/categories/scalable/preferences-system.svg
@@ -0,0 +1 @@
+applications-system.svg
\ No newline at end of file
diff --git a/data/elementary/themes/fdo/index.theme b/data/elementary/themes/fdo/index.theme
index ec1234abbd..14702c9c5e 100644
--- a/data/elementary/themes/fdo/index.theme
+++ b/data/elementary/themes/fdo/index.theme
@@ -1,8 +1,8 @@
[Icon Theme]
Name=Bluish-X
Inherits=hicolor
-Comment=The EFL Bluish-X Icon theme. Orig. Based on Rave-X and Mint-X Icon Themes.
-Directories=actions/scalable,status/scalable,places/scalable,places/16,emblems/scalable
+Comment=The EFL Bluish-X Icon theme. Orig. Based on Rave-X, Mint-X and Faenza Icon Themes.
+Directories=actions/scalable,status/scalable,places/scalable,places/16,emblems/scalable,categories/scalable
Example=directory-x-normal
[actions/scalable]
@@ -34,3 +34,8 @@ MaxSize=22
Size=96
Context=Emblems
Type=Scalable
+
+[categories/scalable]
+Size=128
+Context=Categories
+Type=Scalable