diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index cf88e58..ffe801f 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -75,13 +75,13 @@ _item_menu_create(Evas_Object *win)
    menu = elm_menu_add(win);
    evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL);
 
-   elm_menu_item_add(menu, NULL, NULL, "open", _item_menu_open_cb, NULL);
+   elm_menu_item_add(menu, NULL, "fileopen", "open", _item_menu_open_cb, NULL);
 
-   menu_it = elm_menu_item_add(menu, NULL, NULL, "xdg-open",
+   menu_it = elm_menu_item_add(menu, NULL, "gtk-execute", "open external",
                                _item_menu_xdgopen_cb, NULL);
    menu_it = elm_menu_item_add(menu, NULL, NULL, "open as", NULL, NULL);
-   elm_menu_item_add(menu, menu_it, NULL, "text", _item_menu_open_as_text_cb, NULL);
-   elm_menu_item_add(menu, menu_it, NULL, "image", _item_menu_open_as_image_cb, NULL);
+   elm_menu_item_add(menu, menu_it, "txt", "text", _item_menu_open_as_text_cb, NULL);
+   elm_menu_item_add(menu, menu_it, "image", "image", _item_menu_open_as_image_cb, NULL);
 }
 
 static void
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 73f6fea..e2aa64c 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -131,8 +131,8 @@ edi_toolbar_setup(Evas_Object *win)
    elm_toolbar_align_set(tb, 0.0);
    evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
 
-   tb_it = elm_toolbar_item_append(tb, "save", "Save", _tb_save_cb, NULL);
-   tb_it = elm_toolbar_item_append(tb, "close", "Close", _tb_close_cb, NULL);
+   tb_it = elm_toolbar_item_append(tb, "filesave", "Save", _tb_save_cb, NULL);
+   tb_it = elm_toolbar_item_append(tb, "window-close", "Close", _tb_close_cb, NULL);
 
    tb_it = elm_toolbar_item_append(tb, "separator", "", NULL, NULL);
    elm_toolbar_item_separator_set(tb_it, EINA_TRUE);