Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp	(revision 76987)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp	(revision 76988)
@@ -1753,12 +1753,4 @@
                                      QPalette::HighlightedText : QPalette::ButtonText));
 
-    /* Update buttons: */
-    if (m_pToggleButton)
-        m_pToggleButton->setParentSelected(model()->currentItems().contains(this));
-    if (m_pEnterButton)
-        m_pEnterButton->setParentSelected(model()->currentItems().contains(this));
-    if (m_pExitButton)
-        m_pExitButton->setParentSelected(model()->currentItems().contains(this));
-
     /* Paint name: */
     int iNameX = iHorizontalMargin + iParentIndent * level();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp	(revision 76987)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp	(revision 76988)
@@ -1,5 +1,5 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIGraphicsButton class definition.
+ * VBox Qt GUI - UIGraphicsButton class implementation.
  */
 
@@ -32,5 +32,4 @@
     : QIGraphicsWidget(pParent)
     , m_icon(icon)
-    , m_fParentSelected(false)
     , m_enmClickPolicy(ClickPolicy_OnRelease)
     , m_iDelayId(0)
@@ -38,14 +37,5 @@
     , m_dIconScaleIndex(0)
 {
-    /* Refresh finally: */
     refresh();
-}
-
-void UIGraphicsButton::setParentSelected(bool fParentSelected)
-{
-    if (m_fParentSelected == fParentSelected)
-        return;
-    m_fParentSelected = fParentSelected;
-    update();
 }
 
@@ -86,24 +76,26 @@
         case GraphicsButton_Icon:
             return m_icon;
-        default: break;
+        default:
+            break;
     }
     return QVariant();
 }
 
-QSizeF UIGraphicsButton::sizeHint(Qt::SizeHint which, const QSizeF &constraint /* = QSizeF() */) const
-{
-    /* Calculations for minimum size: */
-    if (which == Qt::MinimumSize)
-    {
-        /* Variables: */
-        int iMargin = data(GraphicsButton_Margin).toInt();
-        QSize iconSize = data(GraphicsButton_IconSize).toSize();
-        /* Calculations: */
+QSizeF UIGraphicsButton::sizeHint(Qt::SizeHint enmType, const QSizeF &constraint /* = QSizeF() */) const
+{
+    /* For minimum size-hint: */
+    if (enmType == Qt::MinimumSize)
+    {
+        /* Prepare variables: */
+        const int iMargin = data(GraphicsButton_Margin).toInt();
+        const QSize iconSize = data(GraphicsButton_IconSize).toSize();
+        /* Perform calculations: */
         int iWidth = 2 * iMargin + iconSize.width();
         int iHeight = 2 * iMargin + iconSize.height();
         return QSize(iWidth, iHeight);
     }
+
     /* Call to base-class: */
-    return QIGraphicsWidget::sizeHint(which, constraint);
+    return QIGraphicsWidget::sizeHint(enmType, constraint);
 }
 
@@ -114,5 +106,7 @@
     const QIcon icon = data(GraphicsButton_Icon).value<QIcon>();
     const QSize expectedIconSize = data(GraphicsButton_IconSize).toSize();
-    /* Determine which QWindow this QGraphicsWidget belongs to: */
+
+    /* Determine which QWindow this QGraphicsWidget belongs to.
+     * This is required for proper HiDPI-aware pixmap calculations. */
     QWindow *pWindow = 0;
     if (   scene()
@@ -121,5 +115,6 @@
         && scene()->views().first()->window())
         pWindow = scene()->views().first()->window()->windowHandle();
-    /* Acquire pixmap: */
+
+    /* Acquire pixmap, adjust it to be in center of button if necessary: */
     const QPixmap pixmap = icon.pixmap(pWindow, expectedIconSize);
     const QSize actualIconSize = pixmap.size() / pixmap.devicePixelRatio();
@@ -132,5 +127,5 @@
     }
 
-    /* Just draw the pixmap: */
+    /* Draw the pixmap finally: */
     pPainter->drawPixmap(position, pixmap);
 }
@@ -205,6 +200,5 @@
     /* Refresh geometry: */
     updateGeometry();
-    /* Resize to minimum size: */
+    /* Resize to minimum size-hint: */
     resize(minimumSizeHint());
 }
-
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.h	(revision 76987)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.h	(revision 76988)
@@ -33,5 +33,5 @@
 class QPropertyAnimation;
 
-/* Graphics-button representation: */
+/** QIGraphicsWidget subclass providing GUI with graphics-button representation. */
 class UIGraphicsButton : public QIGraphicsWidget
 {
@@ -40,5 +40,5 @@
 signals:
 
-    /* Notify listeners about button was clicked: */
+    /** Notifies listeners about button was clicked. */
     void sigButtonClicked();
 
@@ -48,9 +48,7 @@
     enum ClickPolicy { ClickPolicy_OnRelease, ClickPolicy_OnPress };
 
-    /* Constructor: */
+    /** Constructs graphics button passing @a pParent to the base-class.
+      * @param  icon  Brings the button icon. */
     UIGraphicsButton(QIGraphicsWidget *pParent, const QIcon &icon);
-
-    /* API: Parent stuff: */
-    void setParentSelected(bool fParentSelected);
 
     /** Defines icon scale @a dIndex. */
@@ -66,5 +64,5 @@
 protected:
 
-    /* Data enumerator: */
+    /** Data enumerator. */
     enum GraphicsButton
     {
@@ -74,28 +72,29 @@
     };
 
-    /* Data provider: */
+    /** Returns data stored for certain @a iKey: */
     virtual QVariant data(int iKey) const;
 
-    /* Size hint stuff: */
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    /** Returns size-hint of certain @a enmType, restricted by passed @a constraint. */
+    virtual QSizeF sizeHint(Qt::SizeHint enmType, const QSizeF &constraint = QSizeF()) const /* override */;
 
-    /* Paint stuff: */
-    virtual void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget *pWidget = 0);
+    /** Performs painting using passed @a pPainter, @a pOptions and optionally specified @a pWidget. */
+    virtual void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget *pWidget = 0) /* override */;
 
-    /* Mouse handlers: */
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent *pEvent);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *pEvent);
+    /** Handles mouse-press @a pEvent. */
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *pEvent) /* override */;
+    /** Handles mouse-release @a pEvent. */
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *pEvent) /* override */;
 
     /** Handles timer @a pEvent. */
     virtual void timerEvent(QTimerEvent *pEvent) /* override */;
 
-    /* Helpers: Update stuff: */
+    /** Updates button.
+      * @todo rename to prepare() */
     virtual void refresh();
 
 private:
 
-    /* Variables: */
+    /** Holds the button icon. */
     QIcon m_icon;
-    bool m_fParentSelected;
 
     /** Holds the click policy. */
@@ -112,3 +111,2 @@
 
 #endif /* !FEQT_INCLUDED_SRC_widgets_graphics_UIGraphicsButton_h */
-