diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 844b517d4..726b8e0e8 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -231,6 +231,17 @@ MainWindow::MainWindow(const QDir &home)
      *  Mac Toolbar
      *--------------------------------------------------------------------*/
 #ifdef Q_OS_MAC 
+#if QT_VERSION > 0x50000
+    head = addToolBar(context->athlete->cyclist);
+    head->setContentsMargins(20,0,20,0);
+    head->setFloatable(false);
+    head->setMovable(false);
+
+    // widgets
+    QWidget *macAnalButtons = new QWidget(this);
+    macAnalButtons->setContentsMargins(20,5,20,0);
+
+#else
     setUnifiedTitleAndToolBarOnMac(true);
     head = addToolBar(context->athlete->cyclist);
     head->setContentsMargins(0,0,0,0);
@@ -239,6 +250,8 @@ MainWindow::MainWindow(const QDir &home)
     QWidget *macAnalButtons = new QWidget(this);
     macAnalButtons->setContentsMargins(0,0,20,0);
 
+#endif
+
     // lhs buttons
     QHBoxLayout *lb = new QHBoxLayout(macAnalButtons);
     lb->setContentsMargins(0,0,10,8);