diff --git a/data/icons/folder.png b/data/icons/folder.png
new file mode 100644
index 0000000..2bee581
Binary files /dev/null and b/data/icons/folder.png differ
diff --git a/data/icons/meson.build b/data/icons/meson.build
index f36473b..ecb60ff 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -5,7 +5,7 @@ install_data(['document-new.png', 'window-close.png', 'window-close.png',
               'edit-find-replace.png', 'go-jump.png', 'system-run.png',
               'media-record.png', 'media-playback-start.png', 'media-playback-stop.png',
               'utilities-terminal.png', 'help-about.png', 'preferences-desktop.png',
-              'go-up.png', 'go-down.png'
+              'go-up.png', 'go-down.png', 'folder.png'
              ],
              install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'icons')
 )
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index e822873..3789b59 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -14,6 +14,7 @@
 
 #include "edi_filepanel.h"
 #include "edi_file.h"
+#include "edi_theme.h"
 #include "edi_config.h"
 #include "edi_content_provider.h"
 #include "mainview/edi_mainview.h"
@@ -472,29 +473,26 @@ _item_menu_create(Evas_Object *win, Edi_Dir_Data *sd)
    menu = elm_menu_add(win);
    evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL);
 
-   menu_it = elm_menu_item_add(menu, NULL, "document-properties", ecore_file_file_get(sd->path), NULL, NULL);
-   elm_object_item_disabled_set(menu_it, EINA_TRUE);
-   elm_menu_item_separator_add(menu, NULL);
+   menu_it2 = menu_it = elm_menu_item_add(menu, NULL, "document-properties", ecore_file_file_get(sd->path), NULL, NULL);
 
-   elm_menu_item_add(menu, NULL, "fileopen", _("Open"), _item_menu_open_cb, sd);
-   elm_menu_item_add(menu, NULL, "window-new", _("Open in New Window"), _item_menu_open_window_cb, sd);
+   elm_menu_item_add(menu, menu_it, "fileopen", _("Open"), _item_menu_open_cb, sd);
+   elm_menu_item_add(menu, menu_it, "window-new", _("Open in New Window"), _item_menu_open_window_cb, sd);
 
-   menu_it = elm_menu_item_add(menu, NULL, "object-flip-horizontal", _("Open in New Panel"), _item_menu_open_panel_cb, sd);
+   menu_it = elm_menu_item_add(menu, menu_it, "object-flip-horizontal", _("Open in New Panel"), _item_menu_open_panel_cb, sd);
 
-   menu_it = elm_menu_item_add(menu, NULL, NULL, eina_slstr_printf("%s...", _("Open as")), NULL, NULL);
+   menu_it = elm_menu_item_add(menu, menu_it2, NULL, eina_slstr_printf("%s...", _("Open as")), NULL, NULL);
    _item_menu_filetype_create(menu, menu_it, "text", _item_menu_open_as_text_cb, sd);
    _item_menu_filetype_create(menu, menu_it, "code", _item_menu_open_as_code_cb, sd);
    _item_menu_filetype_create(menu, menu_it, "image", _item_menu_open_as_image_cb, sd);
 
-   menu_it = elm_menu_item_add(menu, NULL, "gtk-execute", _("Open External"),
+   menu_it = elm_menu_item_add(menu, menu_it, "gtk-execute", _("Open External"),
                                _item_menu_xdgopen_cb, sd);
-   elm_menu_item_separator_add(menu, NULL);
-
    if (edi_scm_enabled())
      {
         status = _edi_filepanel_file_scm_status(sd->path);
+        elm_menu_item_separator_add(menu, menu_it2);
 
-        menu_it = elm_menu_item_add(menu, NULL, NULL, eina_slstr_printf("%s...", _("Source Control")), NULL, NULL);
+        menu_it = elm_menu_item_add(menu, menu_it2, NULL, eina_slstr_printf("%s...", _("Source Control")), NULL, NULL);
 
         menu_it2 = elm_menu_item_add(menu, menu_it, "edit-undo", _("Undo Changes"), _item_menu_scm_undo_cb, sd);
         if (status == EDI_FILE_STATUS_UNMODIFIED || status == EDI_FILE_STATUS_STAGED)
@@ -607,19 +605,17 @@ _item_menu_dir_create(Evas_Object *win, Edi_Dir_Data *sd)
    evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL);
 
    menu_it = elm_menu_item_add(menu, NULL, "folder", ecore_file_file_get(sd->path), NULL, NULL);
-   elm_object_item_disabled_set(menu_it, EINA_TRUE);
-   elm_menu_item_separator_add(menu, NULL);
 
-   elm_menu_item_add(menu, NULL, "document-new", _("Create File here"), _item_menu_create_file_cb, sd);
-   elm_menu_item_add(menu, NULL, "folder-new", _("Create Directory here"), _item_menu_create_dir_cb, sd);
+   elm_menu_item_add(menu, menu_it, "document-new", _("Create File here"), _item_menu_create_file_cb, sd);
+   elm_menu_item_add(menu, menu_it, "folder-new", _("Create Directory here"), _item_menu_create_dir_cb, sd);
    if (ecore_file_app_installed("terminology"))
-     elm_menu_item_add(menu, NULL, "utilities-terminal", _("Open Terminal here"), _item_menu_open_terminal_cb, sd);
+     elm_menu_item_add(menu, menu_it, "utilities-terminal", _("Open Terminal here"), _item_menu_open_terminal_cb, sd);
 
    if (strcmp(sd->path, edi_project_get()))
      {
-        elm_menu_item_add(menu, NULL, "document-save-as", _("Rename Directory"), _item_menu_rename_cb, sd);
+        elm_menu_item_add(menu, menu_it, "document-save-as", _("Rename Directory"), _item_menu_rename_cb, sd);
         if (ecore_file_dir_is_empty(sd->path))
-          elm_menu_item_add(menu, NULL, "edit-delete", _("Remove Directory"), _item_menu_rmdir_cb, sd);
+          elm_menu_item_add(menu, menu_it, "edit-delete", _("Remove Directory"), _item_menu_rmdir_cb, sd);
      }
 }
 
@@ -709,7 +705,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
    evas_object_show(lbox);
 
    ic = elm_icon_add(lbox);
-   elm_icon_standard_set(ic, icon_name);
+   elm_icon_standard_set(ic, edi_theme_icon_path_get(icon_name));
    evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
    evas_object_show(ic);
    elm_box_pack_end(lbox, ic);
@@ -795,7 +791,7 @@ _content_dir_get(void *data EINA_UNUSED, Evas_Object *obj, const char *source)
      return NULL;
 
    ic = elm_icon_add(obj);
-   elm_icon_standard_set(ic, "folder");
+   elm_icon_standard_set(ic, edi_theme_icon_path_get("folder"));
    evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
    evas_object_show(ic);
    return ic;
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index a0df22d..5848bde 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -302,7 +302,7 @@ _edi_toggle_panel(void *data, Evas_Object *obj, void *event_info)
 
    if (item == _edi_selected_bottompanel)
      {
-        elm_toolbar_item_icon_set(item, "go-up");
+        elm_toolbar_item_icon_set(item, edi_theme_icon_path_get("go-up"));
 
         _edi_slide_panel_new(_edi_bottompanes, panel, _edi_project_config->gui.bottomsize, EINA_FALSE, EINA_FALSE);
         _edi_selected_bottompanel = NULL;
@@ -1403,6 +1403,8 @@ edi_toolbar_win_add(void)
    evas_object_show(notify);
 
    tb = elm_toolbar_add(box);
+   elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_NONE);
+   elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_DEFAULT);
    elm_toolbar_horizontal_set(tb, _edi_project_config->gui.toolbar_horizontal);
    elm_toolbar_homogeneous_set(tb, EINA_FALSE);
    elm_toolbar_align_set(tb, 0.0);
@@ -1411,8 +1413,6 @@ edi_toolbar_win_add(void)
    evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
    elm_object_focus_allow_set(tb, EINA_FALSE);
-   elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_NONE);
-   elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_NONE);
 
    _edi_toolbar_item_add(tb, "document-new", _("New File"), _tb_new_cb);
    _edi_toolbar_save =_edi_toolbar_item_add(tb, "document-save", _("Save"), _tb_save_cb);