diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3a5033d9a..9d38073089 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,12 +316,12 @@ if(UNIX AND NOT APPLE)
   set(XDG_APPS_INSTALL_DIR share/applications)
   install(FILES GammaRay.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 
-  install(FILES resources/GammaRay-16x16.png DESTINATION share/icons/hicolor/16x16/apps)
-  install(FILES resources/GammaRay-32x32.png DESTINATION share/icons/hicolor/32x32/apps)
-  install(FILES resources/GammaRay-48x48.png DESTINATION share/icons/hicolor/48x48/apps)
-  install(FILES resources/GammaRay-128x128.png DESTINATION share/icons/hicolor/128x128/apps)
-  install(FILES resources/GammaRay-256x256.png DESTINATION share/icons/hicolor/256x256/apps)
-  install(FILES resources/GammaRay-512x512.png DESTINATION share/icons/hicolor/512x512/apps)
+  install(FILES resources/GammaRay-16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME GammaRay.png)
+  install(FILES resources/GammaRay-32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME GammaRay.png)
+  install(FILES resources/GammaRay-48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME GammaRay.png)
+  install(FILES resources/GammaRay-128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME GammaRay.png)
+  install(FILES resources/GammaRay-256x256.png DESTINATION share/icons/hicolor/256x256/apps RENAME GammaRay.png)
+  install(FILES resources/GammaRay-512x512.png DESTINATION share/icons/hicolor/512x512/apps RENAME GammaRay.png)
 endif()
 
 set(LICENSE_FILE "License.txt")
diff --git a/GammaRay.desktop b/GammaRay.desktop
index 3ce44abf5e..348bcf93f9 100644
--- a/GammaRay.desktop
+++ b/GammaRay.desktop
@@ -6,7 +6,7 @@ Comment[x-test]=xxQt-application inspection and manipulation toolxx
 GenericName=Qt Inspection Tool
 GenericName[x-test]=xxQt Inspection Toolxx
 Exec=gammaray
-Icon=GammaRay-128x128
+Icon=GammaRay
 Type=Application
 Categories=Qt;Development;
 X-KDE-StartupNotify=true