diff --git a/Makefile b/Makefile
index ac5793117e..9727162efa 100644
--- a/Makefile
+++ b/Makefile
@@ -380,16 +380,23 @@ install-core: install-engine install-common-mod-files install-default-mods
 	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 
 install-linux-icons:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
+	for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps"; \
+		$(INSTALL_DATA) packaging/linux/icons/ra_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(INSTALL_DATA) packaging/linux/icons/cnc_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(INSTALL_DATA) packaging/linux/icons/d2k_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps"
+	$(INSTALL_DATA) packaging/linux/icons/ra_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	$(INSTALL_DATA) packaging/linux/icons/cnc_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
 
 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MODID}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra.desktop
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra.desktop
 	@$(INSTALL_DATA) packaging/linux/openra-ra.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MODID}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc.desktop
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc.desktop
 	@$(INSTALL_DATA) packaging/linux/openra-cnc.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MODID}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k.desktop
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k.desktop
 	@$(INSTALL_DATA) packaging/linux/openra-d2k.desktop "$(DESTDIR)$(datadir)/applications"
 	@-$(RM) packaging/linux/openra-ra.desktop packaging/linux/openra-cnc.desktop packaging/linux/openra-d2k.desktop
 
@@ -456,21 +463,13 @@ uninstall:
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-d2k.png"
+	@-for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
diff --git a/packaging/linux/hicolor/128x128/apps/openra-cnc.png b/packaging/linux/icons/cnc_128x128.png
similarity index 100%
rename from packaging/linux/hicolor/128x128/apps/openra-cnc.png
rename to packaging/linux/icons/cnc_128x128.png
diff --git a/packaging/linux/hicolor/16x16/apps/openra-cnc.png b/packaging/linux/icons/cnc_16x16.png
similarity index 100%
rename from packaging/linux/hicolor/16x16/apps/openra-cnc.png
rename to packaging/linux/icons/cnc_16x16.png
diff --git a/packaging/linux/hicolor/32x32/apps/openra-cnc.png b/packaging/linux/icons/cnc_32x32.png
similarity index 100%
rename from packaging/linux/hicolor/32x32/apps/openra-cnc.png
rename to packaging/linux/icons/cnc_32x32.png
diff --git a/packaging/linux/hicolor/48x48/apps/openra-cnc.png b/packaging/linux/icons/cnc_48x48.png
similarity index 100%
rename from packaging/linux/hicolor/48x48/apps/openra-cnc.png
rename to packaging/linux/icons/cnc_48x48.png
diff --git a/packaging/linux/hicolor/64x64/apps/openra-cnc.png b/packaging/linux/icons/cnc_64x64.png
similarity index 100%
rename from packaging/linux/hicolor/64x64/apps/openra-cnc.png
rename to packaging/linux/icons/cnc_64x64.png
diff --git a/packaging/linux/hicolor/scalable/apps/openra-cnc.svg b/packaging/linux/icons/cnc_scalable.svg
similarity index 100%
rename from packaging/linux/hicolor/scalable/apps/openra-cnc.svg
rename to packaging/linux/icons/cnc_scalable.svg
diff --git a/packaging/linux/hicolor/128x128/apps/openra-d2k.png b/packaging/linux/icons/d2k_128x128.png
similarity index 100%
rename from packaging/linux/hicolor/128x128/apps/openra-d2k.png
rename to packaging/linux/icons/d2k_128x128.png
diff --git a/packaging/linux/hicolor/16x16/apps/openra-d2k.png b/packaging/linux/icons/d2k_16x16.png
similarity index 100%
rename from packaging/linux/hicolor/16x16/apps/openra-d2k.png
rename to packaging/linux/icons/d2k_16x16.png
diff --git a/packaging/linux/hicolor/32x32/apps/openra-d2k.png b/packaging/linux/icons/d2k_32x32.png
similarity index 100%
rename from packaging/linux/hicolor/32x32/apps/openra-d2k.png
rename to packaging/linux/icons/d2k_32x32.png
diff --git a/packaging/linux/hicolor/48x48/apps/openra-d2k.png b/packaging/linux/icons/d2k_48x48.png
similarity index 100%
rename from packaging/linux/hicolor/48x48/apps/openra-d2k.png
rename to packaging/linux/icons/d2k_48x48.png
diff --git a/packaging/linux/hicolor/64x64/apps/openra-d2k.png b/packaging/linux/icons/d2k_64x64.png
similarity index 100%
rename from packaging/linux/hicolor/64x64/apps/openra-d2k.png
rename to packaging/linux/icons/d2k_64x64.png
diff --git a/packaging/linux/hicolor/128x128/apps/openra-ra.png b/packaging/linux/icons/ra_128x128.png
similarity index 100%
rename from packaging/linux/hicolor/128x128/apps/openra-ra.png
rename to packaging/linux/icons/ra_128x128.png
diff --git a/packaging/linux/hicolor/16x16/apps/openra-ra.png b/packaging/linux/icons/ra_16x16.png
similarity index 100%
rename from packaging/linux/hicolor/16x16/apps/openra-ra.png
rename to packaging/linux/icons/ra_16x16.png
diff --git a/packaging/linux/hicolor/32x32/apps/openra-ra.png b/packaging/linux/icons/ra_32x32.png
similarity index 100%
rename from packaging/linux/hicolor/32x32/apps/openra-ra.png
rename to packaging/linux/icons/ra_32x32.png
diff --git a/packaging/linux/hicolor/48x48/apps/openra-ra.png b/packaging/linux/icons/ra_48x48.png
similarity index 100%
rename from packaging/linux/hicolor/48x48/apps/openra-ra.png
rename to packaging/linux/icons/ra_48x48.png
diff --git a/packaging/linux/hicolor/64x64/apps/openra-ra.png b/packaging/linux/icons/ra_64x64.png
similarity index 100%
rename from packaging/linux/hicolor/64x64/apps/openra-ra.png
rename to packaging/linux/icons/ra_64x64.png
diff --git a/packaging/linux/hicolor/scalable/apps/openra-ra.svg b/packaging/linux/icons/ra_scalable.svg
similarity index 100%
rename from packaging/linux/hicolor/scalable/apps/openra-ra.svg
rename to packaging/linux/icons/ra_scalable.svg