Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc	(revision 101575)
@@ -499,20 +499,4 @@
         <file alias="keyboard_24px.png">images/keyboard_24px.png</file>
         <file alias="keyboard_32px.png">images/keyboard_32px.png</file>
-        <file alias="keyboard_settings_16px.png">images/keyboard_settings_16px.png</file>
-        <file alias="keyboard_settings_disabled_16px.png">images/keyboard_settings_disabled_16px.png</file>
-        <file alias="launch_vm_16px.png">images/launch_vm_16px.png</file>
-        <file alias="list_movedown_16px.png">images/list_movedown_16px.png</file>
-        <file alias="list_movedown_disabled_16px.png">images/list_movedown_disabled_16px.png</file>
-        <file alias="list_moveup_16px.png">images/list_moveup_16px.png</file>
-        <file alias="list_moveup_disabled_16px.png">images/list_moveup_disabled_16px.png</file>
-        <file alias="log_viewer_bookmark_16px.png">images/log_viewer_bookmark_16px.png</file>
-        <file alias="log_viewer_bookmark_32px.png">images/log_viewer_bookmark_32px.png</file>
-        <file alias="log_viewer_bookmark_disabled_16px.png">images/log_viewer_bookmark_disabled_16px.png</file>
-        <file alias="log_viewer_bookmark_disabled_32px.png">images/log_viewer_bookmark_disabled_32px.png</file>
-        <file alias="log_viewer_bookmark_off_16px.png">images/log_viewer_bookmark_off_16px.png</file>
-        <file alias="log_viewer_bookmark_on_16px.png">images/log_viewer_bookmark_on_16px.png</file>
-        <file alias="log_viewer_choose_font_16px.png">images/log_viewer_choose_font_16px.png</file>
-        <file alias="log_viewer_delete_all_bookmarks_16px.png">images/log_viewer_delete_all_bookmarks_16px.png</file>
-        <file alias="log_viewer_delete_all_filters_16px.png">images/log_viewer_delete_all_filters_16px.png</file>
     </qresource>
 </RCC>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc	(revision 101575)
@@ -486,19 +486,4 @@
         <file alias="ide_add_disabled_16px_x2.png">images/x2/ide_add_disabled_16px_x2.png</file>
         <file alias="ide_collapse_16px_x2.png">images/x2/ide_collapse_16px_x2.png</file>
-        <file alias="ide_expand_16px_x2.png">images/x2/ide_expand_16px_x2.png</file>
-        <file alias="import_16px_x2.png">images/x2/import_16px_x2.png</file>
-        <file alias="import_32px_x2.png">images/x2/import_32px_x2.png</file>
-        <file alias="import_disabled_16px_x2.png">images/x2/import_disabled_16px_x2.png</file>
-        <file alias="import_disabled_32px_x2.png">images/x2/import_disabled_32px_x2.png</file>
-        <file alias="interface_16px_x2.png">images/x2/interface_16px_x2.png</file>
-        <file alias="interface_24px_x2.png">images/x2/interface_24px_x2.png</file>
-        <file alias="interface_32px_x2.png">images/x2/interface_32px_x2.png</file>
-        <file alias="interface_warning_16px_x2.png">images/x2/interface_warning_16px_x2.png</file>
-        <file alias="keep_object_16px_x2.png">images/x2/keep_object_16px_x2.png</file>
-        <file alias="keyboard_16px_x2.png">images/x2/keyboard_16px_x2.png</file>
-        <file alias="keyboard_24px_x2.png">images/x2/keyboard_24px_x2.png</file>
-        <file alias="keyboard_32px_x2.png">images/x2/keyboard_32px_x2.png</file>
-        <file alias="keyboard_settings_16px_x2.png">images/x2/keyboard_settings_16px_x2.png</file>
-        <file alias="keyboard_settings_disabled_16px_x2.png">images/x2/keyboard_settings_disabled_16px_x2.png</file>
     </qresource>
 </RCC>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x3.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x3.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x3.qrc	(revision 101575)
@@ -486,19 +486,4 @@
         <file alias="ide_add_disabled_16px_x3.png">images/x3/ide_add_disabled_16px_x3.png</file>
         <file alias="ide_collapse_16px_x3.png">images/x3/ide_collapse_16px_x3.png</file>
-        <file alias="ide_expand_16px_x3.png">images/x3/ide_expand_16px_x3.png</file>
-        <file alias="import_16px_x3.png">images/x3/import_16px_x3.png</file>
-        <file alias="import_32px_x3.png">images/x3/import_32px_x3.png</file>
-        <file alias="import_disabled_16px_x3.png">images/x3/import_disabled_16px_x3.png</file>
-        <file alias="import_disabled_32px_x3.png">images/x3/import_disabled_32px_x3.png</file>
-        <file alias="interface_16px_x3.png">images/x3/interface_16px_x3.png</file>
-        <file alias="interface_24px_x3.png">images/x3/interface_24px_x3.png</file>
-        <file alias="interface_32px_x3.png">images/x3/interface_32px_x3.png</file>
-        <file alias="interface_warning_16px_x3.png">images/x3/interface_warning_16px_x3.png</file>
-        <file alias="keep_object_16px_x3.png">images/x3/keep_object_16px_x3.png</file>
-        <file alias="keyboard_16px_x3.png">images/x3/keyboard_16px_x3.png</file>
-        <file alias="keyboard_24px_x3.png">images/x3/keyboard_24px_x3.png</file>
-        <file alias="keyboard_32px_x3.png">images/x3/keyboard_32px_x3.png</file>
-        <file alias="keyboard_settings_16px_x3.png">images/x3/keyboard_settings_16px_x3.png</file>
-        <file alias="keyboard_settings_disabled_16px_x3.png">images/x3/keyboard_settings_disabled_16px_x3.png</file>
     </qresource>
 </RCC>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x4.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x4.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x4.qrc	(revision 101575)
@@ -486,19 +486,4 @@
         <file alias="ide_add_disabled_16px_x4.png">images/x4/ide_add_disabled_16px_x4.png</file>
         <file alias="ide_collapse_16px_x4.png">images/x4/ide_collapse_16px_x4.png</file>
-        <file alias="ide_expand_16px_x4.png">images/x4/ide_expand_16px_x4.png</file>
-        <file alias="import_16px_x4.png">images/x4/import_16px_x4.png</file>
-        <file alias="import_32px_x4.png">images/x4/import_32px_x4.png</file>
-        <file alias="import_disabled_16px_x4.png">images/x4/import_disabled_16px_x4.png</file>
-        <file alias="import_disabled_32px_x4.png">images/x4/import_disabled_32px_x4.png</file>
-        <file alias="interface_16px_x4.png">images/x4/interface_16px_x4.png</file>
-        <file alias="interface_24px_x4.png">images/x4/interface_24px_x4.png</file>
-        <file alias="interface_32px_x4.png">images/x4/interface_32px_x4.png</file>
-        <file alias="interface_warning_16px_x4.png">images/x4/interface_warning_16px_x4.png</file>
-        <file alias="keep_object_16px_x4.png">images/x4/keep_object_16px_x4.png</file>
-        <file alias="keyboard_16px_x4.png">images/x4/keyboard_16px_x4.png</file>
-        <file alias="keyboard_24px_x4.png">images/x4/keyboard_24px_x4.png</file>
-        <file alias="keyboard_32px_x4.png">images/x4/keyboard_32px_x4.png</file>
-        <file alias="keyboard_settings_16px_x4.png">images/x4/keyboard_settings_16px_x4.png</file>
-        <file alias="keyboard_settings_disabled_16px_x4.png">images/x4/keyboard_settings_disabled_16px_x4.png</file>
     </qresource>
 </RCC>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	(revision 101575)
@@ -1,4 +1,20 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="keyboard_settings_16px.png">images/keyboard_settings_16px.png</file>
+        <file alias="keyboard_settings_disabled_16px.png">images/keyboard_settings_disabled_16px.png</file>
+        <file alias="launch_vm_16px.png">images/launch_vm_16px.png</file>
+        <file alias="list_movedown_16px.png">images/list_movedown_16px.png</file>
+        <file alias="list_movedown_disabled_16px.png">images/list_movedown_disabled_16px.png</file>
+        <file alias="list_moveup_16px.png">images/list_moveup_16px.png</file>
+        <file alias="list_moveup_disabled_16px.png">images/list_moveup_disabled_16px.png</file>
+        <file alias="log_viewer_bookmark_16px.png">images/log_viewer_bookmark_16px.png</file>
+        <file alias="log_viewer_bookmark_32px.png">images/log_viewer_bookmark_32px.png</file>
+        <file alias="log_viewer_bookmark_disabled_16px.png">images/log_viewer_bookmark_disabled_16px.png</file>
+        <file alias="log_viewer_bookmark_disabled_32px.png">images/log_viewer_bookmark_disabled_32px.png</file>
+        <file alias="log_viewer_bookmark_off_16px.png">images/log_viewer_bookmark_off_16px.png</file>
+        <file alias="log_viewer_bookmark_on_16px.png">images/log_viewer_bookmark_on_16px.png</file>
+        <file alias="log_viewer_choose_font_16px.png">images/log_viewer_choose_font_16px.png</file>
+        <file alias="log_viewer_delete_all_bookmarks_16px.png">images/log_viewer_delete_all_bookmarks_16px.png</file>
+        <file alias="log_viewer_delete_all_filters_16px.png">images/log_viewer_delete_all_filters_16px.png</file>
         <file alias="log_viewer_delete_current_bookmark_16px.png">images/log_viewer_delete_current_bookmark_16px.png</file>
         <file alias="log_viewer_delete_filter_16px.png">images/log_viewer_delete_filter_16px.png</file>
@@ -79,39 +95,23 @@
         <file alias="nw_write_16px.png">images/nw_write_16px.png</file>
         <file alias="ok_16px.png">images/ok_16px.png</file>
-        <file alias="os_archlinux_32.png">images/os_archlinux_32.png</file>
         <file alias="os_archlinux.png">images/os_archlinux.png</file>
         <file alias="os_cloud.png">images/os_cloud.png</file>
-        <file alias="os_debian_32.png">images/os_debian_32.png</file>
         <file alias="os_debian.png">images/os_debian.png</file>
         <file alias="os_dos.png">images/os_dos.png</file>
-        <file alias="os_fedora_32.png">images/os_fedora_32.png</file>
         <file alias="os_fedora.png">images/os_fedora.png</file>
-        <file alias="os_freebsd_32.png">images/os_freebsd_32.png</file>
         <file alias="os_freebsd.png">images/os_freebsd.png</file>
-        <file alias="os_gentoo_32.png">images/os_gentoo_32.png</file>
         <file alias="os_gentoo.png">images/os_gentoo.png</file>
         <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
         <file alias="os_l4.png">images/os_l4.png</file>
-        <file alias="os_linux22_32.png">images/os_linux22_32.png</file>
-        <file alias="os_linux24_32.png">images/os_linux24_32.png</file>
         <file alias="os_linux24.png">images/os_linux24.png</file>
-        <file alias="os_linux26_32.png">images/os_linux26_32.png</file>
         <file alias="os_linux26.png">images/os_linux26.png</file>
-        <file alias="os_linux_32.png">images/os_linux_32.png</file>
         <file alias="os_linux.png">images/os_linux.png</file>
-        <file alias="os_macosx_32.png">images/os_macosx_32.png</file>
         <file alias="os_macosx.png">images/os_macosx.png</file>
-        <file alias="os_mandriva_32.png">images/os_mandriva_32.png</file>
         <file alias="os_mandriva.png">images/os_mandriva.png</file>
-        <file alias="os_netbsd_32.png">images/os_netbsd_32.png</file>
         <file alias="os_netbsd.png">images/os_netbsd.png</file>
         <file alias="os_netware.png">images/os_netware.png</file>
-        <file alias="os_openbsd_32.png">images/os_openbsd_32.png</file>
         <file alias="os_openbsd.png">images/os_openbsd.png</file>
-        <file alias="os_opensuse_32.png">images/os_opensuse_32.png</file>
         <file alias="os_opensuse.png">images/os_opensuse.png</file>
-        <file alias="os_oracle_32.png">images/os_oracle_32.png</file>
         <file alias="os_oracle.png">images/os_oracle.png</file>
-        <file alias="os_oraclesolaris_32.png">images/os_oraclesolaris_32.png</file>
         <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
         <file alias="os_os2ecs.png">images/os_os2ecs.png</file>
@@ -120,16 +120,10 @@
         <file alias="os_os2warp45.png">images/os_os2warp45.png</file>
         <file alias="os_os2warp4.png">images/os_os2warp4.png</file>
-        <file alias="os_other_32.png">images/os_other_32.png</file>
         <file alias="os_other.png">images/os_other.png</file>
         <file alias="os_qnx.png">images/os_qnx.png</file>
-        <file alias="os_redhat_32.png">images/os_redhat_32.png</file>
         <file alias="os_redhat.png">images/os_redhat.png</file>
-        <file alias="os_solaris_32.png">images/os_solaris_32.png</file>
         <file alias="os_solaris.png">images/os_solaris.png</file>
-        <file alias="os_turbolinux_32.png">images/os_turbolinux_32.png</file>
         <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
-        <file alias="os_ubuntu_32.png">images/os_ubuntu_32.png</file>
         <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
-        <file alias="os_win10_32.png">images/os_win10_32.png</file>
         <file alias="os_win10.png">images/os_win10.png</file>
         <file alias="os_win11.png">images/os_win11.png</file>
@@ -138,15 +132,10 @@
         <file alias="os_win2k19.png">images/os_win2k19.png</file>
         <file alias="os_win2k22.png">images/os_win2k22.png</file>
-        <file alias="os_win2k3_32.png">images/os_win2k3_32.png</file>
         <file alias="os_win2k3.png">images/os_win2k3.png</file>
-        <file alias="os_win2k8_32.png">images/os_win2k8_32.png</file>
         <file alias="os_win2k8.png">images/os_win2k8.png</file>
         <file alias="os_win2k.png">images/os_win2k.png</file>
         <file alias="os_win31.png">images/os_win31.png</file>
-        <file alias="os_win7_32.png">images/os_win7_32.png</file>
         <file alias="os_win7.png">images/os_win7.png</file>
-        <file alias="os_win81_32.png">images/os_win81_32.png</file>
         <file alias="os_win81.png">images/os_win81.png</file>
-        <file alias="os_win8_32.png">images/os_win8_32.png</file>
         <file alias="os_win8.png">images/os_win8.png</file>
         <file alias="os_win95.png">images/os_win95.png</file>
@@ -154,11 +143,7 @@
         <file alias="os_winme.png">images/os_winme.png</file>
         <file alias="os_winnt4.png">images/os_winnt4.png</file>
-        <file alias="os_win_other_32.png">images/os_win_other_32.png</file>
         <file alias="os_win_other.png">images/os_win_other.png</file>
-        <file alias="os_winvista_32.png">images/os_winvista_32.png</file>
         <file alias="os_winvista.png">images/os_winvista.png</file>
-        <file alias="os_winxp_32.png">images/os_winxp_32.png</file>
         <file alias="os_winxp.png">images/os_winxp.png</file>
-        <file alias="os_xandros_32.png">images/os_xandros_32.png</file>
         <file alias="os_xandros.png">images/os_xandros.png</file>
         <file alias="pcie_16px.png">images/pcie_16px.png</file>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc	(revision 101575)
@@ -1,4 +1,19 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="ide_expand_16px_x2.png">images/x2/ide_expand_16px_x2.png</file>
+        <file alias="import_16px_x2.png">images/x2/import_16px_x2.png</file>
+        <file alias="import_32px_x2.png">images/x2/import_32px_x2.png</file>
+        <file alias="import_disabled_16px_x2.png">images/x2/import_disabled_16px_x2.png</file>
+        <file alias="import_disabled_32px_x2.png">images/x2/import_disabled_32px_x2.png</file>
+        <file alias="interface_16px_x2.png">images/x2/interface_16px_x2.png</file>
+        <file alias="interface_24px_x2.png">images/x2/interface_24px_x2.png</file>
+        <file alias="interface_32px_x2.png">images/x2/interface_32px_x2.png</file>
+        <file alias="interface_warning_16px_x2.png">images/x2/interface_warning_16px_x2.png</file>
+        <file alias="keep_object_16px_x2.png">images/x2/keep_object_16px_x2.png</file>
+        <file alias="keyboard_16px_x2.png">images/x2/keyboard_16px_x2.png</file>
+        <file alias="keyboard_24px_x2.png">images/x2/keyboard_24px_x2.png</file>
+        <file alias="keyboard_32px_x2.png">images/x2/keyboard_32px_x2.png</file>
+        <file alias="keyboard_settings_16px_x2.png">images/x2/keyboard_settings_16px_x2.png</file>
+        <file alias="keyboard_settings_disabled_16px_x2.png">images/x2/keyboard_settings_disabled_16px_x2.png</file>
         <file alias="launch_vm_16px_x2.png">images/x2/launch_vm_16px_x2.png</file>
         <file alias="list_movedown_16px_x2.png">images/x2/list_movedown_16px_x2.png</file>
@@ -91,37 +106,22 @@
         <file alias="nw_write_16px_x2.png">images/x2/nw_write_16px_x2.png</file>
         <file alias="ok_16px_x2.png">images/x2/ok_16px_x2.png</file>
-        <file alias="os_archlinux_32_x2.png">images/x2/os_archlinux_32_x2.png</file>
         <file alias="os_archlinux_x2.png">images/x2/os_archlinux_x2.png</file>
         <file alias="os_cloud_x2.png">images/x2/os_cloud_x2.png</file>
-        <file alias="os_debian_32_x2.png">images/x2/os_debian_32_x2.png</file>
         <file alias="os_debian_x2.png">images/x2/os_debian_x2.png</file>
         <file alias="os_dos_x2.png">images/x2/os_dos_x2.png</file>
-        <file alias="os_fedora_32_x2.png">images/x2/os_fedora_32_x2.png</file>
         <file alias="os_fedora_x2.png">images/x2/os_fedora_x2.png</file>
-        <file alias="os_freebsd_32_x2.png">images/x2/os_freebsd_32_x2.png</file>
         <file alias="os_freebsd_x2.png">images/x2/os_freebsd_x2.png</file>
-        <file alias="os_gentoo_32_x2.png">images/x2/os_gentoo_32_x2.png</file>
         <file alias="os_gentoo_x2.png">images/x2/os_gentoo_x2.png</file>
         <file alias="os_jrockitve_x2.png">images/x2/os_jrockitve_x2.png</file>
         <file alias="os_l4_x2.png">images/x2/os_l4_x2.png</file>
-        <file alias="os_linux22_32_x2.png">images/x2/os_linux22_32_x2.png</file>
-        <file alias="os_linux24_32_x2.png">images/x2/os_linux24_32_x2.png</file>
         <file alias="os_linux24_x2.png">images/x2/os_linux24_x2.png</file>
-        <file alias="os_linux26_32_x2.png">images/x2/os_linux26_32_x2.png</file>
         <file alias="os_linux26_x2.png">images/x2/os_linux26_x2.png</file>
-        <file alias="os_linux_32_x2.png">images/x2/os_linux_32_x2.png</file>
         <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file>
         <file alias="os_macosx_x2.png">images/x2/os_macosx_x2.png</file>
-        <file alias="os_mandriva_32_x2.png">images/x2/os_mandriva_32_x2.png</file>
         <file alias="os_mandriva_x2.png">images/x2/os_mandriva_x2.png</file>
-        <file alias="os_netbsd_32_x2.png">images/x2/os_netbsd_32_x2.png</file>
         <file alias="os_netbsd_x2.png">images/x2/os_netbsd_x2.png</file>
         <file alias="os_netware_x2.png">images/x2/os_netware_x2.png</file>
-        <file alias="os_openbsd_32_x2.png">images/x2/os_openbsd_32_x2.png</file>
         <file alias="os_openbsd_x2.png">images/x2/os_openbsd_x2.png</file>
-        <file alias="os_opensuse_32_x2.png">images/x2/os_opensuse_32_x2.png</file>
         <file alias="os_opensuse_x2.png">images/x2/os_opensuse_x2.png</file>
-        <file alias="os_oracle_32_x2.png">images/x2/os_oracle_32_x2.png</file>
-        <file alias="os_oraclesolaris_32_x2.png">images/x2/os_oraclesolaris_32_x2.png</file>
         <file alias="os_oraclesolaris_x2.png">images/x2/os_oraclesolaris_x2.png</file>
         <file alias="os_oracle_x2.png">images/x2/os_oracle_x2.png</file>
@@ -131,16 +131,10 @@
         <file alias="os_os2warp45_x2.png">images/x2/os_os2warp45_x2.png</file>
         <file alias="os_os2warp4_x2.png">images/x2/os_os2warp4_x2.png</file>
-        <file alias="os_other_32_x2.png">images/x2/os_other_32_x2.png</file>
         <file alias="os_other_x2.png">images/x2/os_other_x2.png</file>
         <file alias="os_qnx_x2.png">images/x2/os_qnx_x2.png</file>
-        <file alias="os_redhat_32_x2.png">images/x2/os_redhat_32_x2.png</file>
         <file alias="os_redhat_x2.png">images/x2/os_redhat_x2.png</file>
-        <file alias="os_solaris_32_x2.png">images/x2/os_solaris_32_x2.png</file>
         <file alias="os_solaris_x2.png">images/x2/os_solaris_x2.png</file>
-        <file alias="os_turbolinux_32_x2.png">images/x2/os_turbolinux_32_x2.png</file>
         <file alias="os_turbolinux_x2.png">images/x2/os_turbolinux_x2.png</file>
-        <file alias="os_ubuntu_32_x2.png">images/x2/os_ubuntu_32_x2.png</file>
         <file alias="os_ubuntu_x2.png">images/x2/os_ubuntu_x2.png</file>
-        <file alias="os_win10_32_x2.png">images/x2/os_win10_32_x2.png</file>
         <file alias="os_win10_x2.png">images/x2/os_win10_x2.png</file>
         <file alias="os_win11_x2.png">images/x2/os_win11_x2.png</file>
@@ -149,15 +143,10 @@
         <file alias="os_win2k19_x2.png">images/x2/os_win2k19_x2.png</file>
         <file alias="os_win2k22_x2.png">images/x2/os_win2k22_x2.png</file>
-        <file alias="os_win2k3_32_x2.png">images/x2/os_win2k3_32_x2.png</file>
         <file alias="os_win2k3_x2.png">images/x2/os_win2k3_x2.png</file>
-        <file alias="os_win2k8_32_x2.png">images/x2/os_win2k8_32_x2.png</file>
         <file alias="os_win2k8_x2.png">images/x2/os_win2k8_x2.png</file>
         <file alias="os_win2k_x2.png">images/x2/os_win2k_x2.png</file>
         <file alias="os_win31_x2.png">images/x2/os_win31_x2.png</file>
-        <file alias="os_win7_32_x2.png">images/x2/os_win7_32_x2.png</file>
         <file alias="os_win7_x2.png">images/x2/os_win7_x2.png</file>
-        <file alias="os_win81_32_x2.png">images/x2/os_win81_32_x2.png</file>
         <file alias="os_win81_x2.png">images/x2/os_win81_x2.png</file>
-        <file alias="os_win8_32_x2.png">images/x2/os_win8_32_x2.png</file>
         <file alias="os_win8_x2.png">images/x2/os_win8_x2.png</file>
         <file alias="os_win95_x2.png">images/x2/os_win95_x2.png</file>
@@ -165,11 +154,7 @@
         <file alias="os_winme_x2.png">images/x2/os_winme_x2.png</file>
         <file alias="os_winnt4_x2.png">images/x2/os_winnt4_x2.png</file>
-        <file alias="os_win_other_32_x2.png">images/x2/os_win_other_32_x2.png</file>
         <file alias="os_win_other_x2.png">images/x2/os_win_other_x2.png</file>
-        <file alias="os_winvista_32_x2.png">images/x2/os_winvista_32_x2.png</file>
         <file alias="os_winvista_x2.png">images/x2/os_winvista_x2.png</file>
-        <file alias="os_winxp_32_x2.png">images/x2/os_winxp_32_x2.png</file>
         <file alias="os_winxp_x2.png">images/x2/os_winxp_x2.png</file>
-        <file alias="os_xandros_32_x2.png">images/x2/os_xandros_32_x2.png</file>
         <file alias="os_xandros_x2.png">images/x2/os_xandros_x2.png</file>
         <file alias="pcie_16px_x2.png">images/x2/pcie_16px_x2.png</file>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc	(revision 101575)
@@ -1,4 +1,19 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="ide_expand_16px_x3.png">images/x3/ide_expand_16px_x3.png</file>
+        <file alias="import_16px_x3.png">images/x3/import_16px_x3.png</file>
+        <file alias="import_32px_x3.png">images/x3/import_32px_x3.png</file>
+        <file alias="import_disabled_16px_x3.png">images/x3/import_disabled_16px_x3.png</file>
+        <file alias="import_disabled_32px_x3.png">images/x3/import_disabled_32px_x3.png</file>
+        <file alias="interface_16px_x3.png">images/x3/interface_16px_x3.png</file>
+        <file alias="interface_24px_x3.png">images/x3/interface_24px_x3.png</file>
+        <file alias="interface_32px_x3.png">images/x3/interface_32px_x3.png</file>
+        <file alias="interface_warning_16px_x3.png">images/x3/interface_warning_16px_x3.png</file>
+        <file alias="keep_object_16px_x3.png">images/x3/keep_object_16px_x3.png</file>
+        <file alias="keyboard_16px_x3.png">images/x3/keyboard_16px_x3.png</file>
+        <file alias="keyboard_24px_x3.png">images/x3/keyboard_24px_x3.png</file>
+        <file alias="keyboard_32px_x3.png">images/x3/keyboard_32px_x3.png</file>
+        <file alias="keyboard_settings_16px_x3.png">images/x3/keyboard_settings_16px_x3.png</file>
+        <file alias="keyboard_settings_disabled_16px_x3.png">images/x3/keyboard_settings_disabled_16px_x3.png</file>
         <file alias="launch_vm_16px_x3.png">images/x3/launch_vm_16px_x3.png</file>
         <file alias="list_movedown_16px_x3.png">images/x3/list_movedown_16px_x3.png</file>
@@ -91,38 +106,22 @@
         <file alias="nw_write_16px_x3.png">images/x3/nw_write_16px_x3.png</file>
         <file alias="ok_16px_x3.png">images/x3/ok_16px_x3.png</file>
-        <file alias="os_archlinux_32_x3.png">images/x3/os_archlinux_32_x3.png</file>
         <file alias="os_archlinux_x3.png">images/x3/os_archlinux_x3.png</file>
         <file alias="os_cloud_x3.png">images/x3/os_cloud_x3.png</file>
-        <file alias="os_debian_32_x3.png">images/x3/os_debian_32_x3.png</file>
         <file alias="os_debian_x3.png">images/x3/os_debian_x3.png</file>
         <file alias="os_dos_x3.png">images/x3/os_dos_x3.png</file>
-        <file alias="os_fedora_32_x3.png">images/x3/os_fedora_32_x3.png</file>
         <file alias="os_fedora_x3.png">images/x3/os_fedora_x3.png</file>
-        <file alias="os_freebsd_32_x3.png">images/x3/os_freebsd_32_x3.png</file>
         <file alias="os_freebsd_x3.png">images/x3/os_freebsd_x3.png</file>
-        <file alias="os_gentoo_32_x3.png">images/x3/os_gentoo_32_x3.png</file>
         <file alias="os_gentoo_x3.png">images/x3/os_gentoo_x3.png</file>
         <file alias="os_jrockitve_x3.png">images/x3/os_jrockitve_x3.png</file>
         <file alias="os_l4_x3.png">images/x3/os_l4_x3.png</file>
-        <file alias="os_linux22_32_x3.png">images/x3/os_linux22_32_x3.png</file>
-        <file alias="os_linux24_32_x3.png">images/x3/os_linux24_32_x3.png</file>
         <file alias="os_linux24_x3.png">images/x3/os_linux24_x3.png</file>
-        <file alias="os_linux26_32_x3.png">images/x3/os_linux26_32_x3.png</file>
         <file alias="os_linux26_x3.png">images/x3/os_linux26_x3.png</file>
-        <file alias="os_linux_32_x3.png">images/x3/os_linux_32_x3.png</file>
         <file alias="os_linux_x3.png">images/x3/os_linux_x3.png</file>
-        <file alias="os_macosx_32_x3.png">images/x3/os_macosx_32_x3.png</file>
         <file alias="os_macosx_x3.png">images/x3/os_macosx_x3.png</file>
-        <file alias="os_mandriva_32_x3.png">images/x3/os_mandriva_32_x3.png</file>
         <file alias="os_mandriva_x3.png">images/x3/os_mandriva_x3.png</file>
-        <file alias="os_netbsd_32_x3.png">images/x3/os_netbsd_32_x3.png</file>
         <file alias="os_netbsd_x3.png">images/x3/os_netbsd_x3.png</file>
         <file alias="os_netware_x3.png">images/x3/os_netware_x3.png</file>
-        <file alias="os_openbsd_32_x3.png">images/x3/os_openbsd_32_x3.png</file>
         <file alias="os_openbsd_x3.png">images/x3/os_openbsd_x3.png</file>
-        <file alias="os_opensuse_32_x3.png">images/x3/os_opensuse_32_x3.png</file>
         <file alias="os_opensuse_x3.png">images/x3/os_opensuse_x3.png</file>
-        <file alias="os_oracle_32_x3.png">images/x3/os_oracle_32_x3.png</file>
-        <file alias="os_oraclesolaris_32_x3.png">images/x3/os_oraclesolaris_32_x3.png</file>
         <file alias="os_oraclesolaris_x3.png">images/x3/os_oraclesolaris_x3.png</file>
         <file alias="os_oracle_x3.png">images/x3/os_oracle_x3.png</file>
@@ -132,16 +131,10 @@
         <file alias="os_os2warp45_x3.png">images/x3/os_os2warp45_x3.png</file>
         <file alias="os_os2warp4_x3.png">images/x3/os_os2warp4_x3.png</file>
-        <file alias="os_other_32_x3.png">images/x3/os_other_32_x3.png</file>
         <file alias="os_other_x3.png">images/x3/os_other_x3.png</file>
         <file alias="os_qnx_x3.png">images/x3/os_qnx_x3.png</file>
-        <file alias="os_redhat_32_x3.png">images/x3/os_redhat_32_x3.png</file>
         <file alias="os_redhat_x3.png">images/x3/os_redhat_x3.png</file>
-        <file alias="os_solaris_32_x3.png">images/x3/os_solaris_32_x3.png</file>
         <file alias="os_solaris_x3.png">images/x3/os_solaris_x3.png</file>
-        <file alias="os_turbolinux_32_x3.png">images/x3/os_turbolinux_32_x3.png</file>
         <file alias="os_turbolinux_x3.png">images/x3/os_turbolinux_x3.png</file>
-        <file alias="os_ubuntu_32_x3.png">images/x3/os_ubuntu_32_x3.png</file>
         <file alias="os_ubuntu_x3.png">images/x3/os_ubuntu_x3.png</file>
-        <file alias="os_win10_32_x3.png">images/x3/os_win10_32_x3.png</file>
         <file alias="os_win10_x3.png">images/x3/os_win10_x3.png</file>
         <file alias="os_win11_x3.png">images/x3/os_win11_x3.png</file>
@@ -150,15 +143,10 @@
         <file alias="os_win2k19_x3.png">images/x3/os_win2k19_x3.png</file>
         <file alias="os_win2k22_x3.png">images/x3/os_win2k22_x3.png</file>
-        <file alias="os_win2k3_32_x3.png">images/x3/os_win2k3_32_x3.png</file>
         <file alias="os_win2k3_x3.png">images/x3/os_win2k3_x3.png</file>
-        <file alias="os_win2k8_32_x3.png">images/x3/os_win2k8_32_x3.png</file>
         <file alias="os_win2k8_x3.png">images/x3/os_win2k8_x3.png</file>
         <file alias="os_win2k_x3.png">images/x3/os_win2k_x3.png</file>
         <file alias="os_win31_x3.png">images/x3/os_win31_x3.png</file>
-        <file alias="os_win7_32_x3.png">images/x3/os_win7_32_x3.png</file>
         <file alias="os_win7_x3.png">images/x3/os_win7_x3.png</file>
-        <file alias="os_win81_32_x3.png">images/x3/os_win81_32_x3.png</file>
         <file alias="os_win81_x3.png">images/x3/os_win81_x3.png</file>
-        <file alias="os_win8_32_x3.png">images/x3/os_win8_32_x3.png</file>
         <file alias="os_win8_x3.png">images/x3/os_win8_x3.png</file>
         <file alias="os_win95_x3.png">images/x3/os_win95_x3.png</file>
@@ -166,11 +154,7 @@
         <file alias="os_winme_x3.png">images/x3/os_winme_x3.png</file>
         <file alias="os_winnt4_x3.png">images/x3/os_winnt4_x3.png</file>
-        <file alias="os_win_other_32_x3.png">images/x3/os_win_other_32_x3.png</file>
         <file alias="os_win_other_x3.png">images/x3/os_win_other_x3.png</file>
-        <file alias="os_winvista_32_x3.png">images/x3/os_winvista_32_x3.png</file>
         <file alias="os_winvista_x3.png">images/x3/os_winvista_x3.png</file>
-        <file alias="os_winxp_32_x3.png">images/x3/os_winxp_32_x3.png</file>
         <file alias="os_winxp_x3.png">images/x3/os_winxp_x3.png</file>
-        <file alias="os_xandros_32_x3.png">images/x3/os_xandros_32_x3.png</file>
         <file alias="os_xandros_x3.png">images/x3/os_xandros_x3.png</file>
         <file alias="pcie_16px_x3.png">images/x3/pcie_16px_x3.png</file>
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc	(revision 101575)
@@ -1,4 +1,19 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="ide_expand_16px_x4.png">images/x4/ide_expand_16px_x4.png</file>
+        <file alias="import_16px_x4.png">images/x4/import_16px_x4.png</file>
+        <file alias="import_32px_x4.png">images/x4/import_32px_x4.png</file>
+        <file alias="import_disabled_16px_x4.png">images/x4/import_disabled_16px_x4.png</file>
+        <file alias="import_disabled_32px_x4.png">images/x4/import_disabled_32px_x4.png</file>
+        <file alias="interface_16px_x4.png">images/x4/interface_16px_x4.png</file>
+        <file alias="interface_24px_x4.png">images/x4/interface_24px_x4.png</file>
+        <file alias="interface_32px_x4.png">images/x4/interface_32px_x4.png</file>
+        <file alias="interface_warning_16px_x4.png">images/x4/interface_warning_16px_x4.png</file>
+        <file alias="keep_object_16px_x4.png">images/x4/keep_object_16px_x4.png</file>
+        <file alias="keyboard_16px_x4.png">images/x4/keyboard_16px_x4.png</file>
+        <file alias="keyboard_24px_x4.png">images/x4/keyboard_24px_x4.png</file>
+        <file alias="keyboard_32px_x4.png">images/x4/keyboard_32px_x4.png</file>
+        <file alias="keyboard_settings_16px_x4.png">images/x4/keyboard_settings_16px_x4.png</file>
+        <file alias="keyboard_settings_disabled_16px_x4.png">images/x4/keyboard_settings_disabled_16px_x4.png</file>
         <file alias="launch_vm_16px_x4.png">images/x4/launch_vm_16px_x4.png</file>
         <file alias="list_movedown_16px_x4.png">images/x4/list_movedown_16px_x4.png</file>
@@ -91,38 +106,22 @@
         <file alias="nw_write_16px_x4.png">images/x4/nw_write_16px_x4.png</file>
         <file alias="ok_16px_x4.png">images/x4/ok_16px_x4.png</file>
-        <file alias="os_archlinux_32_x4.png">images/x4/os_archlinux_32_x4.png</file>
         <file alias="os_archlinux_x4.png">images/x4/os_archlinux_x4.png</file>
         <file alias="os_cloud_x4.png">images/x4/os_cloud_x4.png</file>
-        <file alias="os_debian_32_x4.png">images/x4/os_debian_32_x4.png</file>
         <file alias="os_debian_x4.png">images/x4/os_debian_x4.png</file>
         <file alias="os_dos_x4.png">images/x4/os_dos_x4.png</file>
-        <file alias="os_fedora_32_x4.png">images/x4/os_fedora_32_x4.png</file>
         <file alias="os_fedora_x4.png">images/x4/os_fedora_x4.png</file>
-        <file alias="os_freebsd_32_x4.png">images/x4/os_freebsd_32_x4.png</file>
         <file alias="os_freebsd_x4.png">images/x4/os_freebsd_x4.png</file>
-        <file alias="os_gentoo_32_x4.png">images/x4/os_gentoo_32_x4.png</file>
         <file alias="os_gentoo_x4.png">images/x4/os_gentoo_x4.png</file>
         <file alias="os_jrockitve_x4.png">images/x4/os_jrockitve_x4.png</file>
         <file alias="os_l4_x4.png">images/x4/os_l4_x4.png</file>
-        <file alias="os_linux22_32_x4.png">images/x4/os_linux22_32_x4.png</file>
-        <file alias="os_linux24_32_x4.png">images/x4/os_linux24_32_x4.png</file>
         <file alias="os_linux24_x4.png">images/x4/os_linux24_x4.png</file>
-        <file alias="os_linux26_32_x4.png">images/x4/os_linux26_32_x4.png</file>
         <file alias="os_linux26_x4.png">images/x4/os_linux26_x4.png</file>
-        <file alias="os_linux_32_x4.png">images/x4/os_linux_32_x4.png</file>
         <file alias="os_linux_x4.png">images/x4/os_linux_x4.png</file>
-        <file alias="os_macosx_32_x4.png">images/x4/os_macosx_32_x4.png</file>
         <file alias="os_macosx_x4.png">images/x4/os_macosx_x4.png</file>
-        <file alias="os_mandriva_32_x4.png">images/x4/os_mandriva_32_x4.png</file>
         <file alias="os_mandriva_x4.png">images/x4/os_mandriva_x4.png</file>
-        <file alias="os_netbsd_32_x4.png">images/x4/os_netbsd_32_x4.png</file>
         <file alias="os_netbsd_x4.png">images/x4/os_netbsd_x4.png</file>
         <file alias="os_netware_x4.png">images/x4/os_netware_x4.png</file>
-        <file alias="os_openbsd_32_x4.png">images/x4/os_openbsd_32_x4.png</file>
         <file alias="os_openbsd_x4.png">images/x4/os_openbsd_x4.png</file>
-        <file alias="os_opensuse_32_x4.png">images/x4/os_opensuse_32_x4.png</file>
         <file alias="os_opensuse_x4.png">images/x4/os_opensuse_x4.png</file>
-        <file alias="os_oracle_32_x4.png">images/x4/os_oracle_32_x4.png</file>
-        <file alias="os_oraclesolaris_32_x4.png">images/x4/os_oraclesolaris_32_x4.png</file>
         <file alias="os_oraclesolaris_x4.png">images/x4/os_oraclesolaris_x4.png</file>
         <file alias="os_oracle_x4.png">images/x4/os_oracle_x4.png</file>
@@ -132,16 +131,10 @@
         <file alias="os_os2warp45_x4.png">images/x4/os_os2warp45_x4.png</file>
         <file alias="os_os2warp4_x4.png">images/x4/os_os2warp4_x4.png</file>
-        <file alias="os_other_32_x4.png">images/x4/os_other_32_x4.png</file>
         <file alias="os_other_x4.png">images/x4/os_other_x4.png</file>
         <file alias="os_qnx_x4.png">images/x4/os_qnx_x4.png</file>
-        <file alias="os_redhat_32_x4.png">images/x4/os_redhat_32_x4.png</file>
         <file alias="os_redhat_x4.png">images/x4/os_redhat_x4.png</file>
-        <file alias="os_solaris_32_x4.png">images/x4/os_solaris_32_x4.png</file>
         <file alias="os_solaris_x4.png">images/x4/os_solaris_x4.png</file>
-        <file alias="os_turbolinux_32_x4.png">images/x4/os_turbolinux_32_x4.png</file>
         <file alias="os_turbolinux_x4.png">images/x4/os_turbolinux_x4.png</file>
-        <file alias="os_ubuntu_32_x4.png">images/x4/os_ubuntu_32_x4.png</file>
         <file alias="os_ubuntu_x4.png">images/x4/os_ubuntu_x4.png</file>
-        <file alias="os_win10_32_x4.png">images/x4/os_win10_32_x4.png</file>
         <file alias="os_win10_x4.png">images/x4/os_win10_x4.png</file>
         <file alias="os_win11_x4.png">images/x4/os_win11_x4.png</file>
@@ -150,15 +143,10 @@
         <file alias="os_win2k19_x4.png">images/x4/os_win2k19_x4.png</file>
         <file alias="os_win2k22_x4.png">images/x4/os_win2k22_x4.png</file>
-        <file alias="os_win2k3_32_x4.png">images/x4/os_win2k3_32_x4.png</file>
         <file alias="os_win2k3_x4.png">images/x4/os_win2k3_x4.png</file>
-        <file alias="os_win2k8_32_x4.png">images/x4/os_win2k8_32_x4.png</file>
         <file alias="os_win2k8_x4.png">images/x4/os_win2k8_x4.png</file>
         <file alias="os_win2k_x4.png">images/x4/os_win2k_x4.png</file>
         <file alias="os_win31_x4.png">images/x4/os_win31_x4.png</file>
-        <file alias="os_win7_32_x4.png">images/x4/os_win7_32_x4.png</file>
         <file alias="os_win7_x4.png">images/x4/os_win7_x4.png</file>
-        <file alias="os_win81_32_x4.png">images/x4/os_win81_32_x4.png</file>
         <file alias="os_win81_x4.png">images/x4/os_win81_x4.png</file>
-        <file alias="os_win8_32_x4.png">images/x4/os_win8_32_x4.png</file>
         <file alias="os_win8_x4.png">images/x4/os_win8_x4.png</file>
         <file alias="os_win95_x4.png">images/x4/os_win95_x4.png</file>
@@ -166,11 +154,7 @@
         <file alias="os_winme_x4.png">images/x4/os_winme_x4.png</file>
         <file alias="os_winnt4_x4.png">images/x4/os_winnt4_x4.png</file>
-        <file alias="os_win_other_32_x4.png">images/x4/os_win_other_32_x4.png</file>
         <file alias="os_win_other_x4.png">images/x4/os_win_other_x4.png</file>
-        <file alias="os_winvista_32_x4.png">images/x4/os_winvista_32_x4.png</file>
         <file alias="os_winvista_x4.png">images/x4/os_winvista_x4.png</file>
-        <file alias="os_winxp_32_x4.png">images/x4/os_winxp_32_x4.png</file>
         <file alias="os_winxp_x4.png">images/x4/os_winxp_x4.png</file>
-        <file alias="os_xandros_32_x4.png">images/x4/os_xandros_32_x4.png</file>
         <file alias="os_xandros_x4.png">images/x4/os_xandros_x4.png</file>
         <file alias="pcie_16px_x4.png">images/x4/pcie_16px_x4.png</file>
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 101574)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 101575)
@@ -326,5 +326,5 @@
 
     /* Prepare OS type icon-name hash: */
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Other"),                 ":/os_other_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Other"),                 ":/os_other.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Other"),                 ":/os_other.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Other"),                 ":/os_other.png");
@@ -339,20 +339,20 @@
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsNT4"),            ":/os_winnt4.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows2000"),           ":/os_win2k.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsXP"),             ":/os_winxp_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsXP"),             ":/os_winxp.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("WindowsXP"),             ":/os_winxp.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows2003"),           ":/os_win2k3_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows2003"),           ":/os_win2k3.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2003"),           ":/os_win2k3.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsVista"),          ":/os_winvista_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsVista"),          ":/os_winvista.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("WindowsVista"),          ":/os_winvista.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows2008"),           ":/os_win2k8_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows2008"),           ":/os_win2k8.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2008"),           ":/os_win2k8.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows7"),              ":/os_win7_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows7"),              ":/os_win7.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows7"),              ":/os_win7.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows8"),              ":/os_win8_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows8"),              ":/os_win8.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows8"),              ":/os_win8.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows81"),             ":/os_win81_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows81"),             ":/os_win81.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows81"),             ":/os_win81.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2012"),           ":/os_win2k12.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows10"),             ":/os_win10_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Windows10"),             ":/os_win10.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows10"),             ":/os_win10.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows11"),             ":/os_win11.png");
@@ -360,5 +360,5 @@
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2019"),           ":/os_win2k19.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Windows2022"),           ":/os_win2k22.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsNT"),             ":/os_win_other_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("WindowsNT"),             ":/os_win_other.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("WindowsNT"),             ":/os_win_other.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OS2Warp3"),              ":/os_os2warp3.png");
@@ -369,109 +369,109 @@
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OS21x"),                 ":/os_os2_other.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OS2"),                   ":/os_os2_other.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux22"),               ":/os_linux22_32.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux24"),               ":/os_linux24_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux22"),               ":/os_linux22.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux24"),               ":/os_linux24.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Linux24"),               ":/os_linux24.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux26"),               ":/os_linux26_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux26"),               ":/os_linux26.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Linux26"),               ":/os_linux26.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("ArchLinux"),             ":/os_archlinux_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("ArchLinux"),             ":/os_archlinux.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("ArchLinux"),             ":/os_archlinux.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("ArchLinux"),             ":/os_archlinux.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian"),                ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian"),                ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian"),                ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Debian"),                ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian31"),              ":/os_debian_32.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian4"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian31"),              ":/os_debian.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian4"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian4"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian5"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian5"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian5"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian5"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian5"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian5"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian6"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian6"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian6"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian7"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian7"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian7"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian8"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian8"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian8"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian9"),               ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian9"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian9"),               ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Debian9"),               ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian10"),              ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian10"),              ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian10"),              ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Debian10"),              ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian11"),              ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian11"),              ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian11"),              ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Debian11"),              ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian12"),              ":/os_debian_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Debian12"),              ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Debian12"),              ":/os_debian.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Debian12"),              ":/os_debian.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenSUSE"),              ":/os_opensuse_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenSUSE"),              ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("OpenSUSE"),              ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("OpenSUSE_Leap"),         ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("OpenSUSE_Leap"),         ":/os_opensuse.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenSUSE_Tumbleweed"),   ":/os_opensuse_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenSUSE_Tumbleweed"),   ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("OpenSUSE_Tumbleweed"),   ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("OpenSUSE_Tumbleweed"),   ":/os_opensuse.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("SUSE_LE"),               ":/os_opensuse_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("SUSE_LE"),               ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("SUSE_LE"),               ":/os_opensuse.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Fedora"),                ":/os_fedora_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Fedora"),                ":/os_fedora.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Fedora"),                ":/os_fedora.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Fedora"),                ":/os_fedora.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Gentoo"),                ":/os_gentoo_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Gentoo"),                ":/os_gentoo.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Gentoo"),                ":/os_gentoo.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Mandriva"),              ":/os_mandriva_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Mandriva"),              ":/os_mandriva.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Mandriva"),              ":/os_mandriva.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenMandriva_Lx"),       ":/os_mandriva_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenMandriva_Lx"),       ":/os_mandriva.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("OpenMandriva_Lx"),       ":/os_mandriva.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("PCLinuxOS"),             ":/os_mandriva_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("PCLinuxOS"),             ":/os_mandriva.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("PCLinuxOS"),             ":/os_mandriva.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Mageia"),                ":/os_mandriva_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Mageia"),                ":/os_mandriva.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Mageia"),                ":/os_mandriva.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat"),                ":/os_redhat_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat"),                ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat"),                ":/os_redhat.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat3"),               ":/os_redhat_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat3"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat3"),               ":/os_redhat.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat4"),               ":/os_redhat_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat4"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat4"),               ":/os_redhat.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat5"),               ":/os_redhat_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat5"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat5"),               ":/os_redhat.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat6"),               ":/os_redhat_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("RedHat6"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat6"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat7"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat8"),               ":/os_redhat.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("RedHat9"),               ":/os_redhat.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Turbolinux"),            ":/os_turbolinux_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Turbolinux"),            ":/os_turbolinux.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Turbolinux"),            ":/os_turbolinux.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu"),                ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu"),                ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu"),                ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Ubuntu"),                ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu10_LTS"),          ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu10_LTS"),          ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu10_LTS"),          ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu10"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu10"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu10"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu11"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu11"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu11"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu12_LTS"),          ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu12_LTS"),          ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu12_LTS"),          ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu12"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu12"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu12"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu13"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu13"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu13"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu14_LTS"),          ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu14_LTS"),          ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu14_LTS"),          ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu14"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu14"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu14"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu15"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu15"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu15"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu16_LTS"),          ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu16_LTS"),          ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu16_LTS"),          ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu16"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu16"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu16"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu17"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu17"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu17"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu18_LTS"),          ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu18_LTS"),          ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu18_LTS"),          ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu18"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu18"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu18"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu19"),              ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Ubuntu19"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu19"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu20_LTS"),          ":/os_ubuntu.png");
@@ -484,19 +484,19 @@
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Ubuntu23"),              ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Ubuntu23"),              ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Lubuntu"),               ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Lubuntu"),               ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Lubuntu"),               ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Xubuntu"),               ":/os_ubuntu_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Xubuntu"),               ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Xubuntu"),               ":/os_ubuntu.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Xandros"),               ":/os_xandros_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Xandros"),               ":/os_xandros.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Xandros"),               ":/os_xandros.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle"),                ":/os_oracle_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle"),                ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle"),                ":/os_oracle.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle3"),               ":/os_oracle_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle3"),               ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle3"),               ":/os_oracle.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle4"),               ":/os_oracle_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle4"),               ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle4"),               ":/os_oracle.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle5"),               ":/os_oracle_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle5"),               ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle5"),               ":/os_oracle.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle6"),               ":/os_oracle_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle6"),               ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle6"),               ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle7"),               ":/os_oracle.png");
@@ -504,29 +504,29 @@
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle9"),               ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Oracle9"),               ":/os_oracle.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle"),                ":/os_oracle_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Oracle"),                ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Oracle"),                ":/os_oracle.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("Oracle"),                ":/os_oracle.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux"),                 ":/os_linux_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Linux"),                 ":/os_linux.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Linux"),                 ":/os_linux.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("FreeBSD"),               ":/os_freebsd_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("FreeBSD"),               ":/os_freebsd.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("FreeBSD"),               ":/os_freebsd.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("FreeBSD"),               ":/os_freebsd.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenBSD"),               ":/os_openbsd_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenBSD"),               ":/os_openbsd.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("OpenBSD"),               ":/os_openbsd.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("OpenBSD"),               ":/os_openbsd.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("NetBSD"),                ":/os_netbsd_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("NetBSD"),                ":/os_netbsd.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("NetBSD"),                ":/os_netbsd.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_A64("NetBSD"),                ":/os_netbsd.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Solaris"),               ":/os_solaris_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Solaris"),               ":/os_solaris.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Solaris"),               ":/os_solaris.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Solaris10U8_or_later"),  ":/os_solaris_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("Solaris10U8_or_later"),  ":/os_solaris.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Solaris10U8_or_later"),  ":/os_solaris.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenSolaris"),           ":/os_oraclesolaris_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("OpenSolaris"),           ":/os_oraclesolaris.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("OpenSolaris"),           ":/os_oraclesolaris.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("Solaris11"),             ":/os_oraclesolaris.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("QNX"),                   ":/os_qnx.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("MacOS"),                 ":/os_macosx_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("MacOS"),                 ":/os_macosx.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("MacOS"),                 ":/os_macosx.png");
-    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("MacOS106"),              ":/os_macosx_32.png");
+    m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X86("MacOS106"),              ":/os_macosx.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("MacOS106"),              ":/os_macosx.png");
     m_guestOSTypeIconNames.insert(GUEST_OS_ID_STR_X64("MacOS107"),              ":/os_macosx.png");
