diff --git a/src/bin/e_int_config_background.c b/src/bin/e_int_config_background.c
index a1bdbb10f..5a7a510a3 100644
--- a/src/bin/e_int_config_background.c
+++ b/src/bin/e_int_config_background.c
@@ -114,7 +114,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_table_object_append(ot, il, 0, 0, 1, 2, 1, 1, 1, 1);
 
    /* Add import Button */
-   o = e_widget_button_add(evas, _("Import An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL);
+   o = e_widget_button_add(evas, _("Select An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL);
    e_widget_table_object_append(ot, o, 0, 2, 1, 1, 1, 0, 0, 0);
    
    of = e_widget_framelist_add(evas, _("Background Preview"), 0);
@@ -180,7 +180,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_table_object_append(ot, il, 0, 0, 1, 3, 1, 1, 1, 1);
 
    /* Add import Button */
-   o = e_widget_button_add(evas, _("Import An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL);
+   o = e_widget_button_add(evas, _("Select An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL);
    e_widget_table_object_append(ot, o, 0, 3, 1, 1, 1, 0, 0, 0);
    
    of = e_widget_framelist_add(evas, _("Background Preview"), 0);
diff --git a/src/bin/e_int_config_background_import.c b/src/bin/e_int_config_background_import.c
index dd7559f8d..18fd5e358 100644
--- a/src/bin/e_int_config_background_import.c
+++ b/src/bin/e_int_config_background_import.c
@@ -199,11 +199,11 @@ e_int_config_background_import(E_Config_Dialog *parent)
    edje_object_part_swallow(import->bg_obj, "content_swallow", o);
    evas_object_show(o);
    
-   import->ok_obj = e_widget_button_add(evas, _("Import"), NULL, _import_cb_ok, win, cfdata);
+   import->ok_obj = e_widget_button_add(evas, _("Ok"), NULL, _import_cb_ok, win, cfdata);
    e_widget_disabled_set(import->ok_obj, 1);
    e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
 
-   import->close_obj = e_widget_button_add(evas, _("Close"), NULL, _import_cb_close, win, NULL);
+   import->close_obj = e_widget_button_add(evas, _("Cancel"), NULL, _import_cb_close, win, NULL);
    e_widget_list_object_append(import->box_obj, import->close_obj, 1, 0, 0.5);
    
    e_win_centered_set(win, 1);
@@ -374,19 +374,32 @@ _import_cb_ok(void *data, void *data2)
    Evas *evas;
    E_Win *win;
    E_Config_Dialog_Data *cfdata;
+   Bg_Import_Window *import;
    
    win = data;   
+   import = win->data;
    cfdata = data2;
+
+   if (!cfdata->file[0]) 
+     {
+	if (import) e_widget_disabled_set(import->ok_obj, 1);
+	return;
+     }
    
-   if (!cfdata->file[0]) return;
 
    f = e_fm_file_new(cfdata->file);
    if (!f) return;
-   if (!e_fm_file_is_image(f)) return;
+   if (!e_fm_file_is_image(f)) 
+     { 
+	if (import) e_widget_disabled_set(import->ok_obj, 1);
+	return;
+     }
+   
    free(f);
 
    evas = e_win_evas_get(win);
    _bg_edj_gen(evas, cfdata->file, cfdata->method);
+   if (import) e_widget_disabled_set(import->ok_obj, 1);
 }
 
 static void