diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 836f8146..0e5f6379 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -160,6 +160,7 @@ add_subdirectory("${PROJECT_TOP}/repos/cimgui"    "${CMAKE_BINARY_DIR}/cimgui" E
 add_subdirectory(displayservers)
 add_subdirectory(renderers)
 
+configure_file("${PROJECT_TOP}/resources/looking-glass-client.desktop.in" "${CMAKE_BINARY_DIR}/resources/looking-glass-client.desktop" @ONLY)
 add_executable(looking-glass-client ${SOURCES})
 
 target_compile_definitions(looking-glass-client PRIVATE CIMGUI_DEFINE_ENUMS_AND_STRUCTS=1)
@@ -190,4 +191,13 @@ install(TARGETS looking-glass-client
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   COMPONENT binary)
 
+install(FILES "${CMAKE_BINARY_DIR}/resources/looking-glass-client.desktop"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+# Install desktop icons
+foreach(SIZE 16 24 32 48 64 96 128)
+    install(FILES "${PROJECT_TOP}/resources/icon-${SIZE}x${SIZE}.png"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps"
+        RENAME "looking-glass.png")
+endforeach()
+
 feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
diff --git a/resources/icon-16x16.png b/resources/icon-16x16.png
new file mode 100644
index 00000000..953d3a74
Binary files /dev/null and b/resources/icon-16x16.png differ
diff --git a/resources/icon-24x24.png b/resources/icon-24x24.png
new file mode 100644
index 00000000..eba88bb6
Binary files /dev/null and b/resources/icon-24x24.png differ
diff --git a/resources/icon-32x32.png b/resources/icon-32x32.png
new file mode 100644
index 00000000..81c7b26e
Binary files /dev/null and b/resources/icon-32x32.png differ
diff --git a/resources/icon-48x48.png b/resources/icon-48x48.png
new file mode 100644
index 00000000..ddf5bca8
Binary files /dev/null and b/resources/icon-48x48.png differ
diff --git a/resources/icon-64x64.png b/resources/icon-64x64.png
new file mode 100644
index 00000000..20901462
Binary files /dev/null and b/resources/icon-64x64.png differ
diff --git a/resources/icon-96x96.png b/resources/icon-96x96.png
new file mode 100644
index 00000000..a5dc41e4
Binary files /dev/null and b/resources/icon-96x96.png differ
diff --git a/resources/looking-glass-client.desktop.in b/resources/looking-glass-client.desktop.in
new file mode 100644
index 00000000..6b5512c7
--- /dev/null
+++ b/resources/looking-glass-client.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Looking Glass Client
+Comment=Clent for Looking Glass KVMFR
+Icon=looking-glass
+Exec=@CMAKE_INSTALL_PREFIX@/bin/looking-glass-client
+Terminal=false
+Categories=System;
+StartupWMClass=looking-glass-client
+SingleMainWindow=true