diff --git a/src/modules/conf/e-module-conf.edj b/src/modules/conf/e-module-conf.edj
index 5139729c8..c651d5fcb 100644
Binary files a/src/modules/conf/e-module-conf.edj and b/src/modules/conf/e-module-conf.edj differ
diff --git a/src/modules/gadman/e-module-gadman.edj b/src/modules/gadman/e-module-gadman.edj
index 256b3bf02..1b27171a1 100644
Binary files a/src/modules/gadman/e-module-gadman.edj and b/src/modules/gadman/e-module-gadman.edj differ
diff --git a/src/modules/notification/e-module-notification.edj b/src/modules/notification/e-module-notification.edj
index e0ae3a60a..63202f718 100644
Binary files a/src/modules/notification/e-module-notification.edj and b/src/modules/notification/e-module-notification.edj differ
diff --git a/src/modules/polkit/e-module-polkit.edj b/src/modules/polkit/e-module-polkit.edj
index 807f83df4..6a2d84b43 100644
Binary files a/src/modules/polkit/e-module-polkit.edj and b/src/modules/polkit/e-module-polkit.edj differ
diff --git a/src/modules/syscon/e-module-syscon.edj b/src/modules/syscon/e-module-syscon.edj
index 1813b3f5a..7a028cffb 100644
Binary files a/src/modules/syscon/e-module-syscon.edj and b/src/modules/syscon/e-module-syscon.edj differ
diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c
index 6e9a06cc3..2a42ebc9e 100644
--- a/src/modules/syscon/e_syscon_gadget.c
+++ b/src/modules/syscon/e_syscon_gadget.c
@@ -88,16 +88,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
 
    inst = E_NEW(Instance, 1);
    inst->o_base = edje_object_add(gc->evas);
-   if (!e_theme_edje_object_set(inst->o_base,
-                                "base/theme/modules/syscon",
-                                "e/modules/syscon/button"))
-     {
-        char buff[PATH_MAX];
-
-        snprintf(buff, sizeof(buff), "%s/e-module-syscon.edj", e_module_dir_get(mod));
-        edje_object_file_set(inst->o_base, buff,
-                             "e/modules/syscon/button");
-     }
+   e_theme_edje_object_set(inst->o_base,
+                           "base/theme/modules/syscon",
+                           "e/modules/syscon/button");
    inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_base);
    inst->gcc->data = inst;
 
diff --git a/src/modules/tiling/e-module-tiling.edj b/src/modules/tiling/e-module-tiling.edj
index 7777c95bb..7fcf4aacc 100644
Binary files a/src/modules/tiling/e-module-tiling.edj and b/src/modules/tiling/e-module-tiling.edj differ
diff --git a/src/modules/vkbd/e-module-vkbd.edj b/src/modules/vkbd/e-module-vkbd.edj
index f2dd5d4bb..89efcc448 100644
Binary files a/src/modules/vkbd/e-module-vkbd.edj and b/src/modules/vkbd/e-module-vkbd.edj differ
diff --git a/src/modules/winlist/e-module-winlist.edj b/src/modules/winlist/e-module-winlist.edj
index 25fba8aac..4e8770eeb 100644
Binary files a/src/modules/winlist/e-module-winlist.edj and b/src/modules/winlist/e-module-winlist.edj differ