diff --git a/Makefile b/Makefile
index 39e0be75..c1e8983b 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,9 @@ desktop: obj
 	@echo "Exec=$(DESTDIR)$(PREFIX)/bin/leocad" >> $(OBJDIR)/leocad.desktop
 	@echo "Terminal=false" >> $(OBJDIR)/leocad.desktop
 	@echo "Type=Application" >> $(OBJDIR)/leocad.desktop
-	@echo "Icon=$(DESTDIR)$(PREFIX)/share/leocad/icon256.png" >> $(OBJDIR)/leocad.desktop
+	@echo "Icon=$(DESTDIR)$(PREFIX)/share/pixmaps/leocad.svg" >> $(OBJDIR)/leocad.desktop
 	@echo "MimeType=application/vnd.leocad;application/x-ldraw;application/x-multi-part-ldraw" >> $(OBJDIR)/leocad.desktop
-	@echo "Categories=Development;GUIDesigner;Education;" >> $(OBJDIR)/leocad.desktop
+	@echo "Categories=Graphics;3DGraphics;Education;" >> $(OBJDIR)/leocad.desktop
 
 install: $(BIN) desktop
 	install -d $(DESTDIR)$(PREFIX)/bin
@@ -122,8 +122,10 @@ install: $(BIN) desktop
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -c -m 0644 docs/leocad.1 $(DESTDIR)$(PREFIX)/share/man/man1/
 	install -d $(DESTDIR)$(PREFIX)/share/leocad
-	install -c -m 0644 tools/icon/icon256.png $(DESTDIR)$(PREFIX)/share/leocad/
+	install -c -m 0644 tools/icon/icon128.png $(DESTDIR)$(PREFIX)/share/leocad/icon.png
 	install -c -m 0644 $(OBJDIR)/leocad.desktop $(DESTDIR)$(PREFIX)/share/applications/
+	install -d $(DESTDIR)$(PREFIX)/share/pixmaps
+	install -c -m 0644 tools/icon/icon.svg $(DESTDIR)$(PREFIX)/share/pixmaps/leocad.svg
 
 binary: binary-zip binary-tgz
 
diff --git a/linux/main.cpp b/linux/main.cpp
index b923a0a0..8804c75c 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -1,8 +1,3 @@
-// LeoCAD
-//
-// Linux specific initialization
-//
-
 #include "lc_global.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -726,7 +721,7 @@ int main (int argc, char* argv[])
 	lcGetActiveProject()->UpdateInterface();
 	main_window->UpdateMRU ();
 
-	GdkPixbuf* Pixbuf = gdk_pixbuf_new_from_file(LC_INSTALL_PREFIX"/share/leocad/icon256.png", NULL);
+	GdkPixbuf* Pixbuf = gdk_pixbuf_new_from_file(LC_INSTALL_PREFIX"/share/leocad/icon.png", NULL);
 
 	if (Pixbuf)
 	{