diff --git a/src/modules/conf_dialogs/e_int_config_profiles.c b/src/modules/conf_dialogs/e_int_config_profiles.c
index 6d62c5f3c..e83e56f91 100644
--- a/src/modules/conf_dialogs/e_int_config_profiles.c
+++ b/src/modules/conf_dialogs/e_int_config_profiles.c
@@ -303,8 +303,8 @@ _cb_delete(void *data, void *data2 __UNUSED__)
    snprintf(buf, sizeof(buf), 
             _("You want to delete the \"%s\" profile.<br><br>"
               "Are you sure?"), d->cfdata->sel_profile);
-   e_confirm_dialog_show(_("Delete OK?"),
-                         "dialog-warning", buf, NULL, NULL, 
+   e_confirm_dialog_show(_("Are you sure you want to delete this profile?"),
+                         "dialog-warning", buf, _("Delete"), _("Keep"), 
                          _cb_dialog_yes, NULL, d, NULL,
                          _cb_dialog_destroy, d);
 }
@@ -384,7 +384,7 @@ _dia_new_profile(E_Config_Dialog_Data *cfdata)
    e_widget_size_min_get(ot, &mw, &mh);
    e_dialog_content_set(dia, ot, mw, mh);
 
-   e_dialog_button_add(dia, _("OK"), NULL, _new_profile_cb_ok, cfdata);
+   e_dialog_button_add(dia, _("Add"), NULL, _new_profile_cb_ok, cfdata);
    e_dialog_button_add(dia, _("Cancel"), NULL, _new_profile_cb_close, cfdata);
 
    e_dialog_resizable_set(dia, 0);
diff --git a/src/modules/conf_performance/e_int_config_engine.c b/src/modules/conf_performance/e_int_config_engine.c
index 4f5297d63..152ffd443 100644
--- a/src/modules/conf_performance/e_int_config_engine.c
+++ b/src/modules/conf_performance/e_int_config_engine.c
@@ -111,8 +111,8 @@ _cb_composite_change(void *data, Evas_Object *obj __UNUSED__)
 				   _("You have chosen to enable ARGB composite "
 				     "support,<br>but your current screen does "
 				     "not support composite.<br><br>"
-				     "Are you sure you wish to enable ARGB support ?"),
-				   NULL, NULL, _cb_confirm_yes, _cb_confirm_no,
+				     "Are you sure you wish to enable ARGB support?"),
+				   _("Enable"), NULL, _cb_confirm_yes, _cb_confirm_no,
 				   cfdata, cfdata, NULL, NULL);
 	  }
      }
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 95fef6e3e..8d4e4381d 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -290,7 +290,7 @@ _cb_delete(void *data, void *data2 __UNUSED__)
 	    d->cfdata->cur_shelf);
 
    e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), 
-			 "application-exit", buf, NULL, NULL, 
+			 "application-exit", buf, _("Delete"), _("Keep"), 
 			 _cb_dialog_yes, NULL, d, NULL, _cb_dialog_destroy, d);
 }
 
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index 82b0fece3..bf70187af 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -181,7 +181,7 @@ _cb_del(void *data, void *data2 __UNUSED__)
             cfdata->dir);
 
    dialog = e_confirm_dialog_show(_("Are you sure you want to delete this bar source?"),
-                                  "application-exit", buf, NULL, NULL,
+                                  "application-exit", buf, _("Delete"), _("Keep"),
                                   _cb_confirm_dialog_yes, NULL, cfdata, NULL,
                                   _cb_confirm_dialog_destroy, cfdata);
    cfdata->dialog_delete = dialog;