diff --git a/theme.jl b/theme.jl
index adcc8c4..e853eb9 100644
--- a/theme.jl
+++ b/theme.jl
@@ -26,12 +26,14 @@
                 (text . ,window-name) (x-justify . center) (y-justify . center) (class . title))))
 
        (shaded-frame
-         `((,button-bg ,fg (right-edge . 0) (width . ,button-width) (height . ,title-height) (text . "×") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . close-button))
-           (,button-bg ,fg (right-edge . ,button-width) (width . ,button-width) (height . ,title-height) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . maximize-button))
-           (,button-bg ,fg (right-edge . ,(* 2 button-width)) (width . ,button-width) (height . ,title-height) (text . "_") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . iconify-button))
-           (,button-bg ,fg (left-edge . 0) (width . ,button-width) (height . ,title-height) (top-edge . ,(- title-height)) (class . menu-button) (text . "⮝") (x-justify . center) (y-justify . center))
+         `((,button-bg ,fg (right-edge . 5) (width . ,button-width) (height . ,title-height) (text . "×") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . close-button))
+           (,button-bg ,fg (right-edge . ,(+ button-width 5)) (width . ,button-width) (height . ,title-height) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . maximize-button))
+           (,button-bg ,fg (right-edge . ,(+ (* 2 button-width) 5)) (width . ,button-width) (height . ,title-height) (text . "_") (x-justify . center) (y-justify . center) (top-edge . ,(- title-height)) (class . iconify-button))
+           (,button-bg ,fg (left-edge . 5) (width . ,button-width) (height . ,title-height) (top-edge . ,(- title-height)) (class . menu-button) (text . "⮝") (x-justify . center) (y-justify . center))
+           (,bg (left-edge . 0) (top-edge . ,(- title-height)) (width . 5) (height . ,title-height))
+           (,bg (right-edge . 0) (top-edge . ,(- title-height)) (width . 5) (height . ,title-height))
 
-           (,bg ,fg ,font (right-edge . ,(* 3 button-width)) (left-edge . ,button-width) (height . ,title-height) (top-edge . ,(- title-height))
+           (,bg ,fg ,font (right-edge . ,(+ (* 3 button-width) 5)) (left-edge . ,(+ button-width 5)) (height . ,title-height) (top-edge . ,(- title-height))
                 (text . ,window-name) (x-justify . center) (y-justify . center) (class . title)))))
   (add-frame-style 'yoshi
                    (lambda (w type)