diff --git a/webapp/.yarnclean b/webapp/.yarnclean
index d46a55524a..85d264e7d5 100644
--- a/webapp/.yarnclean
+++ b/webapp/.yarnclean
@@ -44,3 +44,5 @@ wercker.yml
 # misc
 *.md
 LICENSE
+*.txt
+!path.txt
diff --git a/webapp/packages/main/public/icon.png b/webapp/packages/main/public/icon.png
new file mode 100644
index 0000000000..1f8f6abf9e
Binary files /dev/null and b/webapp/packages/main/public/icon.png differ
diff --git a/webapp/packages/main/src/index.ts b/webapp/packages/main/src/index.ts
index c4119febf0..c86c095791 100644
--- a/webapp/packages/main/src/index.ts
+++ b/webapp/packages/main/src/index.ts
@@ -1,4 +1,4 @@
-import {app, BrowserWindow, ipcMain, globalShortcut} from 'electron';
+import {app, Menu, Tray, BrowserWindow, ipcMain, globalShortcut} from 'electron';
 import {URL} from 'url';
 import {PyShell} from '/@/pyshell';
 import {webuiArgs, webuiPath} from '/@/config';
@@ -69,7 +69,7 @@ const createWindow = async () => {
       mainWindow?.webContents.openDevTools();
     }
   });
-  
+
   mainWindow.on('focus', function () {
     // Dev tools
     globalShortcut.register('Ctrl+Shift+I', function () {
@@ -92,20 +92,50 @@ const createWindow = async () => {
   });
 
   // Minimize, maximize, close window.
+  ipcMain.on('window-tray', function () {
+    mainWindow?.hide();
+  });
   ipcMain.on('window-min', function () {
     mainWindow?.minimize();
   });
   ipcMain.on('window-max', function () {
-    if (mainWindow?.isMaximized()) {
-      mainWindow?.restore();
-    } else {
-      mainWindow?.maximize();
-    }
+    mainWindow?.isMaximized() ? mainWindow?.restore() : mainWindow?.maximize();
   });
   ipcMain.on('window-close', function () {
     alas.kill();
     setTimeout(() => mainWindow?.close(), 500); // Wait taskkill to finish
   });
+
+  // Tray
+  const tray = new Tray(path.join(__dirname, 'icon.png'));
+  const contextMenu = Menu.buildFromTemplate([
+    {
+      label: 'Show',
+      click: function () {
+        mainWindow?.show();
+      }
+    },
+    {
+      label: 'Hide',
+      click: function () {
+        mainWindow?.hide();
+      }
+    },
+    {
+      label: 'Exit',
+      click: function () {
+        app.quit();
+      }
+    }
+  ]);
+  tray.setToolTip('Alas');
+  tray.setContextMenu(contextMenu);
+  tray.on('click', () => {
+    mainWindow?.isVisible() ? mainWindow?.hide() : mainWindow?.show()
+  });
+  tray.on('right-click', () => {
+    tray.popUpContextMenu(contextMenu)
+  });
 };
 
 
diff --git a/webapp/packages/renderer/assets/logo.svg b/webapp/packages/renderer/assets/logo.svg
deleted file mode 100644
index 6471ae0723..0000000000
--- a/webapp/packages/renderer/assets/logo.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
\ No newline at end of file
diff --git a/webapp/packages/renderer/src/components/AppHeader.vue b/webapp/packages/renderer/src/components/AppHeader.vue
index 2cb9c0e029..e8aa004381 100644
--- a/webapp/packages/renderer/src/components/AppHeader.vue
+++ b/webapp/packages/renderer/src/components/AppHeader.vue
@@ -2,6 +2,7 @@
   <div class="app-header">
     <div class="header-drag"></div>
     <div class="header-icon">
+      <ArrowDownOutlined class="icon" @click="trayWin"></ArrowDownOutlined>
       <MinusOutlined class="icon" @click="minimizeWin"></MinusOutlined>
       <BorderOutlined class="icon" @click="maximizeWin"></BorderOutlined>
       <CloseOutlined class="icon" @click="closeWin"></CloseOutlined>
@@ -11,18 +12,22 @@
 
 <script lang="ts">
   import {defineComponent} from 'vue';
-  import {BorderOutlined, CloseOutlined, MinusOutlined} from '@ant-design/icons-vue';
+  import {BorderOutlined, CloseOutlined, MinusOutlined, ArrowDownOutlined} from '@ant-design/icons-vue';
 
   const ipcRenderer = require('electron').ipcRenderer;
 
   export default defineComponent({
     name: 'AppHeader',
     components: {
+      ArrowDownOutlined,
       MinusOutlined,
       BorderOutlined,
       CloseOutlined,
     },
     methods: {
+      trayWin() {
+        ipcRenderer.send('window-tray');
+      },
       minimizeWin() {
         ipcRenderer.send('window-min');
       },