diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 4b59528ef..43602a3bb 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -400,7 +400,7 @@ _bar_icon_menu_item_new(Icon *ic, Evas_Object *popup, Evas_Object *parent, const
      {
         path = icon;
      }
-   if (!path)
+   if (!path && icon)
      {
         snprintf(buf, sizeof(buf), "e/icons/%s", icon);
         if (eina_list_count(e_theme_collection_items_find("base/theme/icons", buf)))
@@ -414,6 +414,11 @@ _bar_icon_menu_item_new(Icon *ic, Evas_Object *popup, Evas_Object *parent, const
              k =  "e/icons/unknown";
           }
      }
+   else if (!path && !icon)
+     {
+        path = e_theme_edje_file_get("base/theme/icons", "e/icons/unknown");
+        k =  "e/icons/unknown";
+     }
    if (path && icon)
      {
         len = strlen(icon);
@@ -1040,7 +1045,7 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, E_Client *non_desktop_cli
           {
              path = desktop->icon;
           }
-        if (!path)
+        if (!path && desktop->icon)
           {
              snprintf(buf, sizeof(buf), "e/icons/%s", desktop->icon);
              if (eina_list_count(e_theme_collection_items_find("base/theme/icons", buf)))
@@ -1054,6 +1059,11 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, E_Client *non_desktop_cli
                   k =  "e/icons/unknown";
                }
           }
+        else if (!path && !desktop->icon)
+          {
+             path = e_theme_edje_file_get("base/theme/icons", "e/icons/unknown");
+             k = "e/icons/unknown";
+          }
         if (path && desktop->icon && !k)
           {
              len = strlen(desktop->icon);
diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c
index bae649096..743e1b74a 100644
--- a/src/modules/luncher/config.c
+++ b/src/modules/luncher/config.c
@@ -238,7 +238,7 @@ _icon_theme_file_set(Evas_Object *img, const char *icon)
      {
         path = icon;
      }
-   if (!path)
+   if (!path && icon)
      {
         snprintf(buf, sizeof(buf), "e/icons/%s", icon);
         if (eina_list_count(e_theme_collection_items_find("base/theme/icons", buf)))
@@ -252,6 +252,11 @@ _icon_theme_file_set(Evas_Object *img, const char *icon)
              k =  "e/icons/unknown";
           }
      }
+   else if (!path && !icon)
+     {
+        path = e_theme_edje_file_get("base/theme/icons", "e/icons/unknown");
+        k =  "e/icons/unknown";
+     }
    if (path && icon)
      {
         len = strlen(icon);
diff --git a/src/modules/luncher/grid.c b/src/modules/luncher/grid.c
index 68b223a00..2a22a870d 100644
--- a/src/modules/luncher/grid.c
+++ b/src/modules/luncher/grid.c
@@ -286,7 +286,7 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
      {
         path = desktop->icon;
      }
-   if (!path)
+   if (!path && desktop->icon)
      {
         snprintf(buf, sizeof(buf), "e/icons/%s", desktop->icon);
         if (eina_list_count(e_theme_collection_items_find("base/theme/icons", buf)))
@@ -300,6 +300,11 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
              k =  "e/icons/unknown";
           }
      }
+   else if (!path && !desktop->icon)
+     {
+        path = e_theme_edje_file_get("base/theme/icons", "e/icons/unknown");
+        k =  "e/icons/unknown";
+     }
    elm_image_file_set(ic->o_icon, path, k);
    elm_object_tooltip_text_set(ic->o_icon, desktop->name);
    elm_object_tooltip_orient_set(ic->o_icon, ELM_TOOLTIP_ORIENT_CENTER);
diff --git a/src/modules/sysinfo/batman/batman_config.c b/src/modules/sysinfo/batman/batman_config.c
index 40fc97cc3..5622c0af4 100644
--- a/src/modules/sysinfo/batman/batman_config.c
+++ b/src/modules/sysinfo/batman/batman_config.c
@@ -217,7 +217,7 @@ _icon_theme_file_set(Evas_Object *img, const char *icon)
      {
         path = icon;
      }
-   if (!path)
+   if (!path && icon)
      {
         snprintf(buf, sizeof(buf), "e/icons/%s", icon);
         if (eina_list_count(e_theme_collection_items_find("base/theme/icons", buf)))
@@ -231,6 +231,12 @@ _icon_theme_file_set(Evas_Object *img, const char *icon)
              k =  "e/icons/unknown";
           }
      }
+   else if (!path && !icon)
+     {
+        path = e_theme_edje_file_get("base/theme/icons", "e/icons/unknown");
+        k =  "e/icons/unknown";
+     }
+
    if (path && icon)
      {
         len = strlen(icon);