Index: /trunk/src/VBox/Installer/common/virtualbox.desktop.in
===================================================================
--- /trunk/src/VBox/Installer/common/virtualbox.desktop.in	(revision 36746)
+++ /trunk/src/VBox/Installer/common/virtualbox.desktop.in	(revision 36747)
@@ -9,5 +9,5 @@
 MimeType=application/x-virtualbox-vbox;application/x-virtualbox-vbox-extpack;application/x-virtualbox-ovf;application/x-virtualbox-ova;
 DocPath=file://@VBOX_DOC_PATH@/UserManual.pdf
-Icon=VBox
+Icon=virtualbox
 Categories=Emulator;System;X-MandrivaLinux-System;Application;
 Comment=Run several virtual systems on a single host computer
Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 36746)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 36747)
@@ -97,5 +97,5 @@
 linux-icons_INST = bin/icons
 linux-icons_MODE = a+r,u+w
-linux-icons_SOURCES = $(VBOX_MIME_ICONS)
+linux-icons_SOURCES = $(VBOX_MIME_ICONS) $(VBOX_DESKTOP_ICONS)
 
 
@@ -282,4 +282,9 @@
 		    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
 
+VBOX_DESKTOP_ICONS = \
+	$(addprefix $(PATH_ROOT)/src/VBox/Resources/$(if $(VBOX_OSE),OSE,NonOSE)/,\
+	    $(foreach s,16 20 32 40 48 64 128,\
+		virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png))
+
 #
 # All the bin files that goes into the archives.
Index: /trunk/src/VBox/Installer/linux/debian/rules
===================================================================
--- /trunk/src/VBox/Installer/linux/debian/rules	(revision 36746)
+++ /trunk/src/VBox/Installer/linux/debian/rules	(revision 36747)
@@ -211,4 +211,6 @@
 	cd $(archdir)/icons; for i in *; do \
 	    install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
+	    install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+	    mv $$i/virtualbox.png $(prefix)/usr/share/icons/hicolor/$$i/apps || true; \
 	    mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
 	    rmdir $$i; \
Index: /trunk/src/VBox/Installer/linux/install.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/install.sh	(revision 36746)
+++ /trunk/src/VBox/Installer/linux/install.sh	(revision 36747)
@@ -412,7 +412,12 @@
         if [ -d /usr/share/icons/hicolor/$i ]; then
             for j in *; do
-                if [ -d /usr/share/icons/hicolor/$i/mimetypes ]; then
-                    ln -s $INSTALLATION_DIR/icons/$i/$j /usr/share/icons/hicolor/$i/mimetypes/$j
-                    echo /usr/share/icons/hicolor/$i/mimetypes/$j >> $CONFIG_DIR/$CONFIG_FILES
+                if [ "$j" = "virtualbox.png" ]; then
+                    dst=apps
+                else
+                    dst=mimetypes
+                fi
+                if [ -d /usr/share/icons/hicolor/$i/$dst ]; then
+                    ln -s $INSTALLATION_DIR/icons/$i/$j /usr/share/icons/hicolor/$i/$dst/$j
+                    echo /usr/share/icons/hicolor/$i/$dst/$j >> $CONFIG_DIR/$CONFIG_FILES
                 fi
             done
Index: /trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
--- /trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec	(revision 36746)
+++ /trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec	(revision 36747)
@@ -99,4 +99,5 @@
   for i in *; do
     install -d $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes
+    mv $i/virtualbox.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps || true
     mv $i/* $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes
     rmdir $i