diff --git a/src/modules/conf_applications/e-module-conf_applications.edj b/src/modules/conf_applications/e-module-conf_applications.edj
index 20e4b3cf5..2d898800b 100644
Binary files a/src/modules/conf_applications/e-module-conf_applications.edj and b/src/modules/conf_applications/e-module-conf_applications.edj differ
diff --git a/src/modules/conf_bindings/e-module-conf_bindings.edj b/src/modules/conf_bindings/e-module-conf_bindings.edj
new file mode 100644
index 000000000..75e7a42bb
Binary files /dev/null and b/src/modules/conf_bindings/e-module-conf_bindings.edj differ
diff --git a/src/modules/conf_bindings/meson.build b/src/modules/conf_bindings/meson.build
index 9a2b9ca2a..3f2281c6e 100644
--- a/src/modules/conf_bindings/meson.build
+++ b/src/modules/conf_bindings/meson.build
@@ -10,4 +10,4 @@ src = files(
 if get_option('gesture-recognition') == true
    src += files('e_int_config_swipebindings.c')
 endif
-desktop_only = true
+
diff --git a/src/modules/conf_bindings/module.desktop b/src/modules/conf_bindings/module.desktop
index b55cc4706..016eea044 100644
--- a/src/modules/conf_bindings/module.desktop
+++ b/src/modules/conf_bindings/module.desktop
@@ -31,5 +31,5 @@ Comment[pt]=Definições do rato, teclas e botões.
 Comment[ru]=Настройки управления мышью, клавишами и кнопками.
 Comment[sr]=Поставке управљањем мишем, тастатуром и дугмадима.
 Comment[tr]=Klavye, fare ve düğme denetim ayarları.
-Icon=preferences-desktop-keyboard-shortcuts
+Icon=e-module-conf_bindings
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_dialogs/e-module-conf_dialogs.edj b/src/modules/conf_dialogs/e-module-conf_dialogs.edj
index dfbaf541f..a303fee3d 100644
Binary files a/src/modules/conf_dialogs/e-module-conf_dialogs.edj and b/src/modules/conf_dialogs/e-module-conf_dialogs.edj differ
diff --git a/src/modules/conf_display/e-module-conf_display.edj b/src/modules/conf_display/e-module-conf_display.edj
new file mode 100644
index 000000000..2784de7c8
Binary files /dev/null and b/src/modules/conf_display/e-module-conf_display.edj differ
diff --git a/src/modules/conf_display/meson.build b/src/modules/conf_display/meson.build
index 358aaef1c..3e16c3024 100644
--- a/src/modules/conf_display/meson.build
+++ b/src/modules/conf_display/meson.build
@@ -8,5 +8,3 @@ src = files(
   'e_int_config_screensaver.c',
   'e_mod_main.h'
  )
-
-desktop_only = true
diff --git a/src/modules/conf_display/module.desktop b/src/modules/conf_display/module.desktop
index f37744a0e..a8696b8f2 100644
--- a/src/modules/conf_display/module.desktop
+++ b/src/modules/conf_display/module.desktop
@@ -32,5 +32,5 @@ Comment[pt]=Definições do ecrã
 Comment[ru]=Используется для настройки экрана.
 Comment[sr]=Користи се за подешавње приказа екрана.
 Comment[tr]=Ekran yapılandırmak için kullanılır.
-Icon=preferences-desktop-display
+Icon=e-module-conf_display
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_interaction/e-module-conf_interaction.edj b/src/modules/conf_interaction/e-module-conf_interaction.edj
index 5707958b1..96e62cd5f 100644
Binary files a/src/modules/conf_interaction/e-module-conf_interaction.edj and b/src/modules/conf_interaction/e-module-conf_interaction.edj differ
diff --git a/src/modules/conf_intl/e-module-conf_intl.edj b/src/modules/conf_intl/e-module-conf_intl.edj
new file mode 100644
index 000000000..b9c3141c2
Binary files /dev/null and b/src/modules/conf_intl/e-module-conf_intl.edj differ
diff --git a/src/modules/conf_intl/meson.build b/src/modules/conf_intl/meson.build
index 21c2215ff..496f3151c 100644
--- a/src/modules/conf_intl/meson.build
+++ b/src/modules/conf_intl/meson.build
@@ -5,5 +5,3 @@ src = files(
   'e_int_config_intl.c',
   'e_mod_main.h'
  )
-
-desktop_only = true
diff --git a/src/modules/conf_intl/module.desktop b/src/modules/conf_intl/module.desktop
index 9fdaddf66..84c40cd77 100644
--- a/src/modules/conf_intl/module.desktop
+++ b/src/modules/conf_intl/module.desktop
@@ -38,5 +38,5 @@ Comment[pt]=Permite-lhe escolher o idioma do sistema
 Comment[ru]=Используется для выбора языка системы по умолчанию.
 Comment[sr]=Користи се за избор подразумеваног језика.
 Comment[tr]=Öntanımlı dil seçmek için kullanılır.
-Icon=preferences-desktop-locale
+Icon=e-module-conf_intl
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_menus/e-module-conf_menus.edj b/src/modules/conf_menus/e-module-conf_menus.edj
index 5b42248a1..6d413685e 100644
Binary files a/src/modules/conf_menus/e-module-conf_menus.edj and b/src/modules/conf_menus/e-module-conf_menus.edj differ
diff --git a/src/modules/conf_paths/e-module-conf_paths.edj b/src/modules/conf_paths/e-module-conf_paths.edj
index 3956ea903..49d423a3c 100644
Binary files a/src/modules/conf_paths/e-module-conf_paths.edj and b/src/modules/conf_paths/e-module-conf_paths.edj differ
diff --git a/src/modules/conf_performance/e-module-conf_performance.edj b/src/modules/conf_performance/e-module-conf_performance.edj
index 681918133..421d748d5 100644
Binary files a/src/modules/conf_performance/e-module-conf_performance.edj and b/src/modules/conf_performance/e-module-conf_performance.edj differ
diff --git a/src/modules/conf_randr/e-module-conf_randr.edj b/src/modules/conf_randr/e-module-conf_randr.edj
index 18b3264ef..38f55bc53 100644
Binary files a/src/modules/conf_randr/e-module-conf_randr.edj and b/src/modules/conf_randr/e-module-conf_randr.edj differ
diff --git a/src/modules/conf_shelves/e-module-conf_shelves.edj b/src/modules/conf_shelves/e-module-conf_shelves.edj
index ed6c8c7a6..4943cab65 100644
Binary files a/src/modules/conf_shelves/e-module-conf_shelves.edj and b/src/modules/conf_shelves/e-module-conf_shelves.edj differ
diff --git a/src/modules/conf_theme/e-module-conf_theme.edj b/src/modules/conf_theme/e-module-conf_theme.edj
new file mode 100644
index 000000000..e36448f1e
Binary files /dev/null and b/src/modules/conf_theme/e-module-conf_theme.edj differ
diff --git a/src/modules/conf_theme/meson.build b/src/modules/conf_theme/meson.build
index 03034f855..1295bef73 100644
--- a/src/modules/conf_theme/meson.build
+++ b/src/modules/conf_theme/meson.build
@@ -11,5 +11,3 @@ src = files(
   'e_int_config_xsettings.c',
   'e_mod_main.h'
  )
-
-desktop_only = true
diff --git a/src/modules/conf_theme/module.desktop b/src/modules/conf_theme/module.desktop
index 7bef01653..65081033b 100644
--- a/src/modules/conf_theme/module.desktop
+++ b/src/modules/conf_theme/module.desktop
@@ -38,5 +38,5 @@ Comment[pt]=Permite-lhe configurar as preferências do tema
 Comment[ru]=Используется для настройки темы.
 Comment[sr]=Користи се за подешавање теме.
 Comment[tr]=Tema seçimlerinizi yapılandırmakta kullanılır.
-Icon=preferences-desktop-theme
+Icon=e-module-conf_theme
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj b/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
index 5a8853b53..1618605db 100644
Binary files a/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj and b/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj differ
diff --git a/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj b/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj
index 5f3c70fb4..813536cae 100644
Binary files a/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj and b/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj differ
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 36a6392ec..1b60cd0ab 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -73,7 +73,6 @@ mods = [
 ]
 
 foreach m: mods
-  desktop_only = false
   disable      = false
   no_icon      = false
   cargs        = ''
@@ -103,9 +102,7 @@ foreach m: mods
     _conf         = 'USE_MODULE_' + m.underscorify().to_upper()
     module_files += join_paths(_dir_bin, m + '.so')
 
-    if desktop_only == true
-      _data = [ join_paths(m, 'module.desktop') ]
-    elif no_icon == true
+    if no_icon == true
       _data = []
     else
       _data = [ join_paths(m, 'e-module-' + m + '.edj'),