diff --git a/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj b/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
index 5223644..205f17c 100644
--- a/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
+++ b/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
@@ -61,6 +61,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -124,19 +126,12 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Views\Settings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\SettingsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Views\Settings.xaml.cs">
-      <DependentUpon>Settings.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
@@ -181,6 +176,10 @@
   <ItemGroup>
     <SplashScreen Include="Splash.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="app.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/JiraTimeBot.Ui/Views/MainWindow.xaml b/src/JiraTimeBot.Ui/Views/MainWindow.xaml
index 5cca4e0..ef5f600 100644
--- a/src/JiraTimeBot.Ui/Views/MainWindow.xaml
+++ b/src/JiraTimeBot.Ui/Views/MainWindow.xaml
@@ -9,7 +9,9 @@
         SizeToContent="WidthAndHeight"
         d:DataContext="{d:DesignInstance viewModels:ApplicationViewModel}"
         Title="ApplicationWindow"
-        ShowInTaskbar="True" d:DesignWidth="517.579" d:DesignHeight="260.977"
+        Icon="../app.ico"
+        ShowInTaskbar="True" 
+        d:DesignWidth="517.579" d:DesignHeight="260.977"
         >
     <Window.Resources>
         <DataTemplate DataType="{x:Type viewModels:MainPageViewModel}">
diff --git a/src/JiraTimeBot.Ui/Views/MainWindow.xaml.cs b/src/JiraTimeBot.Ui/Views/MainWindow.xaml.cs
index 97812cb..a9d7719 100644
--- a/src/JiraTimeBot.Ui/Views/MainWindow.xaml.cs
+++ b/src/JiraTimeBot.Ui/Views/MainWindow.xaml.cs
@@ -1,15 +1,38 @@
-namespace JiraTimeBot.Ui
+using System;
+using System.Drawing;
+using System.Windows;
+using System.Windows.Forms;
+
+namespace JiraTimeBot.Ui
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
     public partial class MainWindow
     {
-
-
         public MainWindow()
         {
             InitializeComponent();
+
+            NotifyIcon trayIcon = new System.Windows.Forms.NotifyIcon();
+            trayIcon.Icon = new Icon("app.ico");
+            trayIcon.Visible = true;
+            trayIcon.DoubleClick += (sender, args) =>
+            {
+                Show();
+                ShowInTaskbar = true;
+                WindowState = WindowState.Normal;
+            };
+        }
+
+        protected override void OnStateChanged(EventArgs e)
+        {
+            if (WindowState == WindowState.Minimized)
+            {
+                ShowInTaskbar = false;
+                Hide();
+            }
+            base.OnStateChanged(e);
         }
     }
 }
diff --git a/src/JiraTimeBot.Ui/Views/Settings.xaml b/src/JiraTimeBot.Ui/Views/Settings.xaml
deleted file mode 100644
index 24fda2b..0000000
--- a/src/JiraTimeBot.Ui/Views/Settings.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<UserControl x:Class="JiraTimeBot.Ui.Settings"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:JiraTimeBot.Ui"
-             mc:Ignorable="d" 
-             Width="100"
-             Height="200">
-    <Grid>
-            
-    </Grid>
-</UserControl>
diff --git a/src/JiraTimeBot.Ui/Views/Settings.xaml.cs b/src/JiraTimeBot.Ui/Views/Settings.xaml.cs
deleted file mode 100644
index ad3e528..0000000
--- a/src/JiraTimeBot.Ui/Views/Settings.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace JiraTimeBot.Ui
-{
-    /// <summary>
-    /// Interaction logic for Settings.xaml
-    /// </summary>
-    public partial class Settings : UserControl
-    {
-        public Settings()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/JiraTimeBot.Ui/app.ico b/src/JiraTimeBot.Ui/app.ico
new file mode 100644
index 0000000..910d597
Binary files /dev/null and b/src/JiraTimeBot.Ui/app.ico differ