diff --git a/src/modules/mixer/e-module-mixer.edj b/src/modules/mixer/e-module-mixer.edj
index 5da0b8f3e..aecc9369c 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/module.desktop b/src/modules/mixer/module.desktop
index 9b1be6b96..357bbc264 100644
--- a/src/modules/mixer/module.desktop
+++ b/src/modules/mixer/module.desktop
@@ -33,5 +33,5 @@ Comment[pt]=Um módulo que disponibiliza um controlo para alterar o volume
 Comment[ru]=Модуль для управления уровнями громкости.
 Comment[sr]=Јединица која обезбеђује мешач за промену јачине звука.
 Comment[tr]=Sesi ayarlarmak için kullanılan karıştırıcı modülü.
-Icon=preferences-desktop-mixer
+Icon=e-module-mixer
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c
index 2a42ebc9e..e7734f429 100644
--- a/src/modules/syscon/e_syscon_gadget.c
+++ b/src/modules/syscon/e_syscon_gadget.c
@@ -138,11 +138,11 @@ static Evas_Object *
 _gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas)
 {
    Evas_Object *obj;
-   char buff[PATH_MAX];
 
-   snprintf(buff, sizeof(buff), "%s/e-module-syscon.edj", e_module_dir_get(mod));
    obj = edje_object_add(evas);
-   edje_object_file_set(obj, buff, "gadget_icon");
+   e_theme_edje_object_set(obj,
+                           "base/theme/modules/syscon",
+                           "e/modules/syscon/button");
    return obj;
 }
 
diff --git a/src/modules/xkbswitch/e-module-xkbswitch.edj b/src/modules/xkbswitch/e-module-xkbswitch.edj
index 349383ccb..2230976c2 100644
Binary files a/src/modules/xkbswitch/e-module-xkbswitch.edj and b/src/modules/xkbswitch/e-module-xkbswitch.edj differ
diff --git a/src/modules/xkbswitch/module.desktop b/src/modules/xkbswitch/module.desktop
index d51ba42bd..84c0b3eb9 100644
--- a/src/modules/xkbswitch/module.desktop
+++ b/src/modules/xkbswitch/module.desktop
@@ -33,5 +33,5 @@ Comment[pt]=Configuração e alteração dos esquemas de teclado.
 Comment[ru]=Настройка и переключение раскладки клавиатуры.
 Comment[sr]=Подешавања распореда и измењивача тастатуре.
 Comment[tr]=Klavye yerleşim yapılandırma ve değiştirici.
-Icon=preferences-desktop-keyboard
+Icon=e-module-xkbswitch
 X-Enlightenment-ModuleType=utils