diff --git a/build/main.mk b/build/main.mk
index 1fdd967..29b4027 100644
--- a/build/main.mk
+++ b/build/main.mk
@@ -403,16 +403,26 @@ endif
 ifeq ($(CATAPULT_PREBUILT),false)
 ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true)
 	$(SUM) "  Desktop hooks..."
-	$(CMD)mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
-	$(CMD)cp -rf src/catapult.xpm $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
+	$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/16x16/apps
+	$(CMD)cp -rf desktop/catapult-logo-16.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/16x16/apps/openmsx-catapult.png
+	$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/32x32/apps
+	$(CMD)cp -rf desktop/catapult-logo-32.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/32x32/apps/openmsx-catapult.png
+	$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/48x48/apps
+	$(CMD)cp -rf desktop/catapult-logo-48.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/48x48/apps/openmsx-catapult.png
+	$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/64x64/apps
+	$(CMD)cp -rf desktop/catapult-logo-64.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/64x64/apps/openmsx-catapult.png
+	$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/128x128/apps
+	$(CMD)cp -rf desktop/catapult-logo-128.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/128x128/apps/openmsx-catapult.png
+	$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/192x192/apps
+	$(CMD)cp -rf desktop/catapult-logo-192.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/192x192/apps/openmsx-catapult.png
 	$(CMD)if [ -d $(INSTALL_PREFIX)/usr/share/applications -a -w $(INSTALL_PREFIX)/usr/share/applications ]; \
 		then sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
-			desktop/openMSX-Catapult.desktop \
-			> $(INSTALL_PREFIX)/usr/share/applications/openMSX-Catapult.desktop; \
+			desktop/org.openmsx.openMSX.Catapult.desktop \
+			> $(INSTALL_PREFIX)/usr/share/applications/org.openmsx.openMSX.Catapult.desktop; \
 		else mkdir -p ~/.local/share/applications && \
 			sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
-			desktop/openMSX-Catapult.desktop \
-			> ~/.local/share/applications/openMSX-Catapult.desktop; \
+			desktop/org.openmsx.openMSX.Catapult.desktop \
+			> ~/.local/share/applications/org.openmsx.openMSX.Catapult.desktop; \
 		fi
 endif
 ifeq ($(SYMLINK_FOR_BINARY),true)
diff --git a/desktop/catapult-logo-128.png b/desktop/catapult-logo-128.png
new file mode 100644
index 0000000..7615265
Binary files /dev/null and b/desktop/catapult-logo-128.png differ
diff --git a/desktop/catapult-logo-16.png b/desktop/catapult-logo-16.png
new file mode 100644
index 0000000..1b8f5fe
Binary files /dev/null and b/desktop/catapult-logo-16.png differ
diff --git a/desktop/catapult-logo-192.png b/desktop/catapult-logo-192.png
new file mode 100644
index 0000000..b261d8f
Binary files /dev/null and b/desktop/catapult-logo-192.png differ
diff --git a/desktop/catapult-logo-210.png b/desktop/catapult-logo-210.png
new file mode 100644
index 0000000..ebae9cc
Binary files /dev/null and b/desktop/catapult-logo-210.png differ
diff --git a/desktop/catapult-logo-32.png b/desktop/catapult-logo-32.png
new file mode 100644
index 0000000..2d97e46
Binary files /dev/null and b/desktop/catapult-logo-32.png differ
diff --git a/desktop/catapult-logo-48.png b/desktop/catapult-logo-48.png
new file mode 100644
index 0000000..93c6d81
Binary files /dev/null and b/desktop/catapult-logo-48.png differ
diff --git a/desktop/catapult-logo-64.png b/desktop/catapult-logo-64.png
new file mode 100644
index 0000000..0a02bae
Binary files /dev/null and b/desktop/catapult-logo-64.png differ
diff --git a/desktop/org.openmsx.openMSX.Catapult.desktop b/desktop/org.openmsx.openMSX.Catapult.desktop
new file mode 100644
index 0000000..33cb044
--- /dev/null
+++ b/desktop/org.openmsx.openMSX.Catapult.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=openMSX Catapult
+Comment=Graphical interface for openMSX
+Comment[da]=Grafisk interface til openMSX
+Comment[de]=Grafische Oberfläch für openMSX
+Comment[es]=Interfaz gráfica para openMSX
+Comment[fi]=Graafinen käytöliittymä openMSX: lle
+Comment[fr]=Interface graphique pour openMSX
+Comment[it]=Interfaccia grafica per openMSX
+Comment[nl]=Grafische interface voor openMSX
+Comment[no]=Grafisk grensenitt for openMSX
+Comment[pl]=Graficzny interfejs dla openMSX
+Comment[pt]=Interface gráfica para openMSX
+Comment[sv]=Grafiskt gränssnit för openMSX
+Type=Application
+Exec=%INSTALL_BASE%/bin/catapult
+Icon=openmsx-catapult
+DocPath=%INSTALL_BASE%/doc/manual/index.html
+Terminal=false
+Categories=Game;Emulator
+Keywords=emulator;msx;openmsx;svi;colecovision
diff --git a/desktop/openMSX-Catapult.desktop b/org.openmsx.openMSX.Catapult.desktop
similarity index 100%
rename from desktop/openMSX-Catapult.desktop
rename to org.openmsx.openMSX.Catapult.desktop