diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 7785be7..4c2b759 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -842,16 +842,16 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent)
    
    elm_toolbar_item_separator_set(elm_toolbar_item_append(sb->bar, NULL, NULL, NULL, NULL), EINA_TRUE);
 
-   icon = elm_toolbar_item_append(sb->bar, "zoom-in", "In", _zoom_in_cb, sb);
+   icon = elm_toolbar_item_append(sb->bar, "zoom-in", "Zoom In", _zoom_in_cb, sb);
    elm_toolbar_item_priority_set(icon, 100);
 
-   icon = elm_toolbar_item_append(sb->bar, "zoom-out", "Out", _zoom_out_cb, sb);
+   icon = elm_toolbar_item_append(sb->bar, "zoom-out", "Zoom Out", _zoom_out_cb, sb);
    elm_toolbar_item_priority_set(icon, 100);
 
-   icon = elm_toolbar_item_append(sb->bar, "zoom-fit", "Fit", _zoom_fit_cb, sb);
+   icon = elm_toolbar_item_append(sb->bar, "zoom-fit", "Zoom Fit", _zoom_fit_cb, sb);
    elm_toolbar_item_priority_set(icon, 80);
 
-   icon = elm_toolbar_item_append(sb->bar, "zoom-original", "1:1", _zoom_1_cb, sb);
+   icon = elm_toolbar_item_append(sb->bar, "zoom-original", "Zoom 1:1", _zoom_1_cb, sb);
    elm_toolbar_item_priority_set(icon, 80);
    
    elm_toolbar_item_separator_set(elm_toolbar_item_append(sb->bar, NULL, NULL, NULL, NULL), EINA_TRUE);
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 7b2ef88..65b613c 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -379,8 +379,6 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
    _ephoto_thumb_file_class.func.state_get = NULL;
    _ephoto_thumb_file_class.func.del = _ephoto_thumb_item_del;
 
-   elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/themes/default/ephoto.edj");
-
    tb->ephoto = ephoto;
    tb->main = box;
 
@@ -401,7 +399,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
    evas_object_size_hint_align_set(tb->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_object_text_set(tb->entry, "Choose");
    elm_object_part_content_set(tb->entry, "button icon", ic);
-   elm_fileselector_folder_only_set(tb->entry, EINA_FALSE);
+   elm_fileselector_folder_only_set(tb->entry, EINA_TRUE);
    elm_fileselector_entry_inwin_mode_set(tb->entry, EINA_TRUE);
    elm_fileselector_expandable_set(tb->entry, EINA_FALSE);
    evas_object_smart_callback_add