diff --git a/configure.in b/configure.in
index be3bfa6b..930beb39 100644
--- a/configure.in
+++ b/configure.in
@@ -302,6 +302,9 @@ config/pix/Makefile
 themes/Makefile
 scripts/Makefile
 misc/Makefile
+misc/e16.desktop
+misc/e16-gnome.desktop
+misc/e16-kde.desktop
 po/Makefile.in
 e16.spec
 ])
diff --git a/misc/.cvsignore b/misc/.cvsignore
index 3dda7298..a247ed1b 100644
--- a/misc/.cvsignore
+++ b/misc/.cvsignore
@@ -1,2 +1,5 @@
 Makefile.in
 Makefile
+e16.desktop
+e16-gnome.desktop
+e16-kde.desktop
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 4cb07ca8..f3cc5114 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,9 +1,11 @@
-DESKTOPS = e16.desktop e-gnome.desktop e-kde.desktop
+DESKTOPS = e16.desktop e16-gnome.desktop e16-kde.desktop
+DESKTOPS_IN = e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
 XCLIENTS = Xclients.e16 Xclients.e-gnome Xclients.e-kde
 SESSIONS = E16 E-GNOME E-KDE
 STARTUP = starte16
+ICONS = e16.png
 
-misc_DATA = $(DESKTOPS) $(XCLIENTS) $(SESSIONS) $(SCRIPTS)
+misc_DATA = $(DESKTOPS_IN) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
 sesm_DATA = e16.desktop
 bin_SCRIPTS = starte16
 
diff --git a/misc/e-gnome.desktop b/misc/e16-gnome.desktop.in
similarity index 80%
rename from misc/e-gnome.desktop
rename to misc/e16-gnome.desktop.in
index 0dd052e5..8b82dfd3 100644
--- a/misc/e-gnome.desktop
+++ b/misc/e16-gnome.desktop.in
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Name=E-GNOME
 Comment=This session starts GNOME using enlightenment (e16) as window manager
 Exec=starte16 GNOME
-Icon=
+Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
 Type=Application
diff --git a/misc/e-kde.desktop b/misc/e16-kde.desktop.in
similarity index 79%
rename from misc/e-kde.desktop
rename to misc/e16-kde.desktop.in
index 01f072f6..89dd47f0 100644
--- a/misc/e-kde.desktop
+++ b/misc/e16-kde.desktop.in
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Name=E-KDE
 Comment=This session starts KDE using enlightenment (e16) as window manager
 Exec=starte16 KDE
-Icon=
+Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
 Type=Application
diff --git a/misc/e16.desktop b/misc/e16.desktop.in
similarity index 77%
rename from misc/e16.desktop
rename to misc/e16.desktop.in
index e89a4935..80b6deb0 100644
--- a/misc/e16.desktop
+++ b/misc/e16.desktop.in
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Name=E16
 Comment=This session starts the Enlightenment (e16) window manager
 Exec=starte16
-Icon=
+Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
 Type=Application
diff --git a/misc/e16.png b/misc/e16.png
new file mode 100644
index 00000000..16fc7b7b
Binary files /dev/null and b/misc/e16.png differ