diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index 855aa4d421..c492af6d7e 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -1121,9 +1121,12 @@ elementary_fdo_categories_128_files = \
elementary_fdo_emblems_96_files = \
elementary/themes/fdo/emblems/96/emblem-default.png \
+ elementary/themes/fdo/emblems/96/emblem-documents.png \
elementary/themes/fdo/emblems/96/emblem-downloads.png \
elementary/themes/fdo/emblems/96/emblem-favorite.png \
elementary/themes/fdo/emblems/96/emblem-important.png \
+ elementary/themes/fdo/emblems/96/emblem-mail.png \
+ elementary/themes/fdo/emblems/96/emblem-photos.png \
elementary/themes/fdo/emblems/96/emblem-readonly.png \
elementary/themes/fdo/emblems/96/emblem-shared.png \
elementary/themes/fdo/emblems/96/emblem-symbolic-link.png \
diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index 08a4084c8b..cbc9f0e2ed 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -89,9 +89,12 @@ ICO2(CTX, "start-here")
//// emblems ////////////////////////////////////////////////////////////////
#define CTX "emblems"
ICO1(CTX, "emblem-default", 96)
+ICO1(CTX, "emblem-documents", 96)
ICO1(CTX, "emblem-downloads", 96)
ICO1(CTX, "emblem-favorite", 96)
ICO1(CTX, "emblem-important", 96)
+ICO1(CTX, "emblem-mail", 96)
+ICO1(CTX, "emblem-photos", 96)
ICO1(CTX, "emblem-readonly", 96)
ICO1(CTX, "emblem-shared", 96)
ICO1(CTX, "emblem-symbolic-link", 96)
@@ -99,9 +102,6 @@ ICO1(CTX, "emblem-unreadable", 96)
ICO1(CTX, "emblem-system", 96)
ICO1(CTX, "emblem-synchronized", 96)
ICO1(CTX, "emblem-synchronizing", 96) /* */
-// TODO emblem-documents
-// TODO emblem-mail
-// TODO emblem-photos
#undef CTX
diff --git a/data/elementary/themes/fdo/emblems/96-svg/emblem-documents.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-documents.svg
new file mode 100644
index 0000000000..b5d4d38362
--- /dev/null
+++ b/data/elementary/themes/fdo/emblems/96-svg/emblem-documents.svg
@@ -0,0 +1,363 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/emblems/96-svg/emblem-mail.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-mail.svg
new file mode 100644
index 0000000000..2eaacf5143
--- /dev/null
+++ b/data/elementary/themes/fdo/emblems/96-svg/emblem-mail.svg
@@ -0,0 +1,339 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/emblems/96-svg/emblem-photos.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-photos.svg
new file mode 100644
index 0000000000..7d288aa735
--- /dev/null
+++ b/data/elementary/themes/fdo/emblems/96-svg/emblem-photos.svg
@@ -0,0 +1,347 @@
+
+
+
+
diff --git a/data/elementary/themes/fdo/emblems/96/emblem-documents.png b/data/elementary/themes/fdo/emblems/96/emblem-documents.png
new file mode 100644
index 0000000000..c45c44dbb7
Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-documents.png differ
diff --git a/data/elementary/themes/fdo/emblems/96/emblem-mail.png b/data/elementary/themes/fdo/emblems/96/emblem-mail.png
new file mode 100644
index 0000000000..37eca2a8d3
Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-mail.png differ
diff --git a/data/elementary/themes/fdo/emblems/96/emblem-photos.png b/data/elementary/themes/fdo/emblems/96/emblem-photos.png
new file mode 100644
index 0000000000..dc28041b2d
Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-photos.png differ
diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c
index 776c26bf97..b539b4e79c 100644
--- a/src/bin/elementary/test_icon.c
+++ b/src/bin/elementary/test_icon.c
@@ -221,9 +221,12 @@ _standard_genlist_populate(Evas_Object *gl)
CONTEXT("Emblems")
IC("emblem-default")
+ IC("emblem-documents")
IC("emblem-downloads")
IC("emblem-favorite")
IC("emblem-important")
+ IC("emblem-mail")
+ IC("emblem-photos")
IC("emblem-readonly")
IC("emblem-shared")
IC("emblem-symbolic-link")