diff --git a/common/components/Menubar.svelte b/common/components/Menubar.svelte
index fbf0351..4657eaf 100644
--- a/common/components/Menubar.svelte
+++ b/common/components/Menubar.svelte
@@ -25,12 +25,10 @@
       <img src='./logo_filled.png' class='position-absolute w-50 h-50 m-10 pointer d-md-block d-none p-5' alt='ico' use:click={close} />
     {/if}
   </div>
-  <div class='window-controls'>
-    <button class='button max-button'  on:click={() => IPC.emit('minimize')}><svg class='svg-controls' height='12' role='img' viewBox='0 0 12 12'width='12'><rect fill='currentColor' height='1' width='10' x='1' y='6' /></svg></button>
-    <button class='button restore-button'  on:click={() => IPC.emit('maximize')}><svg class='svg-controls' height='12' role='img' viewBox='0 0 12 12'width='12'><rect fill='none' height='9' stroke='currentColor' width='9' x='1.5' y='1.5' /></svg></button>
-    <button class='button close-button' on:click={() => IPC.emit('close')}><svg class='svg-controls' height='12' role='img' viewBox='0 0 12 12'width='12'><polygon fill='currentColor' fill-rule='evenodd' points='11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1' /></svg></button>
-  </div>
-  <div class='h-full bg-dark flex-grow-1'>
+  <div class='window-controls d-flex position-absolute top-0 right-0 height-full'>
+    <button class='button max-button d-flex border-0 color-white align-items-center justify-content-center'  on:click={() => IPC.emit('minimize')}><svg class='svg-controls' height='12' role='img' viewBox='0 0 12 12'width='12'><rect fill='currentColor' height='1' width='10' x='1' y='6' /></svg></button>
+    <button class='button restore-button d-flex border-0 color-white align-items-center justify-content-center'  on:click={() => IPC.emit('maximize')}><svg class='svg-controls' height='12' role='img' viewBox='0 0 12 12'width='12'><rect fill='none' height='9' stroke='currentColor' width='9' x='1.5' y='1.5' /></svg></button>
+    <button class='button close-button d-flex border-0 color-white align-items-center justify-content-center' on:click={() => IPC.emit('close')}><svg class='svg-controls' height='12' role='img' viewBox='0 0 12 12'width='12'><polygon fill='currentColor' fill-rule='evenodd' points='11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1' /></svg></button>
   </div>
 </div>
 {#if $debug}
@@ -78,28 +76,13 @@
       height: 0;
     }
   }
-  .window-controls {
-    display: flex;
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 100%;
-  }
   .window-controls {
     -webkit-app-region: no-drag;
   }
   .window-controls .button {
-    grid-row: 1 / span 1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+    background: transparent;
     width: 46px;
     height: 32px;
-    background: transparent;
-    border: none;
-    color: #ffffff;
-  }
-  .window-controls .button {
     user-select: none;
   }
   .window-controls .button:hover {