diff --git a/src/bin/e_widget_label.c b/src/bin/e_widget_label.c
index cf6dd444b..3dc4acec1 100644
--- a/src/bin/e_widget_label.c
+++ b/src/bin/e_widget_label.c
@@ -22,7 +22,6 @@ EAPI Evas_Object *
 e_widget_label_add(Evas *evas, const char *label)
 {
    Evas_Object *obj, *o;
-   Evas_Coord mw, mh;
    E_Widget_Data *wd;
 
    obj = e_widget_add(evas);
@@ -31,17 +30,13 @@ e_widget_label_add(Evas *evas, const char *label)
    wd = calloc(1, sizeof(E_Widget_Data));
    e_widget_data_set(obj, wd);
 
-   o = edje_object_add(evas);
-   e_theme_edje_object_set(o, "base/theme/widgets",
-                           "e/widgets/label");
+   o = elm_label_add(e_win_evas_win_get(evas));
    wd->text = o;
-   edje_object_part_text_set(o, "e.text.label", label);
    evas_object_show(o);
-   edje_object_size_min_calc(o, &mw, &mh);
    e_widget_can_focus_set(obj, 0);
-   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
+   elm_object_text_set(o, label);
 
    return obj;
 }
@@ -56,13 +51,9 @@ EAPI void
 e_widget_label_text_set(Evas_Object *obj, const char *text)
 {
    E_Widget_Data *wd;
-   Evas_Coord mw, mh;
 
    wd = e_widget_data_get(obj);
-   edje_object_part_text_set(wd->text, "e.text.label", text);
-   edje_object_size_min_calc(wd->text, &mw, &mh);
-   evas_object_size_hint_min_set(wd->text, mw, mh);
-   e_widget_size_min_set(obj, mw, mh);
+   elm_object_text_set(wd->text, text);
 }
 
 static void
@@ -80,9 +71,6 @@ _e_wid_disable_hook(Evas_Object *obj)
    E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
-   if (e_widget_disabled_get(obj))
-     edje_object_signal_emit(wd->text, "e,state,disabled", "e");
-   else
-     edje_object_signal_emit(wd->text, "e,state,enabled", "e");
+   elm_object_disabled_set(wd->text, e_widget_disabled_get(obj));
 }