diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index dd428d49..493fd76b 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -161,7 +161,7 @@ void LibraryWindow::doLayout()
     editInfoToolBar->setStyleSheet("QToolBar {border: none;}");
 
 #ifdef Q_OS_MAC
-	libraryToolBar = addToolBar(tr("Library"));
+    libraryToolBar = new YACReaderMacOSXToolbar(this);
 #else
 	libraryToolBar = new YACReaderMainToolBar(this);
 #endif
@@ -803,14 +803,12 @@ void LibraryWindow::createToolBars()
 {
 
 #ifdef Q_OS_MAC
-	libraryToolBar->setIconSize(QSize(16,16)); //TODO make icon size dynamic
+    //libraryToolBar->setIconSize(QSize(16,16)); //TODO make icon size dynamic
 
 	libraryToolBar->addAction(backAction);
 	libraryToolBar->addAction(forwardAction);
 
-	{QWidget * w = new QWidget();
-	w->setFixedWidth(10);
-	libraryToolBar->addWidget(w);}
+    libraryToolBar->addSpace(10);
 
 #ifdef SERVER_RELEASE
 	libraryToolBar->addAction(serverConfigAction);
@@ -818,17 +816,17 @@ void LibraryWindow::createToolBars()
 	libraryToolBar->addAction(optionsAction);
 	libraryToolBar->addAction(helpAboutAction);
 
-	{ QWidget * w2 = new QWidget();
-	 w2->setFixedWidth(10);
-	 libraryToolBar->addWidget(w2);}
+    libraryToolBar->addSpace(10);
 
     libraryToolBar->addAction(toggleComicsViewAction);
 	libraryToolBar->addAction(toggleFullScreenAction);
 
-	libraryToolBar->addWidget(new QToolBarStretch());
+    libraryToolBar->addStretch();
     libraryToolBar->addWidget(searchEdit);
 
-	libraryToolBar->setMovable(false);
+    //libraryToolBar->setMovable(false);
+
+    libraryToolBar->attachToWindow(this->windowHandle());
 
 	
 #else
@@ -2330,7 +2328,9 @@ void LibraryWindow::showNoLibrariesWidget()
 
 void LibraryWindow::showRootWidget()
 {
+#ifndef Q_OS_MAC
 	libraryToolBar->setDisabled(false);
+#endif
     searchEdit->setEnabled(true);
 	mainWidget->setCurrentIndex(0);
 }
@@ -2339,7 +2339,9 @@ void LibraryWindow::showImportingWidget()
 {
 	disableAllActions();
 	importWidget->clear();
+#ifndef Q_OS_MAC
 	libraryToolBar->setDisabled(true);
+#endif
     searchEdit->setDisabled(true);
 	mainWidget->setCurrentIndex(2);
 }
diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h
index ea399504..00cfd6dc 100644
--- a/YACReaderLibrary/library_window.h
+++ b/YACReaderLibrary/library_window.h
@@ -8,6 +8,10 @@
 #include "yacreader_global.h"
 #include <yacreader_libraries.h>
 
+#ifdef Q_OS_MAC
+    #include "yacreader_macosx_toolbar.h"
+#endif
+
 class QTreeView;
 class QDirModel;
 class QAction;
@@ -200,7 +204,7 @@ private:
     QList<QAction *> viewActions;
 
 #ifdef Q_OS_MAC
-	QToolBar * libraryToolBar;
+    YACReaderMacOSXToolbar * libraryToolBar;
 #else
 	YACReaderMainToolBar * libraryToolBar;
 #endif