diff --git a/qad/application/emainwindow.cpp b/qad/application/emainwindow.cpp
index 038a7c0..0798577 100644
--- a/qad/application/emainwindow.cpp
+++ b/qad/application/emainwindow.cpp
@@ -280,7 +280,9 @@ void EMainWindow::changedDock() {
 			tbars << t;
 			connect(t, SIGNAL(tabCloseRequested(int)), this, SLOT(closeDock(int)));
 			t->installEventFilter(this);
+#ifndef Q_OS_MACOS
 			t->setIconSize(dockTabsIconSize());
+#endif
 			t->setTabsClosable(true);
 		}
 //		qDebug() << "tab" << t << t->count();
@@ -288,10 +290,10 @@ void EMainWindow::changedDock() {
 			dock = (QDockWidget * )t->tabData(i).toULongLong();
 			//qDebug() << i << t->tabData(i);
 			if (dock == 0) continue;
-			t->setIconSize(dockTabsIconSize());
 #ifndef Q_OS_MACOS
-			t->setTabIcon(i, dock->windowIcon());
+			t->setIconSize(dockTabsIconSize());
 #endif
+			t->setTabIcon(i, dock->windowIcon());
 			docks_tabs << dock;
 		}
 	}
diff --git a/qad/application/ribbon.cpp b/qad/application/ribbon.cpp
index 7d4e18b..84d5d2e 100644
--- a/qad/application/ribbon.cpp
+++ b/qad/application/ribbon.cpp
@@ -89,9 +89,9 @@ void Ribbon::init() {
 			i->setProperty("__icon", QVariant::fromValue<QIcon>(tic));
 		else
 			tic = i->property("__icon").value<QIcon>();
-#ifdef Q_OS_MACOS
-		tic = QIcon();
-#endif
+//#ifdef Q_OS_MACOS
+//		tic = QIcon();
+//#endif
 		tab->addTab(new QWidget(), tic, i->text());
 		//qDebug() << this << i->icon() << i->text();
 		//continue;
@@ -107,7 +107,11 @@ void Ribbon::init() {
 		i->setIcon(QIcon());
 		tl = new QBoxLayout(QBoxLayout::LeftToRight);
 		tl->setSpacing(2);
+#ifndef Q_OS_MACOS
 		tl->setContentsMargins(2, 2, 2, 2);
+#else
+		tl->setContentsMargins(2, 0, 2, 2);
+#endif
 		g = new QGroupBox();
 		l = new QBoxLayout(QBoxLayout::LeftToRight);
 		g->setLayout(l);
@@ -209,6 +213,8 @@ void Ribbon::setIconSize(const QSize & size) {
 
 
 void Ribbon::setTabIconSize(const QSize & size) {
+#ifndef Q_OS_MACOS
 	tab->setIconSize(size);
+#endif
 	_resize();
 }
diff --git a/qad/blockview/drawtools.cpp b/qad/blockview/drawtools.cpp
index 6713e41..a1ea4e7 100644
--- a/qad/blockview/drawtools.cpp
+++ b/qad/blockview/drawtools.cpp
@@ -275,13 +275,13 @@ actions_Z_up(this), actions_Z_top(this), actions_Z_down(this), actions_Z_bottom(
 	actions_Z_down.setText(trUtf8("Send\nbackward"));  actions_Z_down.setIcon(QIcon(":/icons/z-down.png"));     actions_Z_down.setEnabled(false);
 	actions_Z_bottom.setText(trUtf8("Send\nto back")); actions_Z_bottom.setIcon(QIcon(":/icons/z-bottom.png")); actions_Z_bottom.setEnabled(false);
 	actions_add << newAction(trUtf8("Draw\nRectangle"), QIcon(":/icons/draw-rectangle.png"), 1)
-			<< newAction(trUtf8("Draw\nEllipse"), QIcon(":/icons/draw-ellipse.png"), 2)
-			<< newAction(trUtf8("Draw\nLine"), QIcon(":/icons/draw-line.png"), 4)
-			<< newAction(trUtf8("Draw\nText"), QIcon(":/icons/draw-text.png"), 0)
-			<< newAction(trUtf8("Draw\nImage"), QIcon(":/icons/view-preview.png"), 3);
+				<< newAction(trUtf8("Draw\nEllipse"), QIcon(":/icons/draw-ellipse.png"), 2)
+				<< newAction(trUtf8("Draw\nLine"), QIcon(":/icons/draw-line.png"), 4)
+				<< newAction(trUtf8("Draw\nText"), QIcon(":/icons/draw-text.png"), 0)
+				<< newAction(trUtf8("Draw\nImage"), QIcon(":/icons/view-preview.png"), 3);
 	buttons_align << ui->buttonAlignTL << ui->buttonAlignTC << ui->buttonAlignTR
-				<< ui->buttonAlignCL << ui->buttonAlignCC << ui->buttonAlignCR
-				<< ui->buttonAlignBL << ui->buttonAlignBC << ui->buttonAlignBR;
+				  << ui->buttonAlignCL << ui->buttonAlignCC << ui->buttonAlignCR
+				  << ui->buttonAlignBL << ui->buttonAlignBC << ui->buttonAlignBR;
 	foreach (QAction * a, actions_add)
 		connect(a, SIGNAL(toggled(bool)), this, SLOT(toggleNewItem(bool)));
 	foreach (QToolButton * b, buttons_align)