diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 9b1bc7870..f06b697ec 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -18,7 +18,8 @@ e_bg_init(void)
    Evas_List *l = NULL;
 
    /* Register mime handler */
-   bg_hdl = e_fm2_mime_handler_new(_("Set As Background"), NULL, 
+   bg_hdl = e_fm2_mime_handler_new(_("Set As Background"), 
+				   "enlightenment/background", 
 				   e_bg_handler_set, NULL, 
 				   e_bg_handler_test, NULL);
    e_fm2_mime_handler_glob_add(bg_hdl, "*.edj");
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 43e288676..b661c681b 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -6942,7 +6942,8 @@ _e_fm2_context_menu_append(Evas_List *l, E_Menu *mn, E_Fm2_Icon *ic)
 	     md->handler = handler;
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, handler->label);
-	     /* TODO: Add Icon */
+	     if (handler->icon_group)
+	       e_util_menu_item_edje_icon_set(mi, handler->icon_group);
 	     e_menu_item_callback_set(mi, _e_fm2_icon_menu_item_cb, md);
 	  }
      }