Index: /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro	(revision 85880)
+++ /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro	(revision 85881)
@@ -20,7 +20,4 @@
 TEMPLATE	= app
 LANGUAGE	= C++
-
-FORMS = \
-    src/settings/UISettingsDialog.ui
 
 TRANSLATIONS = \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp	(revision 85880)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp	(revision 85881)
@@ -29,6 +29,8 @@
 # include <QRegExp>
 #endif
+# include <QVBoxLayout>
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
 #include "QIFileDialog.h"
 #include "UIActionPoolManager.h"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp	(revision 85880)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp	(revision 85881)
@@ -18,4 +18,6 @@
 /* Qt includes: */
 #include <QCloseEvent>
+#include <QGridLayout>
+#include <QLabel>
 #include <QProgressBar>
 #include <QPushButton>
@@ -24,4 +26,5 @@
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
 #include "QIWidgetValidator.h"
 #include "UICommon.h"
@@ -61,4 +64,7 @@
     , m_fSilent(true)
     , m_pWhatsThisTimer(new QTimer(this))
+    , m_pLabelTitle(0)
+    , m_pButtonBox(0)
+    , m_pWidgetStackHandler(0)
 {
     /* Prepare: */
@@ -151,5 +157,5 @@
     setWindowTitle(title());
 #else
-    m_pLbTitle->setText(m_pSelector->itemText(cId));
+    m_pLabelTitle->setText(m_pSelector->itemText(cId));
 #endif
 }
@@ -241,6 +247,7 @@
 void UISettingsDialog::retranslateUi()
 {
-    /* Translate generated stuff: */
-    Ui::UISettingsDialog::retranslateUi(this);
+    setWhatsThis(tr("<i>Select a settings category from the list on the left-hand side and move the mouse over a settings "
+                    "item to get more information.</i>"));
+    m_pLabelTitle->setText(QString());
 
     /* Translate warning stuff: */
@@ -251,5 +258,5 @@
 #ifndef VBOX_GUI_WITH_TOOLBAR_SETTINGS
     /* Retranslate current page headline: */
-    m_pLbTitle->setText(m_pSelector->itemText(m_pSelector->currentId()));
+    m_pLabelTitle->setText(m_pSelector->itemText(m_pSelector->currentId()));
 #endif
 
@@ -589,9 +596,8 @@
 void UISettingsDialog::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UISettingsDialog::setupUi(this);
+    prepareWidgets();
 
     /* Configure title: */
-    if (m_pLbTitle)
+    if (m_pLabelTitle)
     {
         /* Page-title font is bold and larger but derived from the system font: */
@@ -599,5 +605,5 @@
         pageTitleFont.setBold(true);
         pageTitleFont.setPointSize(pageTitleFont.pointSize() + 2);
-        m_pLbTitle->setFont(pageTitleFont);
+        m_pLabelTitle->setFont(pageTitleFont);
     }
 
@@ -609,5 +615,5 @@
 
         /* No page-title with tool-bar: */
-        m_pLbTitle->hide();
+        m_pLabelTitle->hide();
 
         /* Create modern tool-bar selector: */
@@ -645,8 +651,8 @@
 
     /* Prepare stack-handler: */
-    if (m_pWtStackHandler)
+    if (m_pWidgetStackHandler)
     {
         /* Create page-stack layout: */
-        QVBoxLayout *pStackLayout = new QVBoxLayout(m_pWtStackHandler);
+        QVBoxLayout *pStackLayout = new QVBoxLayout(m_pWidgetStackHandler);
         if (pStackLayout)
         {
@@ -722,4 +728,59 @@
 }
 
+void UISettingsDialog::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UISettingsDialog"));
+    resize(550, 450);
+    QWidget *pCentralWidget = new QWidget(this);
+    pCentralWidget->setObjectName(QStringLiteral("pCentralWidget"));
+    QGridLayout *pMainLayout = new QGridLayout(pCentralWidget);
+    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
+    m_pLabelTitle = new QLabel(pCentralWidget);
+    m_pLabelTitle->setObjectName(QStringLiteral("m_pLabelTitle"));
+    QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pLabelTitle->sizePolicy().hasHeightForWidth());
+    m_pLabelTitle->setSizePolicy(sizePolicy);
+    QPalette palette;
+    QBrush brush(QColor(255, 255, 255, 255));
+    brush.setStyle(Qt::SolidPattern);
+    palette.setBrush(QPalette::Active, QPalette::Window, brush);
+    palette.setBrush(QPalette::Inactive, QPalette::Window, brush);
+    palette.setBrush(QPalette::Disabled, QPalette::Window, brush);
+    m_pLabelTitle->setPalette(palette);
+    QFont font;
+    font.setFamily(QStringLiteral("Sans Serif"));
+    font.setPointSize(11);
+    font.setBold(true);
+    font.setWeight(75);
+    m_pLabelTitle->setFont(font);
+    m_pLabelTitle->setAutoFillBackground(true);
+    m_pLabelTitle->setFrameShape(QFrame::Box);
+    m_pLabelTitle->setFrameShadow(QFrame::Sunken);
+    m_pLabelTitle->setMargin(7);
+    pMainLayout->addWidget(m_pLabelTitle, 0, 1, 1, 1);
+
+    m_pWidgetStackHandler = new QWidget(pCentralWidget);
+    m_pWidgetStackHandler->setObjectName(QStringLiteral("m_pWidgetStackHandler"));
+    QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(m_pWidgetStackHandler->sizePolicy().hasHeightForWidth());
+    m_pWidgetStackHandler->setSizePolicy(sizePolicy1);
+    pMainLayout->addWidget(m_pWidgetStackHandler, 1, 1, 1, 1);
+
+    m_pButtonBox = new QIDialogButtonBox(pCentralWidget);
+    m_pButtonBox->setObjectName(QStringLiteral("m_pButtonBox"));
+    m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+    pMainLayout->addWidget(m_pButtonBox, 2, 0, 1, 2);
+
+    setCentralWidget(pCentralWidget);
+
+    QObject::connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UISettingsDialog::reject);
+    QObject::connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UISettingsDialog::accept);
+}
+
 void UISettingsDialog::assignValidator(UISettingsPage *pPage)
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h	(revision 85880)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h	(revision 85881)
@@ -30,13 +30,14 @@
 #include "QIWithRetranslateUI.h"
 #include "UISettingsDefs.h"
-#include "UISettingsDialog.gen.h"
 
 /* Forward declarations: */
 class QEvent;
 class QObject;
+class QLabel;
 class QProgressBar;
 class QShowEvent;
 class QStackedWidget;
 class QTimer;
+class QIDialogButtonBox;
 class UIPageValidator;
 class UISettingsPage;
@@ -50,5 +51,5 @@
 /** QIMainDialog aubclass used as
   * base dialog class for both Global & VM settings which encapsulates most of their common functionality. */
-class SHARED_LIBRARY_STUFF UISettingsDialog : public QIWithRetranslateUI<QIMainDialog>, public Ui::UISettingsDialog
+class SHARED_LIBRARY_STUFF UISettingsDialog : public QIWithRetranslateUI<QIMainDialog>
 {
     Q_OBJECT;
@@ -164,5 +165,6 @@
     /** Prepares all. */
     void prepare();
-
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Assigns validater for passed @a pPage. */
     void assignValidator(UISettingsPage *pPage);
@@ -209,4 +211,11 @@
     QList<QSize>  m_sizeList;
 #endif
+
+    /** @name Widgets
+     * @{ */
+       QLabel *m_pLabelTitle;
+       QIDialogButtonBox *m_pButtonBox;
+       QWidget *m_pWidgetStackHandler;
+    /** @} */
 };
 
Index: unk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.ui	(revision 85880)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<ui version="4.0" >
- <comment>
- VBox frontends: Qt GUI ("VirtualBox"):
-
- Copyright (C) 2008-2020 Oracle Corporation
-
- This file is part of VirtualBox Open Source Edition (OSE), as
- available from http://www.virtualbox.org. This file is free software;
- you can redistribute it and/or modify it under the terms of the GNU
- General Public License (GPL) as published by the Free Software
- Foundation, in version 2 as it comes in the "COPYING" file of the
- VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- </comment>
- <class>UISettingsDialog</class>
- <widget class="QMainWindow" name="UISettingsDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>450</height>
-   </rect>
-  </property>
-  <property name="whatsThis" >
-   <string>&lt;i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information.&lt;/i></string>
-  </property>
-  <widget class="QWidget" name="centralwidget" >
-   <layout class="QGridLayout" >
-    <item row="0" column="1" >
-     <widget class="QLabel" name="m_pLbTitle" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="palette" >
-       <palette>
-        <active>
-         <colorrole role="Window" >
-          <brush brushstyle="SolidPattern" >
-           <color alpha="255" >
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </active>
-        <inactive>
-         <colorrole role="Window" >
-          <brush brushstyle="SolidPattern" >
-           <color alpha="255" >
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </inactive>
-        <disabled>
-         <colorrole role="Window" >
-          <brush brushstyle="SolidPattern" >
-           <color alpha="255" >
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </disabled>
-       </palette>
-      </property>
-      <property name="font" >
-       <font>
-        <family>Sans Serif</family>
-        <pointsize>11</pointsize>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="autoFillBackground" >
-       <bool>true</bool>
-      </property>
-      <property name="frameShape" >
-       <enum>QFrame::Box</enum>
-      </property>
-      <property name="frameShadow" >
-       <enum>QFrame::Sunken</enum>
-      </property>
-      <property name="text" >
-       <string/>
-      </property>
-      <property name="margin" >
-       <number>7</number>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1" >
-     <widget class="QWidget" native="1" name="m_pWtStackHandler" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0" colspan="2" >
-     <widget class="QIDialogButtonBox" name="m_pButtonBox" >
-      <property name="standardButtons" >
-       <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QIDialogButtonBox</class>
-   <extends>QDialogButtonBox</extends>
-   <header>QIDialogButtonBox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>m_pButtonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>UISettingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>200</x>
-     <y>300</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>200</x>
-     <y>200</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_pButtonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>UISettingsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>300</x>
-     <y>300</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>300</x>
-     <y>200</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
