diff --git a/client/src/App.css b/client/src/App.css
index 27fa5fcf3..bd24333c6 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -7,6 +7,7 @@ body,
 html,
 .App {
   margin: 0px auto;
+  overflow: hidden;
   overflow: clip;
   height: 100vh;
 }
diff --git a/client/src/features/menu/buttons/QuitIconBtn.jsx b/client/src/features/menu/buttons/QuitIconBtn.jsx
index bf5c1364d..f322a7538 100644
--- a/client/src/features/menu/buttons/QuitIconBtn.jsx
+++ b/client/src/features/menu/buttons/QuitIconBtn.jsx
@@ -57,7 +57,7 @@ export default function QuitIconBtn(props) {
                 Cancel
               </Button>
               <Button colorScheme='red' onClick={handleShutdown} ml={3}>
-                Delete
+                Shutdown
               </Button>
             </AlertDialogFooter>
           </AlertDialogContent>
diff --git a/server/main.js b/server/main.js
index f8770d887..26edf2825 100644
--- a/server/main.js
+++ b/server/main.js
@@ -77,6 +77,7 @@ function createWindow() {
     width: 333,
     height: 333,
     transparent: true,
+    icon: appIcon,
     resizable: false,
     frame: false,
     alwaysOnTop: true,
@@ -223,7 +224,7 @@ ipcMain.on('shutdown', (event, arg) => {
     await shutdown();
   })();
 
-  tray.remove();
+  tray.destroy();
   win.destroy();
   app.quit();
 });