diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index ee5d0ba..95b31bd 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -1369,10 +1369,7 @@ _edi_toolbar_item_add(Evas_Object *tb, const char *icon, const char *name, Evas_
    if (_edi_project_config->gui.toolbar_text_visible)
      item_name = name;
 
-   if (!_edi_project_config->gui.internal_icons)
-     tb_it = elm_toolbar_item_append(tb, icon, item_name, func, NULL);
-   else
-     tb_it = elm_toolbar_item_append(tb, edi_theme_icon_path_get(icon), item_name, func, NULL);
+   tb_it = elm_toolbar_item_append(tb, edi_theme_icon_path_get(icon), item_name, func, NULL);
 
    content = elm_toolbar_item_object_get(tb_it);
    elm_object_tooltip_text_set(content, name);
@@ -1597,6 +1594,7 @@ _edi_config_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EI
    edi_theme_window_alpha_set();
 
    _edi_toolbar_config_changed();
+   edi_filepanel_refresh_all();
 
    return ECORE_CALLBACK_RENEW;
 }
diff --git a/src/bin/edi_theme.c b/src/bin/edi_theme.c
index 9030ab9..72b63a1 100644
--- a/src/bin/edi_theme.c
+++ b/src/bin/edi_theme.c
@@ -159,6 +159,9 @@ edi_theme_icon_path_get(const char *name)
    const char *icon_path, *directory = PACKAGE_DATA_DIR "/icons";
    icon_path = name;
 
+   if (!edi_theme_internal_icons_get())
+     return name;
+
    path = edi_path_append(directory, eina_slstr_printf("%s.png", name));
    if (path)
      {
diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c
index 120eeac..2b5ea82 100644
--- a/src/bin/screens/edi_settings.c
+++ b/src/bin/screens/edi_settings.c
@@ -265,6 +265,7 @@ _edi_settings_display_create(Evas_Object *parent)
    evas_object_show(container);
 
    frame = _edi_settings_panel_create(parent, _("Display"));
+   elm_object_style_set(frame, "pad_small");
    box = elm_object_part_content_get(frame, "default");
    elm_box_pack_end(container, frame);