diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 244ee7f30..a3377c150 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -514,8 +514,6 @@ _fill_list(E_Config_Dialog_Data *cfdata)
 		  if (m->enabled) cm->state = MOD_ENABLED;
 	       }
 	     snprintf(buf, sizeof(buf), "%s/module.desktop", cm->path);
-	     if (!ecore_file_exists(buf))
-	        snprintf(buf, sizeof(buf), "%s/module.eap", cm->path);
 	     
 	     a = e_app_new(buf, 1);
 	     if (a)
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 5856584c7..bc396920c 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -487,7 +487,7 @@ _e_int_menus_apps_scan(E_Menu *m)
 		       char buf[4096];
 		       
                        /* FIXME: .directory.eaps are obsolete, but have yet to be replaced by FDO stuff. */
-		       snprintf(buf, sizeof(buf), "%s/.directory.eap", a->path);
+		       snprintf(buf, sizeof(buf), "%s/.directory.desktop", a->path);
 		       if (!((a->icon_class) && 
 			     (e_util_menu_item_edje_icon_list_set(mi, a->icon_class))))
 		          /*e_menu_item_icon_edje_set(mi, buf, "icon")*/;
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 545ed6e98..058457718 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -396,11 +396,6 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
 	         {
 	            _e_module_dialog_icon_set(dia, eap);
 		 }
-	      else
-	         {
-	            snprintf(eap, sizeof(eap), "%s/module.eap", e_module_dir_get(m));
-	            _e_module_dialog_icon_set(dia, eap);
-	         }
 	   }
      }
    else