diff --git a/data/themes/default.edc b/data/themes/default.edc
index a532fe3c3..4e0793757 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -2,10 +2,9 @@
 // Add group{} locations to all sections. eg. "widget/preview" is found in Wallpaper selector"
 //	Icons:
 //		EFM - All popup icons ... eg, paste copy delete properties
-//		EFM - Desktop, folders, dynamic mime icons
-//		Toolbar 
+//		EFM - folders (perhaps?), dynamic mime icons
 //		Icons - Favorite, system icons, window icons, icon theme
-//		           - Dialogs, Interactions, applications
+//		           - Dialogs, Interactions, applications, settings
 //
 //
 // TODO Code:
@@ -16768,7 +16767,7 @@ collections { /* begin the collection of edje groups that are in this file */
    }
 
 /////////////////////////////////////////////////////////////////////////////
-   /*** TOOLBAR ***/
+   /*** FILE MANAGER TOOLBAR ***/
 
 group { name: "e/toolbar/default/base";
    images {
@@ -22617,6 +22616,7 @@ ICON("enlightenment/scale","icon_dummy.png",64)
 ICON("enlightenment/autoscroll","icon_dummy.png",64)
 ICON("enlightenment/showhide","icon_dummy.png",64)
 ICON("enlightenment/toolbar","icon_dummy.png",64)
+ICON("enlightenment/settings","icon_dummy.png",64)
 
 /// Old Icons from Bling ///
 
@@ -22639,6 +22639,7 @@ ICON("enlightenment/favorites","icon_favorites.png",64)
 ICON("enlightenment/desktops","icon_desktops.png",64)
 ICON("enlightenment/configuration","icon_configuration.png",64)
 ICON("enlightenment/intl","icon_intl.png",64)
+ICON("enlightenment/imc","icon_imc.png",64)
 ICON("enlightenment/system","icon_system.png",64)
 ICON("enlightenment/run","icon_run.png",64)
 ICON("enlightenment/directories","icon_directories.png",64)
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index a08555bf4..2c031b05c 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -340,6 +340,7 @@ icon_halt.png \
 icon_hibernate.png \
 icon_ibar_applications.png \
 icon_icon_theme.png \
+icon_imc.png \
 icon_intl.png \
 icon_keys.png \
 icon_left_arrow.png \
diff --git a/data/themes/images/icon_efm_copy.png b/data/themes/images/icon_efm_copy.png
index 983af880e..a5754bf51 100644
Binary files a/data/themes/images/icon_efm_copy.png and b/data/themes/images/icon_efm_copy.png differ
diff --git a/data/themes/images/icon_efm_properties.png b/data/themes/images/icon_efm_properties.png
index ab94e4fff..2888bf531 100644
Binary files a/data/themes/images/icon_efm_properties.png and b/data/themes/images/icon_efm_properties.png differ
diff --git a/data/themes/images/icon_efm_sort.png b/data/themes/images/icon_efm_sort.png
index 523092a55..53dfa985d 100644
Binary files a/data/themes/images/icon_efm_sort.png and b/data/themes/images/icon_efm_sort.png differ
diff --git a/data/themes/images/icon_favorites.png b/data/themes/images/icon_favorites.png
index f120d7039..649351c89 100644
Binary files a/data/themes/images/icon_favorites.png and b/data/themes/images/icon_favorites.png differ
diff --git a/data/themes/images/icon_imc.png b/data/themes/images/icon_imc.png
new file mode 100644
index 000000000..4c1468971
Binary files /dev/null and b/data/themes/images/icon_imc.png differ