diff --git a/src/widgets/basewindow.cpp b/src/widgets/basewindow.cpp
index 92bdc1530..49fdd2f32 100644
--- a/src/widgets/basewindow.cpp
+++ b/src/widgets/basewindow.cpp
@@ -402,7 +402,7 @@ void BaseWindow::showEvent(QShowEvent *event)
         SetWindowLongPtr((HWND)this->winId(), GWL_STYLE,
                          WS_POPUP | WS_CAPTION | WS_THICKFRAME | WS_MAXIMIZEBOX | WS_MINIMIZEBOX);
 
-        const MARGINS shadow = {1, 1, 1, 1};
+        const MARGINS shadow = {8, 8, 8, 8};
         DwmExtendFrameIntoClientArea((HWND)this->winId(), &shadow);
     }
 
@@ -416,7 +416,7 @@ void BaseWindow::paintEvent(QPaintEvent *event)
 
         //        bool windowFocused = this->window() == QApplication::activeWindow();
 
-        painter.fillRect(QRect(0, 1, this->width(), this->height()),
+        painter.fillRect(QRect(0, 1, this->width() - 0, this->height() - 0),
                          this->themeManager.window.background);
     }
 }
diff --git a/src/widgets/helper/titlebarbutton.cpp b/src/widgets/helper/titlebarbutton.cpp
index 987cc8b34..1ff5f56a9 100644
--- a/src/widgets/helper/titlebarbutton.cpp
+++ b/src/widgets/helper/titlebarbutton.cpp
@@ -48,7 +48,8 @@ void TitleBarButton::paintEvent(QPaintEvent *)
             int xD3 = xD * 4 / 5;
 
             painter.drawRect(centerX - xD / 2 + xD2, xD, xD3, xD3);
-            painter.fillRect(centerX - xD / 2, xD + xD2, xD3, xD3, QColor("#fff"));
+            painter.fillRect(centerX - xD / 2, xD + xD2, xD3, xD3,
+                             this->themeManager.window.background);
             painter.drawRect(centerX - xD / 2, xD + xD2, xD3, xD3);
             break;
         }
@@ -61,7 +62,6 @@ void TitleBarButton::paintEvent(QPaintEvent *)
             break;
         }
         case User: {
-            //            color = QColor("#333");
             color = "#999";
 
             painter.setRenderHint(QPainter::Antialiasing);
@@ -88,7 +88,6 @@ void TitleBarButton::paintEvent(QPaintEvent *)
             break;
         }
         case Settings: {
-            //            color = QColor("#333");
             color = "#999";
             painter.setRenderHint(QPainter::Antialiasing);
             painter.setRenderHint(QPainter::HighQualityAntialiasing);