Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp	(revision 68207)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp	(revision 68208)
@@ -27,7 +27,7 @@
 # include <QPainter>
 # include <QStyle>
+# include <QToolButton>
 
 /* GUI includes: */
-# include "QIToolButton.h"
 # include "UIIconPool.h"
 # include "UITabBar.h"
@@ -43,4 +43,5 @@
 class QLabel;
 class QStyle;
+class QToolButton;
 
 
@@ -104,11 +105,12 @@
 
     /** Holds the main layout instance. */
-    QHBoxLayout  *m_pLayout;
+    QHBoxLayout *m_pLayout;
+
     /** Holds the icon label instance. */
-    QLabel       *m_pLabelIcon;
+    QLabel      *m_pLabelIcon;
     /** Holds the name label instance. */
-    QLabel       *m_pLabelName;
+    QLabel      *m_pLabelName;
     /** Holds the close button instance. */
-    QIToolButton *m_pButtonClose;
+    QToolButton *m_pButtonClose;
 };
 
@@ -147,9 +149,23 @@
     {
         /* Update the hovered state on/off: */
-        case QEvent::Enter: m_fHovered = true; update(); break;
-        case QEvent::Leave: m_fHovered = false; update(); break;
+        case QEvent::Enter:
+        {
+            m_fHovered = true;
+            update();
+            break;
+        }
+        case QEvent::Leave:
+        {
+            m_fHovered = false;
+            update();
+            break;
+        }
 
         /* Notify listeners about the item was clicked: */
-        case QEvent::MouseButtonRelease: emit sigClicked(this); break;
+        case QEvent::MouseButtonRelease:
+        {
+            emit sigClicked(this);
+            break;
+        }
 
         default: break;
@@ -240,4 +256,7 @@
 void UITabBarItem::prepare()
 {
+    /* Configure self: */
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+
     /* Create main layout: */
     m_pLayout = new QHBoxLayout(this);
@@ -260,7 +279,4 @@
             /* Configure label: */
             m_pLabelIcon->setPixmap(m_icon.pixmap(iMetric));
-
-            /* Add into layout: */
-            m_pLayout->addWidget(m_pLabelIcon);
         }
 
@@ -271,21 +287,22 @@
             /* Configure label: */
             m_pLabelName->setText(m_strName);
-
-            /* Add into layout: */
-            m_pLayout->addWidget(m_pLabelName);
         }
 
         /* Create close button: */
-        m_pButtonClose = new QIToolButton;
+        m_pButtonClose = new QToolButton;
         AssertPtrReturnVoid(m_pButtonClose);
         {
             /* Configure button: */
+            m_pButtonClose->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
             m_pButtonClose->setIconSize(QSize(iMetricCloseButton, iMetricCloseButton));
             m_pButtonClose->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-            connect(m_pButtonClose, &QIToolButton::clicked, this, &UITabBarItem::sltCloseClicked);
-
-            /* Add into layout: */
-            m_pLayout->addWidget(m_pButtonClose);
-        }
+            m_pButtonClose->setStyleSheet("QToolButton { border: 0px }");
+            connect(m_pButtonClose, &QToolButton::clicked, this, &UITabBarItem::sltCloseClicked);
+        }
+
+        /* Add everything into main-layout: */
+        m_pLayout->addWidget(m_pLabelIcon);
+        m_pLayout->addWidget(m_pLabelName);
+        m_pLayout->addWidget(m_pButtonClose);
     }
 }