#
#
# patch "res/forms/main_window.ui"
#  from [62e7adc05de694719accc073130e06466fe8285a]
#    to [2a502c4c0a34fefa6c210f0f74f6e98a7ad6fe2b]
# 
# patch "src/view/MainWindow.cpp"
#  from [b290e96f521b7c11d73ad9f8a5827ce8b00ff1c4]
#    to [7023781d29f39eabd4e4c9b8b1093843344ad074]
# 
# patch "src/view/dialogs/Dialog.cpp"
#  from [926c311a65c0a2eeea6cae03256a56b8adbb7087]
#    to [4a9329c127de291fc2e8c236ee2ae3f97344bdfa]
#
============================================================
--- res/forms/main_window.ui	62e7adc05de694719accc073130e06466fe8285a
+++ res/forms/main_window.ui	2a502c4c0a34fefa6c210f0f74f6e98a7ad6fe2b
@@ -15,14 +15,11 @@
   <property name="windowIcon" >
    <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
+  <property name="unifiedTitleAndToolBarOnMac" >
+   <bool>false</bool>
+  </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QVBoxLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <item>
      <widget class="QStackedWidget" name="windowMode" >
       <property name="currentIndex" >
@@ -30,12 +27,21 @@
       </property>
       <widget class="QWidget" name="widget" >
        <layout class="QVBoxLayout" >
-        <property name="margin" >
+        <property name="spacing" >
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="leftMargin" >
          <number>0</number>
         </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="Splitter" name="mainSplitter" >
           <property name="orientation" >
@@ -73,12 +79,21 @@
       </widget>
       <widget class="QWidget" name="database" >
        <layout class="QHBoxLayout" >
-        <property name="margin" >
+        <property name="spacing" >
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="leftMargin" >
          <number>0</number>
         </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="loadedDatabase" >
           <property name="text" >
@@ -104,7 +119,7 @@
      <x>0</x>
      <y>0</y>
      <width>713</width>
-     <height>24</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp" >
@@ -485,6 +500,7 @@
    <class>Splitter</class>
    <extends>QSplitter</extends>
    <header>../Splitter.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
============================================================
--- src/view/MainWindow.cpp	b290e96f521b7c11d73ad9f8a5827ce8b00ff1c4
+++ src/view/MainWindow.cpp	7023781d29f39eabd4e4c9b8b1093843344ad074
@@ -56,8 +56,6 @@ MainWindow::MainWindow()
 MainWindow::MainWindow()
     : QMainWindow(), closeCounter(0)
 {
-    setAttribute(Qt::WA_MacMetalStyle);
-
     // ensure that the shortcut keys are properly recognized by linguist
     QShortcut::tr("Ctrl");
     QShortcut::tr("Alt");
============================================================
--- src/view/dialogs/Dialog.cpp	926c311a65c0a2eeea6cae03256a56b8adbb7087
+++ src/view/dialogs/Dialog.cpp	4a9329c127de291fc2e8c236ee2ae3f97344bdfa
@@ -28,14 +28,12 @@ Dialog::Dialog(QWidget * parent) : QDial
 
 Dialog::Dialog(QWidget * parent) : QDialog(parent)
 {
-    setAttribute(Qt::WA_MacMetalStyle);
 }
 
 Dialog::Dialog(QWidget * parent, QString objName)
 : QDialog(parent)
 {
 	setObjectName(objName);
-    setAttribute(Qt::WA_MacMetalStyle);
 }
 
 Dialog::~Dialog()