--- a/src/skeleton.cpp    2016-06-19 13:53:32.934873473 +0200
+++ b/src/skeleton.cpp    2019-04-25 14:05:27.883307964 +0200
@@ -183,6 +183,7 @@
     int bottom = (isMaximized ? 0 : frame);
     int top = (isMaximized ? 0 : frame);
     int titleHeight = qRound(1.25 * settings()->fontMetrics().height());
+#if 0
     setBorders(QMargins(side, titleHeight + top, side, (client().data()->isShaded() ? 0 : bottom)));
 
     m_frameRect = QRect(0, 0, size().width(), size().height());
@@ -193,6 +194,19 @@
 
     int left = m_leftButtons->geometry().x() + m_leftButtons->geometry().width();
     m_captionRect = QRect(left, 0, m_rightButtons->geometry().x() - left, titleHeight + top);
+#else
+    int titleTop = size().height() - bottom - titleHeight;
+    setBorders(QMargins(side, (client().data()->isShaded() ? 0 : top), side, titleHeight + bottom));
+
+    m_frameRect = QRect(0, 0, size().width(), size().height());
+    setTitleBar(QRect(side, titleTop, size().width() - 2 * side, borderBottom()));
+
+    m_leftButtons->setPos(QPointF(side, titleTop + top));
+    m_rightButtons->setPos(QPointF(size().width() - m_rightButtons->geometry().width() - side, titleTop + top));
+
+    int left = m_leftButtons->geometry().x() + m_leftButtons->geometry().width();
+    m_captionRect = QRect(left, titleTop, m_rightButtons->geometry().x() - left, titleHeight + bottom);
+#endif
 }
 
 void Decoration::createShadow()