diff --git a/CMakeLists.txt b/CMakeLists.txt
index 676a3a0c9..8ed18035c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1415,6 +1415,10 @@ if(NOT DEV)
   install(TARGETS ${TARGET_CLIENT} DESTINATION bin COMPONENT client)
   install(TARGETS ${TARGET_SERVER} DESTINATION bin COMPONENT server)
   install(TARGETS ${TARGETS_TOOLS} DESTINATION lib/ddnet COMPONENT tools)
+  install(FILES other/ddnet.desktop DESTINATION share/applications COMPONENT client)
+  foreach(SIZE 16 32 48 128 256 512)
+    install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION share/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client)
+  endforeach()
 endif()
 
 if(DEV)
diff --git a/other/ddnet.desktop b/other/ddnet.desktop
new file mode 100644
index 000000000..ab497ae4d
--- /dev/null
+++ b/other/ddnet.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=DDNet
+GenericName=Platform Game
+Exec=DDNet %u
+Icon=ddnet
+Terminal=false
+Keywords=game;multiplayer;
+Categories=Game;ArcadeGame;
+MimeType=x-scheme-handler/ddnet;
+Comment=Launch DDNet
diff --git a/other/icons/DDNet_128x128x32.png b/other/icons/DDNet_128x128x32.png
new file mode 100644
index 000000000..760f41d78
Binary files /dev/null and b/other/icons/DDNet_128x128x32.png differ
diff --git a/other/icons/DDNet_16x16x32.png b/other/icons/DDNet_16x16x32.png
new file mode 100644
index 000000000..f88034ed1
Binary files /dev/null and b/other/icons/DDNet_16x16x32.png differ
diff --git a/other/icons/DDNet_256x256x32.png b/other/icons/DDNet_256x256x32.png
new file mode 100644
index 000000000..0a6fc11f4
Binary files /dev/null and b/other/icons/DDNet_256x256x32.png differ
diff --git a/other/icons/DDNet_32x32x32.png b/other/icons/DDNet_32x32x32.png
new file mode 100644
index 000000000..66f062b8c
Binary files /dev/null and b/other/icons/DDNet_32x32x32.png differ
diff --git a/other/icons/DDNet_48x48x32.png b/other/icons/DDNet_48x48x32.png
new file mode 100644
index 000000000..87780dcea
Binary files /dev/null and b/other/icons/DDNet_48x48x32.png differ
diff --git a/other/icons/DDNet_512x512x32.png b/other/icons/DDNet_512x512x32.png
new file mode 100644
index 000000000..7954be2f9
Binary files /dev/null and b/other/icons/DDNet_512x512x32.png differ