diff --git a/cmake/packaging/linux.cmake b/cmake/packaging/linux.cmake
index 99a9c9ef..acdf41c1 100644
--- a/cmake/packaging/linux.cmake
+++ b/cmake/packaging/linux.cmake
@@ -67,16 +67,21 @@ set(CPACK_RPM_PACKAGE_REQUIRES "\
 # This should automatically figure out dependencies, doesn't work with the current config
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
 
+# application icon
+install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
+
 # tray icon
 if(${SUNSHINE_TRAY} STREQUAL 1)
     install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg"
-        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons")
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status"
+            RENAME "sunshine-tray.svg")
     install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/images/sunshine-playing.svg"
-        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons")
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status")
     install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/images/sunshine-pausing.svg"
-        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons")
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status")
     install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/images/sunshine-locked.svg"
-        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons")
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status")
 
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "\
                     ${CPACK_DEBIAN_PACKAGE_DEPENDS}, \
diff --git a/src/system_tray.cpp b/src/system_tray.cpp
index 99a30222..cab3ee9b 100644
--- a/src/system_tray.cpp
+++ b/src/system_tray.cpp
@@ -14,7 +14,7 @@
     #define TRAY_ICON_PAUSING WEB_DIR "images/sunshine-pausing.ico"
     #define TRAY_ICON_LOCKED WEB_DIR "images/sunshine-locked.ico"
   #elif defined(__linux__) || defined(linux) || defined(__linux)
-    #define TRAY_ICON "sunshine"
+    #define TRAY_ICON "sunshine-tray"
     #define TRAY_ICON_PLAYING "sunshine-playing"
     #define TRAY_ICON_PAUSING "sunshine-pausing"
     #define TRAY_ICON_LOCKED "sunshine-locked"