diff --git a/WifiSitterGui/App.xaml b/WifiSitterGui/App.xaml
index a254313..d5070ae 100644
--- a/WifiSitterGui/App.xaml
+++ b/WifiSitterGui/App.xaml
@@ -4,6 +4,23 @@
              xmlns:local="clr-namespace:WifiSitterGui"
              StartupUri="TrayIconControl.xaml">
     <Application.Resources>
-         
+        <Viewbox x:Key="CloseIcon" x:Shared="false" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+            <Grid>
+                <Grid Name="backgroundGrid" Width="24" Height="24" Visibility="Visible">
+                    <Rectangle Fill="#FF000000" Name="Rect" Visibility="Visible" />
+                </Grid>
+                <Path Data="M2.999979,0C3.8000264,0,4.4999763,0.30000305,5.1000115,0.90000927L15.999954,11.700012 26.899959,0.90000927C28.099967,-0.29998779 29.999927,-0.29998779 31.099961,0.90000927 32.299972,2.1000061 32.299972,4 31.099961,5.1000061L20.199958,16 31.099961,26.900009C32.299972,28.100006 32.299972,30 31.099961,31.100006 29.899951,32.300003 27.999931,32.300003 26.899959,31.100006L15.999954,20.200012 5.1000115,31.100006C3.9000017,32.300003 1.9999809,32.300003 0.90000743,31.100006 -0.30000248,29.900009 -0.30000248,28 0.90000743,26.900009L11.800011,16 0.90000743,5.1000061C-0.30000248,3.9000092 -0.30000248,2 0.90000743,0.90000927 1.4999818,0.30000305 2.1999928,0 2.999979,0z" Stretch="Uniform" Fill="#FFFFFFFF" Width="26" Height="26" Margin="0,0,0,0" RenderTransformOrigin="0.5,0.5">
+                    <Path.RenderTransform>
+                        <TransformGroup>
+                            <TransformGroup.Children>
+                                <RotateTransform Angle="0" />
+                                <ScaleTransform ScaleX=".5" ScaleY=".5" />
+                            </TransformGroup.Children>
+                        </TransformGroup>
+                    </Path.RenderTransform>
+                </Path>
+            </Grid>
+        </Viewbox>
+
     </Application.Resources>
 </Application>
diff --git a/WifiSitterGui/MainWindowViewModel.cs b/WifiSitterGui/MainWindowViewModel.cs
index a63200e..ba9906c 100644
--- a/WifiSitterGui/MainWindowViewModel.cs
+++ b/WifiSitterGui/MainWindowViewModel.cs
@@ -10,6 +10,7 @@ namespace WifiSitterGui
         #region fields
         #endregion  // fields
 
+
         #region constructor
 
         public MainWindowViewModel () {
@@ -18,12 +19,15 @@ namespace WifiSitterGui
 
         #endregion  // constructor
 
+
         #region properties
         #endregion  // properties
 
+
         #region methods
         #endregion  // methods
 
+
         #region eventhandlers
         #endregion  // methods
     }
diff --git a/WifiSitterGui/TrayIconControl.xaml b/WifiSitterGui/TrayIconControl.xaml
index 0fb5188..b0b87fb 100644
--- a/WifiSitterGui/TrayIconControl.xaml
+++ b/WifiSitterGui/TrayIconControl.xaml
@@ -8,15 +8,24 @@
         Visibility="Hidden"
         mc:Ignorable="d"
         Title="TrayIconControl" Height="300" Width="300">
+
+    <Window.Resources>
+
+    </Window.Resources>
     <Grid>
         
         <tb:TaskbarIcon
-          IconSource="pack://application:,,,/wifisitter-icon.ico"
+          x:Name="TaskBarIcon"
+          IconSource="pack://application:,,,/Resources/wifisitter-icon.ico"
           ToolTipText="hello world" >
             <tb:TaskbarIcon.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="Pause for 5 minutes" 
                               ToolTip="Restores interfaces to original status."/>
+                    <MenuItem Header="Quit"
+                              Click="ContextMenu_Quit"
+                              Icon="{StaticResource CloseIcon}" 
+                              />
                 </ContextMenu>
             </tb:TaskbarIcon.ContextMenu>
         </tb:TaskbarIcon>
diff --git a/WifiSitterGui/TrayIconControl.xaml.cs b/WifiSitterGui/TrayIconControl.xaml.cs
index d422894..26c8a29 100644
--- a/WifiSitterGui/TrayIconControl.xaml.cs
+++ b/WifiSitterGui/TrayIconControl.xaml.cs
@@ -18,16 +18,48 @@ namespace WifiSitterGui
     /// </summary>
     public partial class TrayIconControl : Window
     {
-        private MainWindowViewModel _windowVm;
+        #region fields
+
+        private static MainWindowViewModel _windowVm;
+        private static MainWindow _statusGui;
+
+        #endregion  // fields
+
+
+        #region constructor
 
         public TrayIconControl() {
             InitializeComponent();
 
             _windowVm = new MainWindowViewModel();
 
-            var statusGui = new MainWindow();
-            statusGui.DataContext = _windowVm;
-            statusGui.Show();
+            _statusGui = new MainWindow();
+            _statusGui.DataContext = _windowVm;
+            _statusGui.Show();
         }
+
+
+        ~TrayIconControl() {
+            this.TaskBarIcon.Visibility = Visibility.Hidden;
+            this.TaskBarIcon.Dispose();
+        }
+
+        #endregion  // constructor
+
+        #region properties
+        #endregion  // properties
+
+        #region methods
+        #endregion  // methods
+
+        #region eventhandlers
+
+        private void ContextMenu_Quit(object sender, RoutedEventArgs e) {
+            _statusGui?.Close();
+            
+            Environment.Exit(0);
+        }
+
+        #endregion  // eventhandlers
     }
 }
diff --git a/WifiSitterGui/WifiSitterGui.csproj b/WifiSitterGui/WifiSitterGui.csproj
index 8913f77..2579acb 100644
--- a/WifiSitterGui/WifiSitterGui.csproj
+++ b/WifiSitterGui/WifiSitterGui.csproj
@@ -103,7 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\WifiSitter\wifisitter-icon.ico">
-      <Link>wifisitter-icon.ico</Link>
+      <Link>Resources\wifisitter-icon.ico</Link>
     </Resource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />