Index: /trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp	(revision 70523)
@@ -102,6 +102,10 @@
     {
         /* Configure layout: */
-        const int iS0 = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) * 2;
-        pLayout->setSpacing(iS0);
+#ifdef VBOX_WS_MAC
+        pLayout->setSpacing(20);
+        pLayout->setContentsMargins(40, 20, 40, 20);
+#else
+        pLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) * 2);
+#endif
 
         /* Create sub-layout: */
@@ -132,6 +136,9 @@
         {
             /* Configure layout: */
-            const int iS2 = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-            pSubLayout2->setSpacing(iS2);
+#ifdef VBOX_WS_MAC
+            pSubLayout2->setSpacing(5);
+#else
+            pSubLayout2->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
 
             /* Create name label: */
@@ -165,6 +172,9 @@
         {
             /* Configure layout: */
-            const int iS3 = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-            pSubLayout3->setSpacing(iS3);
+#ifdef VBOX_WS_MAC
+            pSubLayout3->setSpacing(5);
+#else
+            pSubLayout3->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
 
             /* Create description label: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp	(revision 70523)
@@ -236,6 +236,9 @@
         /* Configure main-layout: */
         m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        m_pMainLayout->setSpacing(iS);
+#ifdef VBOX_WS_MAC
+        m_pMainLayout->setSpacing(5);
+#else
+        m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
         /* Create button-layout: */
         QHBoxLayout *pButtonLayout = new QHBoxLayout;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp	(revision 70523)
@@ -815,6 +815,5 @@
         layout()->setSpacing(10);
 #else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        layout()->setSpacing(iS);
+        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp	(revision 70523)
@@ -485,6 +485,5 @@
         layout()->setSpacing(10);
 #else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        layout()->setSpacing(iS);
+        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 70523)
@@ -1522,6 +1522,5 @@
         layout()->setSpacing(10);
 #else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        layout()->setSpacing(iS);
+        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 70523)
@@ -1286,6 +1286,9 @@
         /* Configure main-layout: */
         m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2;
-        m_pMainLayout->setSpacing(iS);
+#ifdef VBOX_WS_MAC
+        m_pMainLayout->setSpacing(5);
+#else
+        m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
+#endif
         /* Update pool: */
         updatePool();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp	(revision 70523)
@@ -545,6 +545,9 @@
             /* Configure button-layout: */
             m_pButtonLayout->setContentsMargins(0, 0, 0, 0);
-            const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2;
-            m_pButtonLayout->setSpacing(iS);
+#ifdef VBOX_WS_MAC
+            m_pButtonLayout->setSpacing(5);
+#else
+            m_pButtonLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
+#endif
             /* Add button-layout into main-layout: */
             m_pMainLayout->addLayout(m_pButtonLayout);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp	(revision 70523)
@@ -200,6 +200,9 @@
                 // WORKAROUND:
                 // Why do we need it? It should be the default one, but it's not..
-                const int iS1 = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing);
-                pTopRightLayout->setSpacing(iS1);
+#ifdef VBOX_WS_MAC
+                pTopRightLayout->setSpacing(10);
+#else
+                pTopRightLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing));
+#endif
 
                 /* Prepare 'text' label: */
@@ -211,6 +214,9 @@
                     // WORKAROUND:
                     // Why do we need it? It should be the default one, but it's not..
-                    const int iS2 = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing);
-                    pChoiceLayout->setSpacing(iS2);
+#ifdef VBOX_WS_MAC
+                    pChoiceLayout->setSpacing(10);
+#else
+                    pChoiceLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing));
+#endif
 
                     /* Prepare icon metric: */
@@ -279,7 +285,4 @@
                     m_pDiscardCheckBox = new QCheckBox(this);
                     /* Configure layout: */
-#ifdef VBOX_WS_MAC
-                    pChoiceLayout->setSpacing(15);
-#endif
                     pChoiceLayout->setContentsMargins(0, 0, 0, 0);
                     pChoiceLayout->addWidget(m_pDetachIcon, 0, 0);
@@ -294,7 +297,4 @@
                 }
                 /* Configure layout: */
-#ifdef VBOX_WS_MAC
-                pTopRightLayout->setSpacing(15);
-#endif
                 pTopRightLayout->setContentsMargins(0, 0, 0, 0);
                 pTopRightLayout->addWidget(m_pLabel);
@@ -303,6 +303,9 @@
             /* Configure layout: */
             pTopLayout->setContentsMargins(0, 0, 0, 0);
-            const int iS3 = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) * 2;
-            pTopLayout->setSpacing(iS3);
+#ifdef VBOX_WS_MAC
+            pTopLayout->setSpacing(20);
+#else
+            pTopLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) * 2);
+#endif
             pTopLayout->addItem(pTopLeftLayout);
             pTopLayout->addItem(pTopRightLayout);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp	(revision 70523)
@@ -1242,6 +1242,5 @@
         layout()->setSpacing(10);
 #else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        layout()->setSpacing(iS);
+        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 70523)
@@ -3451,6 +3451,5 @@
         mLtStorage->setSpacing(3);
 #else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 3;
-        mLtStorage->setSpacing(iS);
+        mLtStorage->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 3);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 70523)
@@ -756,6 +756,5 @@
             m_pLayoutBootOrder->setSpacing(3);
 #else
-            const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3;
-            m_pLayoutBootOrder->setSpacing(iS);
+            m_pLayoutBootOrder->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp	(revision 70523)
@@ -69,6 +69,9 @@
             /* Configure viewport layout: */
             pWidgetLayout->setMargin(0);
-            const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2;
-            pWidgetLayout->setSpacing(iS);
+#ifdef VBOX_WS_MAC
+            pWidgetLayout->setSpacing(5);
+#else
+            pWidgetLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
+#endif
             /* Create new widgets according passed vector: */
             for (int iScreenIndex = 0; iScreenIndex < value.size(); ++iScreenIndex)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 70523)
@@ -481,6 +481,9 @@
     {
         /* Configure layout: */
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-        pLayout->setSpacing(iS);
+#ifdef VBOX_WS_MAC
+        pLayout->setSpacing(5);
+#else
+        pLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
         pLayout->setContentsMargins(0, 0, 0, 0);
         /* Create UIHostComboEditorPrivate instance: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp	(revision 70523)
@@ -124,6 +124,9 @@
 
     /* Configure layout: */
-    const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2;
-    m_pMainLayout->setSpacing(iS);
+#ifdef VBOX_WS_MAC
+    m_pMainLayout->setSpacing(5);
+#else
+    m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
     m_pMainLayout->setContentsMargins(0, 0, 0, 0);
     m_pMainLayout->addWidget(m_pLineEdit);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp	(revision 70522)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp	(revision 70523)
@@ -828,6 +828,5 @@
         pMainLayout->setSpacing(3);
 #else
-        const int iS = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3;
-        pMainLayout->setSpacing(iS);
+        pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3);
 #endif
         /* Create table: */