diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 2501185..d50d3f6 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -32,7 +32,7 @@
 
 namespace ads
 {
-using tTileBarButton = QPushButton;
+using tTileBarButton = QToolButton;
 /**
  * Private data class of CDockAreaTitleBar class (pimpl)
  */
@@ -78,7 +78,8 @@ void DockAreaTitleBarPrivate::createButtons()
 {
 	TabsMenuButton = new tTileBarButton();
 	TabsMenuButton->setObjectName("tabsMenuButton");
-	TabsMenuButton->setFlat(true);
+	TabsMenuButton->setAutoRaise(true);
+	TabsMenuButton->setPopupMode(QToolButton::InstantPopup);
 	TabsMenuButton->setIcon(_this->style()->standardIcon(QStyle::SP_TitleBarUnshadeButton));
 	TabsMenuButton->setMaximumWidth(TabsMenuButton->iconSize().width());
 
@@ -92,7 +93,7 @@ void DockAreaTitleBarPrivate::createButtons()
 
 	CloseButton = new tTileBarButton();
 	CloseButton->setObjectName("closeButton");
-	CloseButton->setFlat(true);
+	CloseButton->setAutoRaise(true);
 	QIcon CloseIcon(":/ads/close-button.svg");
 	CloseIcon.addFile(":/ads/close-button-disabled.svg", QSize(), QIcon::Disabled);
 	CloseButton->setIcon(CloseIcon);
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
index 55aaa62..6d0a7bb 100644
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -271,7 +271,6 @@ bool DockManagerPrivate::restoreState(const QByteArray &state, int version)
     		CDockAreaWidget* DockArea = DockContainer->dockArea(i);
     		QString DockWidgetName = DockArea->property("currentDockWidget").toString();
     		CDockWidget* DockWidget = _this->findDockWidget(DockWidgetName);
-    		std::cout << "restore DockWIdgetName " << DockWidget->objectName().toStdString() << std::endl;
     		if (!DockWidget->isClosed())
     		{
     			DockArea->internalSetCurrentDockWidget(DockWidget);
diff --git a/src/stylesheets/default.css b/src/stylesheets/default.css
index b2301d7..dcebd46 100644
--- a/src/stylesheets/default.css
+++ b/src/stylesheets/default.css
@@ -58,12 +58,14 @@ ads--CDockWidget
     border-width: 1px 0 0 0;
 }
 
-QPushButton#closeButton,
-QPushButton#tabsMenuButton
+#closeButton,
+#tabsMenuButton
 {
-	padding: 2px;
+	padding: 0px;
 }
 
+
+
 QScrollArea#dockWidgetScrollArea
 {
 	padding: 0px;