diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 050db2961..b2cf2babf 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -1665,7 +1665,15 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic)
 		  if (ic->sd->config->icon.key_hint)
 		    e_thumb_icon_file_set(ic->obj_icon, buf, ic->sd->config->icon.key_hint);
 		  else
-		    e_thumb_icon_file_set(ic->obj_icon, buf, "e/desktop/background");
+		     {
+                        /* FIXME: There is probably a quicker way of doing this. */
+                        if (edje_file_group_exists(buf, "icon"))
+		           e_thumb_icon_file_set(ic->obj_icon, buf, "icon");
+                        else if (edje_file_group_exists(buf, "e/desktop/background"))
+		           e_thumb_icon_file_set(ic->obj_icon, buf, "e/desktop/background");
+                        else if (edje_file_group_exists(buf, "e/init/splash"))
+		           e_thumb_icon_file_set(ic->obj_icon, buf, "e/init/splash");
+		     }
 		  e_thumb_icon_size_set(ic->obj_icon, 128, 96);
 		  evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic);
 		  _e_fm2_icon_thumb(ic);
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 7c386b190..9ecb2a341 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -340,8 +340,8 @@ _e_thumb_generate(E_Thumb *eth)
 	     evas_object_image_fill_set(im, 0, 0, ww, hh);
 	     edje = edje_object_add(evas_im);
 	     if ((eth->key) && 
-		 ((!strcmp(eth->key, "e/desktop/background")) ||
-		  (!strcmp(eth->key, "e/init/splash"))))
+		 ( (!strcmp(eth->key, "e/desktop/background")) ||
+		   (!strcmp(eth->key, "e/init/splash")) ))
 	       alpha = 0;
 	     if (edje_object_file_set(edje, eth->file, eth->key))
 	       {
diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c
index 6aba9c1ed..7d5be9437 100644
--- a/src/bin/e_widget_preview.c
+++ b/src/bin/e_widget_preview.c
@@ -81,7 +81,15 @@ e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key,
 
    wd->img = e_thumb_icon_add(evas_object_evas_get(obj));
    if (e_util_glob_case_match(file, "*.edj"))
-     e_thumb_icon_file_set(wd->img, file, "e/desktop/background");
+      {
+         /* FIXME: There is probably a quicker way of doing this. */
+         if (edje_file_group_exists(file, "icon"))
+            e_thumb_icon_file_set(wd->img, file, "icon");
+         else if (edje_file_group_exists(file, "e/desktop/background"))
+            e_thumb_icon_file_set(wd->img, file, "e/desktop/background");
+         else if (edje_file_group_exists(file, "e/init/splash"))
+	    e_thumb_icon_file_set(wd->img, file, "e/init/splash");
+      }
    else
      e_thumb_icon_file_set(wd->img, file, NULL);
    e_thumb_icon_size_set(wd->img, w, h);