diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12bd8b581ea159da94e20b306ba049dabcb5eaad..71a221a67030d398cb211cb415ecd1ac5aaf47f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -379,30 +379,18 @@ CONFIGURE_FILE (
    "${PROJECT_BINARY_DIR}/config.h"
 )
 
-# generate .desktop file
-CONFIGURE_FILE (
-   "${PROJECT_SOURCE_DIR}/gnome-ring.desktop.in"
-   "${PROJECT_BINARY_DIR}/gnome-ring.desktop"
-)
-
-# generate .desktop file for autostart
-CONFIGURE_FILE (
-   "${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart.in"
-   "${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart"
-)
-
 INSTALL(TARGETS gnome-ring
    RUNTIME DESTINATION bin
 )
 
 # install .desktop in XDG desktop dir so that it is recognized by the system
-INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
 )
 
 # install .desktop in the gnome-ring data dir, so that it can be copied to the
 # autostart dir by the client
-INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
    DESTINATION
       ${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
    PERMISSIONS
diff --git a/gnome-ring.desktop.in b/gnome-ring.desktop
similarity index 77%
rename from gnome-ring.desktop.in
rename to gnome-ring.desktop
index e246103c01be2fa7c0c80cb33889cb8367af3b81..12d4418629f8bd84ae7c190b66cc523dc409eec6 100644
--- a/gnome-ring.desktop.in
+++ b/gnome-ring.desktop
@@ -2,7 +2,7 @@
 Name=Ring
 Comment=Ring is a secured and distributed communication software.
 Exec=gnome-ring
-Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg
+Icon=ring
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/gnome-ring.desktop.autostart.in b/gnome-ring.desktop.autostart
similarity index 76%
rename from gnome-ring.desktop.autostart.in
rename to gnome-ring.desktop.autostart
index 1dac791383546a2e7d43f25e808ba343117a9aac..bdd4d2f89cf7537a7217ce7b0a979cd59dba9007 100644
--- a/gnome-ring.desktop.autostart.in
+++ b/gnome-ring.desktop.autostart
@@ -2,7 +2,7 @@
 Name=Ring
 Comment=Ring is a secured and distributed communication software.
 Exec=gnome-ring --restore-last-window-state
-Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg
+Icon=ring
 StartupNotify=true
 Terminal=false
 Type=Application