diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c
index 5f7b7948e..df891acb4 100644
--- a/src/modules/mixer/app_mixer.c
+++ b/src/modules/mixer/app_mixer.c
@@ -506,6 +506,15 @@ _cb_dialog_dismiss(void *data, E_Dialog *dialog)
    _mixer_app_dialog_del(dialog, data);
 }
 
+static void
+_cb_dialog_del(void *obj)
+{
+   E_Dialog *dialog;
+   
+   dialog = obj;
+   _mixer_app_dialog_del(dialog, dialog->data);
+}
+
 E_Dialog *
 e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *data), void *data)
 {
@@ -534,6 +543,8 @@ e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *da
 
    _create_ui(dialog, app);
 
+   e_object_del_attach_func_set(E_OBJECT(dialog), _cb_dialog_del);
+   
    e_dialog_button_add(dialog, _("Close"), NULL, _cb_dialog_dismiss, app);
    e_dialog_button_focus_num(dialog, 1);
    e_win_centered_set(dialog->win, 1);
diff --git a/src/modules/mixer/e-module-mixer.edj b/src/modules/mixer/e-module-mixer.edj
index b3db7a031..e3bdf6f39 100644
Binary files a/src/modules/mixer/e-module-mixer.edj and b/src/modules/mixer/e-module-mixer.edj differ
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index bab9f4b67..cc29e8adc 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -826,10 +826,8 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    e_mixer_system_callback_set(inst->sys, _mixer_system_cb_update, inst);
 
    inst->ui.gadget = edje_object_add(gc->evas);
-   if (!e_theme_edje_object_set(inst->ui.gadget, "base/theme/modules/mixer",
-                                "e/modules/mixer/main"))
-     edje_object_file_set(inst->ui.gadget, e_mixer_theme_path(),
-			  "e/modules/mixer/main");
+   e_theme_edje_object_set(inst->ui.gadget, "base/theme/modules/mixer",
+			   "e/modules/mixer/main");
 
    inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->ui.gadget);
    inst->gcc->data = inst;
diff --git a/src/modules/mixer/module.desktop.in b/src/modules/mixer/module.desktop.in
index 67bb8d4da..cae21bab1 100644
--- a/src/modules/mixer/module.desktop.in
+++ b/src/modules/mixer/module.desktop.in
@@ -4,3 +4,4 @@ Name=Mixer
 Icon=e-module-mixer
 Comment=<hilight>Mixer Gadget</hilight><br><br>A module to provide a mixer for changing volume.
 Comment[it]=<hilight>Modulo Mixer</hilight><br><br>Un modulo che fornisce un mixer per regolare il volume.
+X-Enlightenment-ModuleType=system