Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp	(revision 51267)
@@ -384,7 +384,5 @@
 
     /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16),
-                                          ":/vm_show_logs_32px.png",
-                                          ":/vm_show_logs_16px.png"));
+    setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
 
     /* Create VM Log Vewer container: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 51267)
@@ -164,18 +164,17 @@
 /* UIActionSimple stuff: */
 UIActionSimple::UIActionSimple(UIActionPool *pParent,
-                               const QString &strIcon, const QString &strIconDis)
+                               const QString &strIcon /* = QString() */, const QString &strIconDisabled /* = QString() */)
     : UIAction(pParent, UIActionType_Simple)
 {
     if (!strIcon.isNull())
-        setIcon(UIIconPool::iconSet(strIcon, strIconDis));
+        setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
 }
 
 UIActionSimple::UIActionSimple(UIActionPool *pParent,
-                               const QSize &normalSize, const QSize &smallSize,
-                               const QString &strNormalIcon, const QString &strSmallIcon,
-                               const QString &strNormalIconDis, const QString &strSmallIconDis)
+                               const QString &strIconNormal, const QString &strIconSmall,
+                               const QString &strIconNormalDisabled, const QString &strIconSmallDisabled)
     : UIAction(pParent, UIActionType_Simple)
 {
-    setIcon(UIIconPool::iconSetFull(normalSize, smallSize, strNormalIcon, strSmallIcon, strNormalIconDis, strSmallIconDis));
+    setIcon(UIIconPool::iconSetFull(strIconNormal, strIconSmall, strIconNormalDisabled, strIconSmallDisabled));
 }
 
@@ -184,26 +183,24 @@
     : UIAction(pParent, UIActionType_Simple)
 {
-    if (!icon.isNull())
-        setIcon(icon);
+    setIcon(icon);
 }
 
 /* UIActionState stuff: */
 UIActionState::UIActionState(UIActionPool *pParent,
-                             const QString &strIcon, const QString &strIconDis)
+                             const QString &strIcon /* = QString() */, const QString &strIconDisabled /* = QString() */)
     : UIAction(pParent, UIActionType_State)
     , m_iState(0)
 {
     if (!strIcon.isNull())
-        setIcon(UIIconPool::iconSet(strIcon, strIconDis));
+        setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
 }
 
 UIActionState::UIActionState(UIActionPool *pParent,
-                             const QSize &normalSize, const QSize &smallSize,
-                             const QString &strNormalIcon, const QString &strSmallIcon,
-                             const QString &strNormalIconDis, const QString &strSmallIconDis)
+                             const QString &strIconNormal, const QString &strIconSmall,
+                             const QString &strIconNormalDisabled, const QString &strIconSmallDisabled)
     : UIAction(pParent, UIActionType_State)
     , m_iState(0)
 {
-    setIcon(UIIconPool::iconSetFull(normalSize, smallSize, strNormalIcon, strSmallIcon, strNormalIconDis, strSmallIconDis));
+    setIcon(UIIconPool::iconSetFull(strIconNormal, strIconSmall, strIconNormalDisabled, strIconSmallDisabled));
 }
 
@@ -219,28 +216,18 @@
 /* UIActionToggle stuff: */
 UIActionToggle::UIActionToggle(UIActionPool *pParent,
-                               const QString &strIcon, const QString &strIconDis)
+                               const QString &strIcon /* = QString() */, const QString &strIconDisabled /* = QString() */)
     : UIAction(pParent, UIActionType_Toggle)
 {
     if (!strIcon.isNull())
-        setIcon(UIIconPool::iconSet(strIcon, strIconDis));
+        setIcon(UIIconPool::iconSet(strIcon, strIconDisabled));
     init();
 }
 
 UIActionToggle::UIActionToggle(UIActionPool *pParent,
-                               const QSize &normalSize, const QSize &smallSize,
-                               const QString &strNormalIcon, const QString &strSmallIcon,
-                               const QString &strNormalIconDis, const QString &strSmallIconDis)
+                               const QString &strIconOn, const QString &strIconOff,
+                               const QString &strIconOnDisabled, const QString &strIconOffDisabled)
     : UIAction(pParent, UIActionType_Toggle)
 {
-    setIcon(UIIconPool::iconSetFull(normalSize, smallSize, strNormalIcon, strSmallIcon, strNormalIconDis, strSmallIconDis));
-    init();
-}
-
-UIActionToggle::UIActionToggle(UIActionPool *pParent,
-               const QString &strIconOn, const QString &strIconOff,
-               const QString &strIconOnDis, const QString &strIconOffDis)
-    : UIAction(pParent, UIActionType_Toggle)
-{
-    setIcon(UIIconPool::iconSetOnOff(strIconOn, strIconOff, strIconOnDis, strIconOffDis));
+    setIcon(UIIconPool::iconSetOnOff(strIconOn, strIconOff, strIconOnDisabled, strIconOffDisabled));
     init();
 }
@@ -293,5 +280,5 @@
 
     UIActionSimpleLogDialog(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionSimple(pParent,
                          ":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png",
                          ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png")
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 51267)
@@ -152,9 +152,8 @@
     /* Constructors: */
     UIActionSimple(UIActionPool *pParent,
-                   const QString &strIcon = QString(), const QString &strIconDis = QString());
+                   const QString &strIcon = QString(), const QString &strIconDisabled = QString());
     UIActionSimple(UIActionPool *pParent,
-                   const QSize &normalSize, const QSize &smallSize,
-                   const QString &strNormalIcon, const QString &strSmallIcon,
-                   const QString &strNormalIconDis = QString(), const QString &strSmallIconDis = QString());
+                   const QString &strIconNormal, const QString &strIconSmall,
+                   const QString &strIconNormalDisabled, const QString &strIconSmallDisabled);
     UIActionSimple(UIActionPool *pParent,
                    const QIcon& icon);
@@ -175,9 +174,8 @@
     /* Constructors: */
     UIActionState(UIActionPool *pParent,
-                  const QString &strIcon = QString(), const QString &strIconDis = QString());
+                  const QString &strIcon = QString(), const QString &strIconDisabled = QString());
     UIActionState(UIActionPool *pParent,
-                  const QSize &normalSize, const QSize &smallSize,
-                  const QString &strNormalIcon, const QString &strSmallIcon,
-                  const QString &strNormalIconDis = QString(), const QString &strSmallIconDis = QString());
+                  const QString &strIconNormal, const QString &strIconSmall,
+                  const QString &strIconNormalDisabled, const QString &strIconSmallDisabled);
     UIActionState(UIActionPool *pParent,
                   const QIcon& icon);
@@ -196,11 +194,8 @@
     /* Constructors: */
     UIActionToggle(UIActionPool *pParent,
-                   const QString &strIcon = QString(), const QString &strIconDis = QString());
+                   const QString &strIcon = QString(), const QString &strIconDisabled = QString());
     UIActionToggle(UIActionPool *pParent,
-                   const QSize &normalSize, const QSize &smallSize,
-                   const QString &strNormalIcon, const QString &strSmallIcon,
-                   const QString &strNormalIconDis = QString(), const QString &strSmallIconDis = QString());
-    UIActionToggle(UIActionPool *pParent,
-                   const QString &strIconOn, const QString &strIconOff, const QString &strIconOnDis, const QString &strIconOffDis);
+                   const QString &strIconOn, const QString &strIconOff,
+                   const QString &strIconOnDisabled, const QString &strIconOffDisabled);
     UIActionToggle(UIActionPool *pParent,
                    const QIcon &icon);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 51267)
@@ -88,31 +88,34 @@
 
 /* static */
-QIcon UIIconPool::iconSetFull(const QSize &size, const QSize &smallSize,
-                              const QString &strNormal, const QString &strSmallNormal,
-                              const QString &strDisabled /* = QString() */,
-                              const QString &strSmallDisabled /* = QString() */,
-                              const QString &strActive /* = QString() */,
-                              const QString &strSmallActive /* = QString() */)
-{
-    QIcon iconSet;
-
-    Assert(!strNormal.isEmpty());
-    Assert(!strSmallNormal.isEmpty());
-    iconSet.addFile(strNormal, size, QIcon::Normal);
-    iconSet.addFile(strSmallNormal, smallSize, QIcon::Normal);
-
+QIcon UIIconPool::iconSetFull(const QString &strNormal, const QString &strSmall,
+                              const QString &strNormalDisabled /* = QString() */, const QString &strSmallDisabled /* = QString() */,
+                              const QString &strNormalActive /* = QString() */, const QString &strSmallActive /* = QString() */)
+{
+    /* Prepare fallback icon: */
+    static QIcon nullIcon;
+
+    /* Prepare icon: */
+    QIcon icon;
+
+    /* Add 'normal' & 'small normal' pixmaps: */
+    AssertReturn(!strNormal.isEmpty(), nullIcon);
+    addName(icon, strNormal, QIcon::Normal);
+    AssertReturn(!strSmall.isEmpty(), nullIcon);
+    addName(icon, strSmall, QIcon::Normal);
+
+    /* Add 'disabled' & 'small disabled' pixmaps (if any): */
+    if (!strNormalDisabled.isEmpty())
+        addName(icon, strNormalDisabled, QIcon::Disabled);
     if (!strSmallDisabled.isEmpty())
-    {
-        iconSet.addFile(strDisabled, size, QIcon::Disabled);
-        iconSet.addFile(strSmallDisabled, smallSize, QIcon::Disabled);
-    }
-
+        addName(icon, strSmallDisabled, QIcon::Disabled);
+
+    /* Add 'active' & 'small active' pixmaps (if any): */
+    if (!strNormalActive.isEmpty())
+        addName(icon, strNormalActive, QIcon::Active);
     if (!strSmallActive.isEmpty())
-    {
-        iconSet.addFile(strActive, size, QIcon::Active);
-        iconSet.addFile(strSmallActive, smallSize, QIcon::Active);
-    }
-
-    return iconSet;
+        addName(icon, strSmallActive, QIcon::Active);
+
+    /* Return icon: */
+    return icon;
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.h	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.h	(revision 51267)
@@ -60,8 +60,7 @@
       * @a strNormal, @a strDisabled, @a strActive icon states and
       * their analogs for small-icon case. Used for setting pages. */
-    static QIcon iconSetFull(const QSize &size, const QSize &smallSize,
-                             const QString &strNormal, const QString &strSmallNormal,
-                             const QString &strDisabled = QString(), const QString &strSmallDisabled = QString(),
-                             const QString &strActive = QString(), const QString &strSmallActive = QString());
+    static QIcon iconSetFull(const QString &strNormal, const QString &strSmall,
+                             const QString &strNormalDisabled = QString(), const QString &strSmallDisabled = QString(),
+                             const QString &strNormalActive = QString(), const QString &strSmallActive = QString());
 
     /** Creates icon from passed pixmaps for
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 51267)
@@ -994,6 +994,5 @@
 
     /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16),
-                                          ":/diskimage_32px.png", ":/diskimage_16px.png"));
+    setWindowIcon(UIIconPool::iconSetFull(":/diskimage_32px.png", ":/diskimage_16px.png"));
 
     /* Prepare connections: */
@@ -1464,30 +1463,25 @@
     }
     if (m_pActionCopy)
-        m_pActionCopy->setIcon(UIIconPool::iconSetFull(QSize(22, 22), QSize(16, 16),
-                                                       QString(":/%1_copy_22px.png").arg(strPrefix),
+        m_pActionCopy->setIcon(UIIconPool::iconSetFull(QString(":/%1_copy_22px.png").arg(strPrefix),
                                                        QString(":/%1_copy_16px.png").arg(strPrefix),
                                                        QString(":/%1_copy_disabled_22px.png").arg(strPrefix),
                                                        QString(":/%1_copy_disabled_16px.png").arg(strPrefix)));
     if (m_pActionModify)
-        m_pActionModify->setIcon(UIIconPool::iconSetFull(QSize(22, 22), QSize(16, 16),
-                                                         QString(":/%1_modify_22px.png").arg(strPrefix),
+        m_pActionModify->setIcon(UIIconPool::iconSetFull(QString(":/%1_modify_22px.png").arg(strPrefix),
                                                          QString(":/%1_modify_16px.png").arg(strPrefix),
                                                          QString(":/%1_modify_disabled_22px.png").arg(strPrefix),
                                                          QString(":/%1_modify_disabled_16px.png").arg(strPrefix)));
     if (m_pActionRemove)
-        m_pActionRemove->setIcon(UIIconPool::iconSetFull(QSize(22, 22), QSize(16, 16),
-                                                         QString(":/%1_remove_22px.png").arg(strPrefix),
+        m_pActionRemove->setIcon(UIIconPool::iconSetFull(QString(":/%1_remove_22px.png").arg(strPrefix),
                                                          QString(":/%1_remove_16px.png").arg(strPrefix),
                                                          QString(":/%1_remove_disabled_22px.png").arg(strPrefix),
                                                          QString(":/%1_remove_disabled_16px.png").arg(strPrefix)));
     if (m_pActionRelease)
-        m_pActionRelease->setIcon(UIIconPool::iconSetFull(QSize(22, 22), QSize(16, 16),
-                                                          QString(":/%1_release_22px.png").arg(strPrefix),
+        m_pActionRelease->setIcon(UIIconPool::iconSetFull(QString(":/%1_release_22px.png").arg(strPrefix),
                                                           QString(":/%1_release_16px.png").arg(strPrefix),
                                                           QString(":/%1_release_disabled_22px.png").arg(strPrefix),
                                                           QString(":/%1_release_disabled_16px.png").arg(strPrefix)));
     if (m_pActionRefresh && m_pActionRefresh->icon().isNull())
-        m_pActionRefresh->setIcon(UIIconPool::iconSetFull(QSize(22, 22), QSize(16, 16),
-                                                          ":/refresh_22px.png", ":/refresh_16px.png",
+        m_pActionRefresh->setIcon(UIIconPool::iconSetFull(":/refresh_22px.png", ":/refresh_16px.png",
                                                           ":/refresh_disabled_22px.png", ":/refresh_disabled_16px.png"));
 }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp	(revision 51267)
@@ -52,5 +52,5 @@
 {
     /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(QSize (32, 32), QSize (16, 16), ":/nw_32px.png", ":/nw_16px.png"));
+    setWindowIcon(UIIconPool::iconSetFull(":/nw_32px.png", ":/nw_16px.png"));
 
     /* Do not count that window as important for application,
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 51267)
@@ -232,5 +232,5 @@
 
     UIActionSimpleGroupNew(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/vm_new_16px.png")
+        : UIActionSimple(pParent, ":/vm_new_32px.png", ":/vm_new_16px.png")
     {
         retranslateUi();
@@ -405,5 +405,5 @@
 
     UIActionSimpleMachineNew(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/vm_new_16px.png")
+        : UIActionSimple(pParent, ":/vm_new_32px.png", ":/vm_new_16px.png")
     {
         retranslateUi();
@@ -500,5 +500,5 @@
 
     UIActionSimpleMachineSettings(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionSimple(pParent,
                          ":/vm_settings_32px.png", ":/vm_settings_16px.png",
                          ":/vm_settings_disabled_32px.png", ":/vm_settings_disabled_16px.png")
@@ -566,5 +566,5 @@
 
     UIActionSimpleMachineRemove(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionSimple(pParent,
                          ":/vm_delete_32px.png", ":/vm_delete_16px.png",
                          ":/vm_delete_disabled_32px.png", ":/vm_delete_disabled_16px.png")
@@ -600,5 +600,5 @@
 
     UIActionStateCommonStartOrShow(UIActionPool *pParent)
-        : UIActionState(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionState(pParent,
                         ":/vm_start_32px.png", ":/vm_start_16px.png",
                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png")
@@ -647,5 +647,5 @@
 
     UIActionToggleCommonPauseAndResume(UIActionPool *pParent)
-        : UIActionToggle(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionToggle(pParent,
                          ":/vm_pause_32px.png", ":/vm_pause_16px.png",
                          ":/vm_pause_disabled_32px.png", ":/vm_pause_disabled_16px.png")
@@ -711,5 +711,5 @@
 
     UIActionSimpleCommonDiscard(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionSimple(pParent,
                          ":/vm_discard_32px.png", ":/vm_discard_16px.png",
                          ":/vm_discard_disabled_32px.png", ":/vm_discard_disabled_16px.png")
@@ -747,5 +747,5 @@
 
     UIActionSimpleCommonRefresh(UIActionPool *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+        : UIActionSimple(pParent,
                          ":/refresh_32px.png", ":/refresh_16px.png",
                          ":/refresh_disabled_32px.png", ":/refresh_disabled_16px.png")
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp	(revision 51267)
@@ -380,21 +380,16 @@
     /* Setup actions */
     mRestoreSnapshotAction->setIcon(UIIconPool::iconSetFull(
-        QSize (22, 22), QSize (16, 16),
         ":/snapshot_restore_22px.png", ":/snapshot_restore_16px.png",
         ":/snapshot_restore_disabled_22px.png", ":/snapshot_restore_disabled_16px.png"));
     mDeleteSnapshotAction->setIcon(UIIconPool::iconSetFull(
-        QSize (22, 22), QSize (16, 16),
         ":/snapshot_delete_22px.png", ":/snapshot_delete_16px.png",
         ":/snapshot_delete_disabled_22px.png", ":/snapshot_delete_disabled_16px.png"));
     mShowSnapshotDetailsAction->setIcon(UIIconPool::iconSetFull(
-        QSize (22, 22), QSize (16, 16),
         ":/snapshot_show_details_22px.png", ":/snapshot_show_details_16px.png",
         ":/snapshot_show_details_disabled_22px.png", ":/snapshot_details_show_disabled_16px.png"));
     mTakeSnapshotAction->setIcon(UIIconPool::iconSetFull(
-        QSize (22, 22), QSize (16, 16),
         ":/snapshot_take_22px.png", ":/snapshot_take_16px.png",
         ":/snapshot_take_disabled_22px.png", ":/snapshot_take_disabled_16px.png"));
     mCloneSnapshotAction->setIcon(UIIconPool::iconSetFull(
-        QSize (22, 22), QSize (16, 16),
         ":/vm_clone_22px.png", ":/vm_clone_16px.png",
         ":/vm_clone_disabled_22px.png", ":/vm_clone_disabled_16px.png"));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp	(revision 51267)
@@ -37,5 +37,5 @@
 {
     /* Set dialog icon: */
-    setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16), ":/nw_32px.png", ":/nw_16px.png"));
+    setWindowIcon(UIIconPool::iconSetFull(":/nw_32px.png", ":/nw_16px.png"));
 
     /* Create layout: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp	(revision 51266)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp	(revision 51267)
@@ -34,5 +34,5 @@
 {
     /* Set dialog icon: */
-    setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16), ":/nw_32px.png", ":/nw_16px.png"));
+    setWindowIcon(UIIconPool::iconSetFull(":/nw_32px.png", ":/nw_16px.png"));
 
     /* Create layout: */