Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp	(revision 51278)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp	(revision 51279)
@@ -31,7 +31,7 @@
 
 QIRichToolButton::QIRichToolButton (QWidget *aParent)
-    : QWidget (aParent)
-    , mButton (new QToolButton())
-    , mLabel (new QLabel())
+    : QWidget(aParent)
+    , mButton(new QIToolButton)
+    , mLabel(new QLabel)
 {
     init();
@@ -39,7 +39,7 @@
 
 QIRichToolButton::QIRichToolButton (const QString &aName, QWidget *aParent)
-    : QWidget (aParent)
-    , mButton (new QToolButton())
-    , mLabel (new QLabel (aName))
+    : QWidget(aParent)
+    , mButton(new QIToolButton)
+    , mLabel(new QLabel(aName))
 {
     init();
@@ -52,8 +52,6 @@
 
     /* Setup tool-button */
-    mButton->setAutoRaise (true);
-    mButton->setFixedSize (17, 16);
+    mButton->removeBorder();
     mButton->setFocusPolicy (Qt::NoFocus);
-    mButton->setStyleSheet ("QToolButton {border: 0px none black;}");
     connect (mButton, SIGNAL (clicked (bool)), this, SLOT (buttonClicked()));
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h	(revision 51278)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h	(revision 51279)
@@ -20,8 +20,10 @@
 #define __QIRichToolButton_h__
 
-/* Qt includes */
+/* Qt includes: */
 #include <QLabel>
 #include <QWidget>
-#include <QToolButton>
+
+/* GUI includes: */
+#include "QIToolButton.h"
 
 /** @class QIRichToolButton
@@ -57,5 +59,5 @@
     void paintEvent (QPaintEvent *aEvent);
 
-    QToolButton *mButton;
+    QIToolButton *mButton;
     QLabel *mLabel;
 };