diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index ae532f4d6..86dd29cc4 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -153,14 +153,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_mouse_cursor";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index fb716ddce..dd970b738 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -185,14 +185,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_mouse_cursor";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 1003c01ac..1713817b7 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -160,14 +160,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_menus";
diff --git a/config/standard/e.src b/config/standard/e.src
index eabe6b705..817afa7c6 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -160,14 +160,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_menus";
diff --git a/configure.ac b/configure.ac
index 6ad4b7b7f..32e2a2d99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -700,7 +700,6 @@ AC_E_OPTIONAL_MODULE([conf_menus], true)
 AC_E_OPTIONAL_MODULE([conf_dialogs], true)
 AC_E_OPTIONAL_MODULE([conf_performance], true)
 AC_E_OPTIONAL_MODULE([conf_paths], true)
-AC_E_OPTIONAL_MODULE([conf_mime], true)
 AC_E_OPTIONAL_MODULE([conf_interaction], true)
 AC_E_OPTIONAL_MODULE([conf_scale], true)
 AC_E_OPTIONAL_MODULE([gadman], true)
@@ -827,8 +826,6 @@ src/modules/conf_performance/Makefile
 src/modules/conf_performance/module.desktop
 src/modules/conf_paths/Makefile
 src/modules/conf_paths/module.desktop
-src/modules/conf_mime/Makefile
-src/modules/conf_mime/module.desktop
 src/modules/conf_interaction/Makefile
 src/modules/conf_interaction/module.desktop
 src/modules/conf_scale/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a61b8a8d..26fa05664 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -165,9 +165,6 @@ src/modules/conf_keybindings/e_int_config_mousebindings.c
 src/modules/conf_keybindings/e_mod_main.c
 src/modules/conf_menus/e_int_config_menus.c
 src/modules/conf_menus/e_mod_main.c
-src/modules/conf_mime/e_int_config_mime.c
-src/modules/conf_mime/e_int_config_mime_edit.c
-src/modules/conf_mime/e_mod_main.c
 src/modules/conf_mouse_cursor/e_int_config_cursor.c
 src/modules/conf_mouse_cursor/e_mod_main.c
 src/modules/conf_paths/e_int_config_paths.c
@@ -219,6 +216,8 @@ src/modules/everything-calc/evry_plug_calc.c
 src/modules/everything-files/evry_plug_files.c
 src/modules/everything-settings/evry_plug_settings.c
 src/modules/everything-windows/evry_plug_windows.c
+src/modules/fileman/e_int_config_mime.c
+src/modules/fileman/e_int_config_mime_edit.c
 src/modules/fileman/e_mod_main.c
 src/modules/fileman/e_mod_config.c
 src/modules/fileman/e_fwin.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 3bd09c1fc..dabe4d43d 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -154,10 +154,6 @@ if USE_MODULE_CONF_PATHS
 SUBDIRS += conf_paths
 endif
 
-if USE_MODULE_CONF_MIME
-SUBDIRS += conf_mime
-endif
-
 if USE_MODULE_CONF_INTERACTION
 SUBDIRS += conf_interaction
 endif
diff --git a/src/modules/conf_mime/.cvsignore b/src/modules/conf_mime/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_mime/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mime/Makefile.am b/src/modules/conf_mime/Makefile.am
deleted file mode 100644
index 7a5a87f63..000000000
--- a/src/modules/conf_mime/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mime
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_mime.c \
-                         e_int_config_mime.h \
-                         e_int_config_mime_edit.c \
-                         e_int_config_mime_edit.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_mime/e-module-conf_mime.edj b/src/modules/conf_mime/e-module-conf_mime.edj
deleted file mode 100644
index b9328cc80..000000000
Binary files a/src/modules/conf_mime/e-module-conf_mime.edj and /dev/null differ
diff --git a/src/modules/conf_mime/e_mod_main.c b/src/modules/conf_mime/e_mod_main.c
deleted file mode 100644
index b57717b8f..000000000
--- a/src/modules/conf_mime/e_mod_main.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - File Icons"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("fileman", 100, _("Files"), NULL, 
-                                     "system-file-manager");
-   e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), 
-                                 NULL, "preferences-file-icons", 
-                                 e_int_config_mime);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "_config_mime_edit_dialog"))) 
-     e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "fileman/file_icons"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("fileman/file_icons");
-   e_configure_registry_category_del("fileman");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mime/e_mod_main.h b/src/modules/conf_mime/e_mod_main.h
deleted file mode 100644
index f1594d92e..000000000
--- a/src/modules/conf_mime/e_mod_main.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_mime_edit.h"
-#include "e_int_config_mime.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_mime_edit.h"
-#include "e_int_config_mime.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
deleted file mode 100644
index 6060e61b3..000000000
--- a/src/modules/conf_mime/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=File Icons
-Name[ru]=Иконки файлов
-Name[cs]=Ikony souborů
-Name[de]=
-Name[eo]=Dosieraj piktogramoj
-Name[es]=Íconos de archivo
-Name[fr]=Icones des fichiers
-Name[hu]=Fájl ikonok
-Name[it]=Icone dei file
-Name[ja]=
-Name[pt]=Ícones dos ficheiros
-Name[pt_BR]=
-Name[tr]=Dosya Simgeleri
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mime
-Comment=Configure E17 mime icons.
-Comment[ru]=Настройки иконок MIME для E17.
-Comment[cs]=Určen k nastavení MIME ikon.
-Comment[de]=
-Comment[eo]=Agordi piktogramojn de E17 por MIME.
-Comment[es]=Configure los íconos mime de E17.
-Comment[fr]=Configure les icones des types MIME dans E17.
-Comment[hu]=Fájltípusok ikonjainak a beállítása az E17 fájlkezelőjében.
-Comment[it]=Configura le icone dei tipi MIME in E17.
-Comment[ja]=
-Comment[pt]=Permite-lhe definir os ícones mime
-Comment[pt_BR]=
-Comment[tr]=E17 mime simgelerini yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/fileman/Makefile.am b/src/modules/fileman/Makefile.am
index eb937d5ea..e1c6b652c 100644
--- a/src/modules/fileman/Makefile.am
+++ b/src/modules/fileman/Makefile.am
@@ -25,7 +25,11 @@ module_la_SOURCES      = e_mod_main.c \
 			 e_mod_dbus.c \
 			 e_mod_dbus.h \
 			 e_fwin.c \
-                         e_fwin.h
+                         e_fwin.h \
+                         e_int_config_mime.c \
+                         e_int_config_mime.h \
+                         e_int_config_mime_edit.c \
+                         e_int_config_mime_edit.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/fileman/e_int_config_mime.c
similarity index 100%
rename from src/modules/conf_mime/e_int_config_mime.c
rename to src/modules/fileman/e_int_config_mime.c
diff --git a/src/modules/conf_mime/e_int_config_mime.h b/src/modules/fileman/e_int_config_mime.h
similarity index 100%
rename from src/modules/conf_mime/e_int_config_mime.h
rename to src/modules/fileman/e_int_config_mime.h
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/fileman/e_int_config_mime_edit.c
similarity index 99%
rename from src/modules/conf_mime/e_int_config_mime_edit.c
rename to src/modules/fileman/e_int_config_mime_edit.c
index ed10831fd..572fe7930 100644
--- a/src/modules/conf_mime/e_int_config_mime_edit.c
+++ b/src/modules/fileman/e_int_config_mime_edit.c
@@ -57,7 +57,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
    cfdata->data = data;
    cfdata->data2 = data2;
    
-   if (e_config_dialog_find("E", "_config_mime_edit_dialog")) return NULL;
+   if (e_config_dialog_find("E", "fileman/mime_edit_dialog")) return NULL;
 
    con = e_container_current_get(e_manager_current_get());
    
@@ -69,7 +69,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
    v->basic.apply_cfdata = _basic_apply;
 
    cfd = e_config_dialog_new(con, _("File Icon"), "E", 
-			     "_config_mime_edit_dialog", 
+			     "fileman/mime_edit_dialog",
 			     "preferences-file-icons", 0, v, cfdata);
    return cfd;
 }
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.h b/src/modules/fileman/e_int_config_mime_edit.h
similarity index 100%
rename from src/modules/conf_mime/e_int_config_mime_edit.h
rename to src/modules/fileman/e_int_config_mime_edit.h
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index bb2aa92ea..eae9d82c2 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -58,7 +58,9 @@ e_modapi_init(E_Module *m)
    e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"),
                                  NULL, "system-file-manager",
                                  e_int_config_fileman);
-
+   e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"),
+                                 NULL, "preferences-file-icons",
+                                 e_int_config_mime);
    /* Setup Config edd */
    _e_mod_fileman_config_load();
 
@@ -119,6 +121,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    E_Manager *man;
    E_Container *con;
    E_Zone *zone;
+   E_Config_Dialog *cfd;
 
    e_fileman_dbus_shutdown();
 
@@ -154,7 +157,14 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
         e_action_del("fileman");
         act = NULL;
      }
-   /* remove fileman category from config panel */
+   while ((cfd = e_config_dialog_get("E", "fileman/mime_edit_dialog")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "fileman/file_icons")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "fileman/fileman")))
+      e_object_del(E_OBJECT(cfd));
+   
+   e_configure_registry_item_del("fileman/file_icons");
    e_configure_registry_item_del("fileman/fileman");
    e_configure_registry_category_del("fileman");
 
diff --git a/src/modules/fileman/e_mod_main.h b/src/modules/fileman/e_mod_main.h
index de90a4fcb..b9fd666b6 100644
--- a/src/modules/fileman/e_mod_main.h
+++ b/src/modules/fileman/e_mod_main.h
@@ -11,9 +11,13 @@ typedef struct _Config Config;
 
 #define E_TYPEDEFS 1
 #include "e_fwin.h"
+#include "e_int_config_mime_edit.h"
+#include "e_int_config_mime.h"
 
 #undef E_TYPEDEFS
 #include "e_fwin.h"
+#include "e_int_config_mime_edit.h"
+#include "e_int_config_mime.h"
 
 struct _Config 
 {