diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2583c59cf..cdd6d8248 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -6,6 +6,7 @@ ADD_SUBDIRECTORY(samples)
 ADD_SUBDIRECTORY(themes)
 
 IF(LMMS_BUILD_LINUX)
+INSTALL(FILES themes/default/icon.png DESTINATION ${DATA_DIR}/pixmaps RENAME lmms.png)
 INSTALL(FILES lmms DESTINATION ${DATA_DIR}/menu)
 INSTALL(FILES lmms.desktop DESTINATION ${DATA_DIR}/applications)
 INSTALL(FILES lmms.xml DESTINATION ${DATA_DIR}/mime/packages)
diff --git a/data/lmms b/data/lmms
index 1c5266d6b..cd921eaa5 100644
--- a/data/lmms
+++ b/data/lmms
@@ -1,4 +1,4 @@
 ?package(lmms):needs="X11" section="Apps/Sound" \
   title="LMMS" hints="Audio" command="/usr/bin/lmms" \
   longtitle="Linux MultiMedia Studio" \
-  icon="/usr/share/lmms/themes/default/icon.png"
+  icon="/usr/share/pixmaps/lmms.png"
diff --git a/data/lmms.desktop b/data/lmms.desktop
index f432fbcf8..c374b7e66 100644
--- a/data/lmms.desktop
+++ b/data/lmms.desktop
@@ -5,10 +5,9 @@ GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
 Comment=easy music production for everyone!
 Comment[ca]=Producció fàcil de música per a tothom!
-Icon=/usr/share/lmms/themes/default/icon.png
-Exec=/usr/bin/lmms
+Icon=lmms
+Exec=lmms
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Application;AudioVideo;Qt
-MimeType=application/x-lmms-project
+Categories=Qt;AudioVideo;Audio;Midi;
+MimeType=application/x-lmms-project;