From 3ec90766aa5e529063a06f8e466f97d4bd41c3c3 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Sun, 23 Feb 2020 12:37:30 +0100
Subject: [PATCH] UI - Implemented tray icon

UI - Moved dialog service to the shared UI project
UI - Implemented autorun
---
 src/Artemis.Core/Artemis.Core.csproj          |  2 +
 src/Artemis.Core/Constants.cs                 |  2 +-
 src/Artemis.Core/Ninject/CoreModule.cs        | 11 +++
 .../Artemis.UI.Shared.csproj                  |  3 +
 .../Screens/Dialogs/ConfirmDialogView.xaml    |  4 +-
 .../Screens/Dialogs/ConfirmDialogViewModel.cs |  4 +-
 .../Screens/Dialogs/ExceptionDialogView.xaml  | 34 ++++++++++
 .../Dialogs/ExceptionDialogViewModel.cs       | 27 ++++++++
 .../Services/Dialog/DialogService.cs          | 17 +++--
 .../Services/Dialog/DialogViewModelBase.cs    |  5 +-
 .../Services/Dialog/DialogViewModelHost.cs    |  5 +-
 .../Interfaces/IArtemisSharedUIService.cs     |  7 ++
 .../Services/Interfaces/IDialogService.cs     | 17 +++--
 src/Artemis.UI/App.xaml                       |  3 +-
 src/Artemis.UI/Artemis.UI.csproj              |  6 ++
 src/Artemis.UI/Bootstrapper.cs                | 16 ++---
 src/Artemis.UI/Ninject/UiModule.cs            |  2 +-
 src/Artemis.UI/Properties/launchSettings.json |  8 +++
 .../Dialogs/ProfileCreateViewModel.cs         |  2 +-
 .../Dialogs/ProfileElementRenameViewModel.cs  |  2 +-
 .../ProfileEditor/ProfileEditorViewModel.cs   |  1 +
 .../ProfileTree/TreeItem/FolderViewModel.cs   |  1 +
 .../ProfileTree/TreeItem/LayerViewModel.cs    |  1 +
 .../ProfileTree/TreeItem/TreeItemViewModel.cs |  1 +
 src/Artemis.UI/Screens/RootView.xaml          | 26 ++++---
 src/Artemis.UI/Screens/RootViewModel.cs       |  1 +
 .../Screens/Settings/SettingsView.xaml        |  4 +-
 .../Screens/Settings/SettingsViewModel.cs     | 62 ++++++++++++++++-
 .../Screens/Splash/SplashViewModel.cs         | 18 +++--
 .../Dialogs/SurfaceCreateViewModel.cs         |  2 +-
 .../Dialogs/SurfaceDeviceConfigViewModel.cs   |  2 +-
 .../SurfaceEditor/SurfaceEditorViewModel.cs   |  2 +-
 src/Artemis.UI/Screens/TrayView.xaml          | 36 ++++++++++
 src/Artemis.UI/Screens/TrayViewModel.cs       | 67 +++++++++++++++++++
 34 files changed, 344 insertions(+), 57 deletions(-)
 rename src/{Artemis.UI => Artemis.UI.Shared}/Screens/Dialogs/ConfirmDialogView.xaml (90%)
 rename src/{Artemis.UI => Artemis.UI.Shared}/Screens/Dialogs/ConfirmDialogViewModel.cs (88%)
 create mode 100644 src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml
 create mode 100644 src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogViewModel.cs
 rename src/{Artemis.UI => Artemis.UI.Shared}/Services/Dialog/DialogService.cs (88%)
 rename src/{Artemis.UI => Artemis.UI.Shared}/Services/Dialog/DialogViewModelBase.cs (84%)
 rename src/{Artemis.UI => Artemis.UI.Shared}/Services/Dialog/DialogViewModelHost.cs (86%)
 create mode 100644 src/Artemis.UI.Shared/Services/Interfaces/IArtemisSharedUIService.cs
 rename src/{Artemis.UI => Artemis.UI.Shared}/Services/Interfaces/IDialogService.cs (88%)
 create mode 100644 src/Artemis.UI/Properties/launchSettings.json
 create mode 100644 src/Artemis.UI/Screens/TrayView.xaml
 create mode 100644 src/Artemis.UI/Screens/TrayViewModel.cs

diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 90e552ee4..eebae52f5 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -36,6 +36,7 @@
     <ProjectReference Include="..\Artemis.Storage\Artemis.Storage.csproj">
       <Private>true</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.1.6" />
@@ -43,6 +44,7 @@
     <PackageReference Include="LiteDB" Version="5.0.3" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
     <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.2.6" />
diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs
index 6429f74ed..96f6f0653 100644
--- a/src/Artemis.Core/Constants.cs
+++ b/src/Artemis.Core/Constants.cs
@@ -6,7 +6,7 @@ namespace Artemis.Core
     public static class Constants
     {
         public static readonly string DataFolder = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\Artemis\\";
-        public static readonly string ConnectionString = $"FileName={DataFolder}\\database.db;Mode=Exclusive";
+        public static readonly string ConnectionString = $"FileName={DataFolder}\\database.db";
         public static readonly PluginInfo CorePluginInfo = new PluginInfo {Guid = Guid.Parse("ffffffff-ffff-ffff-ffff-ffffffffffff"), Name = "Artemis Core"};
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.Core/Ninject/CoreModule.cs b/src/Artemis.Core/Ninject/CoreModule.cs
index 66ea2d9d0..4743e0c98 100644
--- a/src/Artemis.Core/Ninject/CoreModule.cs
+++ b/src/Artemis.Core/Ninject/CoreModule.cs
@@ -4,6 +4,7 @@ using Artemis.Core.Models.Profile.KeyframeEngines;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 using LiteDB;
 using Ninject.Activation;
 using Ninject.Extensions.Conventions;
@@ -29,6 +30,16 @@ namespace Artemis.Core.Ninject
                     .Configure(c => c.InSingletonScope());
             });
 
+            // Bind all shared UI services as singletons
+            Kernel.Bind(x =>
+            {
+                x.FromAssemblyContaining<IArtemisSharedUIService>()
+                    .SelectAllClasses()
+                    .InheritedFrom<IArtemisSharedUIService>()
+                    .BindAllInterfaces()
+                    .Configure(c => c.InSingletonScope());
+            });
+
             // Bind all protected services as singletons
             Kernel.Bind(x =>
             {
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 2510fabe7..57159d87a 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -19,9 +19,12 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="AvalonEdit" Version="6.0.1" />
     <PackageReference Include="Humanizer.Core" Version="2.7.9" />
     <PackageReference Include="MaterialDesignThemes" Version="3.0.1" />
+    <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="SkiaSharp" Version="1.68.2-preview.29" />
+    <PackageReference Include="Stylet" Version="1.3.1" />
     <PackageReference Include="System.Buffers" Version="4.5.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
diff --git a/src/Artemis.UI/Screens/Dialogs/ConfirmDialogView.xaml b/src/Artemis.UI.Shared/Screens/Dialogs/ConfirmDialogView.xaml
similarity index 90%
rename from src/Artemis.UI/Screens/Dialogs/ConfirmDialogView.xaml
rename to src/Artemis.UI.Shared/Screens/Dialogs/ConfirmDialogView.xaml
index c335cada7..fcaeacc6f 100644
--- a/src/Artemis.UI/Screens/Dialogs/ConfirmDialogView.xaml
+++ b/src/Artemis.UI.Shared/Screens/Dialogs/ConfirmDialogView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="Artemis.UI.Screens.Dialogs.ConfirmDialogView"
+<UserControl x:Class="Artemis.UI.Shared.Screens.Dialogs.ConfirmDialogView"
              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:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:dialogs="clr-namespace:Artemis.UI.Screens.Dialogs"
+             xmlns:dialogs="clr-namespace:Artemis.UI.Shared.Screens.Dialogs"
              mc:Ignorable="d"
              d:DesignHeight="163.274" d:DesignWidth="254.425"
              d:DataContext="{d:DesignInstance dialogs:ConfirmDialogViewModel}">
diff --git a/src/Artemis.UI/Screens/Dialogs/ConfirmDialogViewModel.cs b/src/Artemis.UI.Shared/Screens/Dialogs/ConfirmDialogViewModel.cs
similarity index 88%
rename from src/Artemis.UI/Screens/Dialogs/ConfirmDialogViewModel.cs
rename to src/Artemis.UI.Shared/Screens/Dialogs/ConfirmDialogViewModel.cs
index 14b842bab..47e71b7fd 100644
--- a/src/Artemis.UI/Screens/Dialogs/ConfirmDialogViewModel.cs
+++ b/src/Artemis.UI.Shared/Screens/Dialogs/ConfirmDialogViewModel.cs
@@ -1,6 +1,6 @@
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Services.Dialog;
 
-namespace Artemis.UI.Screens.Dialogs
+namespace Artemis.UI.Shared.Screens.Dialogs
 {
     public class ConfirmDialogViewModel : DialogViewModelBase
     {
diff --git a/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml b/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml
new file mode 100644
index 000000000..96efaa35c
--- /dev/null
+++ b/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml
@@ -0,0 +1,34 @@
+<UserControl x:Class="Artemis.UI.Shared.Screens.Dialogs.ExceptionDialogView"
+             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:s="https://github.com/canton7/Stylet"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:dialogs="clr-namespace:Artemis.UI.Shared.Screens.Dialogs"
+             xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
+             mc:Ignorable="d"
+             d:DesignHeight="163.274" d:DesignWidth="254.425"
+             d:DataContext="{d:DesignInstance dialogs:ExceptionDialogViewModel}">
+    <StackPanel Margin="16">
+        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Text="{Binding Header}" TextWrapping="Wrap" />
+        <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Margin="0 20 0 20" Text="{Binding Exception.Message}" TextWrapping="Wrap" />
+
+        <Separator></Separator>
+        <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Text="Stack trace" TextWrapping="Wrap" FontWeight="Bold" Margin="20 5 0 0"/>
+        <avalonedit:TextEditor SyntaxHighlighting="C#" 
+                               FontFamily="Consolas" 
+                               FontSize="10pt" 
+                               IsReadOnly="True" 
+                               Document="{Binding Document}" 
+                               HorizontalScrollBarVisibility="Auto" 
+                               VerticalScrollBarVisibility="Auto"
+                               Margin="0 10"/>
+        <Separator></Separator>
+
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 0 0"
+                    Command="{s:Action Close}" Content="Close" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogViewModel.cs b/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogViewModel.cs
new file mode 100644
index 000000000..9c4fc4057
--- /dev/null
+++ b/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogViewModel.cs
@@ -0,0 +1,27 @@
+using System;
+using Artemis.UI.Shared.Services.Dialog;
+using ICSharpCode.AvalonEdit;
+using ICSharpCode.AvalonEdit.Document;
+
+namespace Artemis.UI.Shared.Screens.Dialogs
+{
+    public class ExceptionDialogViewModel : DialogViewModelBase
+    {
+        public ExceptionDialogViewModel(string message, Exception exception)
+        {
+            Header = message;
+            Exception = exception;
+            Document = new TextDocument(new StringTextSource(exception.StackTrace));
+        }
+
+        public string Header { get; }
+        public Exception Exception { get; }
+
+        public IDocument Document { get; set; }
+
+        public void Close()
+        {
+            Session.Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Services/Dialog/DialogService.cs b/src/Artemis.UI.Shared/Services/Dialog/DialogService.cs
similarity index 88%
rename from src/Artemis.UI/Services/Dialog/DialogService.cs
rename to src/Artemis.UI.Shared/Services/Dialog/DialogService.cs
index c9541798e..145502cf9 100644
--- a/src/Artemis.UI/Services/Dialog/DialogService.cs
+++ b/src/Artemis.UI.Shared/Services/Dialog/DialogService.cs
@@ -2,15 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Artemis.UI.Screens.Dialogs;
-using Artemis.UI.Services.Interfaces;
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Screens.Dialogs;
+using Artemis.UI.Shared.Services.Interfaces;
 using MaterialDesignThemes.Wpf;
 using Ninject;
 using Ninject.Parameters;
 using Stylet;
 
-namespace Artemis.UI.Services.Dialog
+namespace Artemis.UI.Shared.Services.Dialog
 {
     public class DialogService : IDialogService
     {
@@ -89,6 +88,16 @@ namespace Artemis.UI.Services.Dialog
             return await ShowDialog(identifier, _kernel.Get<T>(parameters));
         }
 
+        public async Task ShowExceptionDialog(string message, Exception exception)
+        {
+            var arguments = new IParameter[]
+            {
+                new ConstructorArgument("message", message),
+                new ConstructorArgument("exception", exception)
+            };
+            await Execute.OnUIThreadAsync(async () => await ShowDialog<ExceptionDialogViewModel>(arguments));
+        }
+
         private async Task<object> ShowDialog(string identifier, DialogViewModelBase viewModel)
         {
             var view = _viewManager.CreateViewForModel(viewModel);
diff --git a/src/Artemis.UI/Services/Dialog/DialogViewModelBase.cs b/src/Artemis.UI.Shared/Services/Dialog/DialogViewModelBase.cs
similarity index 84%
rename from src/Artemis.UI/Services/Dialog/DialogViewModelBase.cs
rename to src/Artemis.UI.Shared/Services/Dialog/DialogViewModelBase.cs
index 98c45d7f8..3e71803d0 100644
--- a/src/Artemis.UI/Services/Dialog/DialogViewModelBase.cs
+++ b/src/Artemis.UI.Shared/Services/Dialog/DialogViewModelBase.cs
@@ -1,8 +1,7 @@
-using Artemis.UI.ViewModels.Utilities;
-using MaterialDesignThemes.Wpf;
+using MaterialDesignThemes.Wpf;
 using Stylet;
 
-namespace Artemis.UI.ViewModels.Dialogs
+namespace Artemis.UI.Shared.Services.Dialog
 {
     public abstract class DialogViewModelBase : ValidatingModelBase
     {
diff --git a/src/Artemis.UI/Services/Dialog/DialogViewModelHost.cs b/src/Artemis.UI.Shared/Services/Dialog/DialogViewModelHost.cs
similarity index 86%
rename from src/Artemis.UI/Services/Dialog/DialogViewModelHost.cs
rename to src/Artemis.UI.Shared/Services/Dialog/DialogViewModelHost.cs
index 32b596060..455cdd76b 100644
--- a/src/Artemis.UI/Services/Dialog/DialogViewModelHost.cs
+++ b/src/Artemis.UI.Shared/Services/Dialog/DialogViewModelHost.cs
@@ -1,8 +1,7 @@
-using Artemis.UI.ViewModels.Dialogs;
-using MaterialDesignThemes.Wpf;
+using MaterialDesignThemes.Wpf;
 using Stylet;
 
-namespace Artemis.UI.ViewModels.Utilities
+namespace Artemis.UI.Shared.Services.Dialog
 {
     public class DialogViewModelHost : PropertyChangedBase
     {
diff --git a/src/Artemis.UI.Shared/Services/Interfaces/IArtemisSharedUIService.cs b/src/Artemis.UI.Shared/Services/Interfaces/IArtemisSharedUIService.cs
new file mode 100644
index 000000000..9ba0943ad
--- /dev/null
+++ b/src/Artemis.UI.Shared/Services/Interfaces/IArtemisSharedUIService.cs
@@ -0,0 +1,7 @@
+namespace Artemis.UI.Shared.Services.Interfaces
+{
+    // ReSharper disable once InconsistentNaming
+    public interface IArtemisSharedUIService
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Services/Interfaces/IDialogService.cs b/src/Artemis.UI.Shared/Services/Interfaces/IDialogService.cs
similarity index 88%
rename from src/Artemis.UI/Services/Interfaces/IDialogService.cs
rename to src/Artemis.UI.Shared/Services/Interfaces/IDialogService.cs
index 10486929b..e67668db4 100644
--- a/src/Artemis.UI/Services/Interfaces/IDialogService.cs
+++ b/src/Artemis.UI.Shared/Services/Interfaces/IDialogService.cs
@@ -1,12 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Services.Dialog;
 using MaterialDesignThemes.Wpf;
 using Ninject.Parameters;
 
-namespace Artemis.UI.Services.Interfaces
+namespace Artemis.UI.Shared.Services.Interfaces
 {
-    public interface IDialogService : IArtemisUIService
+    public interface IDialogService : IArtemisSharedUIService
     {
         /// <summary>
         ///     Shows a confirm dialog on the dialog host provided in <see cref="identifier" />.
@@ -93,5 +94,13 @@ namespace Artemis.UI.Services.Interfaces
         /// <param name="parameters">An array of Ninject <see cref="IParameter" /> to pass to the view model during activation</param>
         /// <returns>A task resolving to the result of the dialog's <see cref="DialogSession" /></returns>
         Task<object> ShowDialogAt<T>(string identifier, IParameter[] parameters) where T : DialogViewModelBase;
+
+        /// <summary>
+        ///     Shows a dialog displaying the provided message and exception. Does not handle, log or throw the exception.
+        /// </summary>
+        /// <param name="message">The message to display in the dialog title</param>
+        /// <param name="exception">The exception to display. The exception message and stacktrace will be shown.</param>
+        /// <returns>A task resolving when the dialog is closed</returns>
+        Task ShowExceptionDialog(string message, Exception exception);
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/App.xaml b/src/Artemis.UI/App.xaml
index 0d6d83550..2e1730ab8 100644
--- a/src/Artemis.UI/App.xaml
+++ b/src/Artemis.UI/App.xaml
@@ -2,7 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:local="clr-namespace:Artemis.UI">
+             xmlns:local="clr-namespace:Artemis.UI"
+             ShutdownMode="OnExplicitShutdown">
 
     <Application.Resources>
         <ResourceDictionary>
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index f30897f93..093d84722 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -61,6 +61,7 @@
     <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\logo-512.ico" />
     <Resource Include="Resources\logo-512.png" />
   </ItemGroup>
   <ItemGroup>
@@ -112,8 +113,10 @@
     <PackageReference Include="Castle.Core" Version="4.4.0" />
     <PackageReference Include="FluentValidation" Version="8.6.1" />
     <PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf.NetCore" Version="1.0.10" />
     <PackageReference Include="Humanizer.Core" Version="2.7.9" />
     <PackageReference Include="MaterialDesignExtensions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
     <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
@@ -276,6 +279,9 @@
     <Compile Remove="obj\x64\Debug\Screens\Module\ProfileEditor\LayerProperties\PropertyTree\PropertyInput\SKSizePropertyInputView.g.cs" />
     <Compile Remove="obj\x64\Debug\Screens\Module\ProfileEditor\LayerProperties\PropertyTree\PropertyInput\SKSizePropertyInputView.g.i.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Resources\logo-512.ico" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/src/Artemis.UI/Bootstrapper.cs b/src/Artemis.UI/Bootstrapper.cs
index 4981fd666..375b0a275 100644
--- a/src/Artemis.UI/Bootstrapper.cs
+++ b/src/Artemis.UI/Bootstrapper.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
@@ -14,9 +16,10 @@ using Stylet;
 
 namespace Artemis.UI
 {
-    public class Bootstrapper : NinjectBootstrapper<RootViewModel>
+    public class Bootstrapper : NinjectBootstrapper<TrayViewModel>
     {
         private ICoreService _core;
+        public static List<string> StartupArguments { get; private set; }
 
         protected override void OnExit(ExitEventArgs e)
         {
@@ -28,9 +31,10 @@ namespace Artemis.UI
 
         protected override void Launch()
         {
-            var windowManager = (IWindowManager) GetInstance(typeof(IWindowManager));
-            var splashViewModel = new SplashViewModel(Kernel);
-            windowManager.ShowWindow(splashViewModel);
+            StartupArguments = Args.ToList();
+
+            var windowManager = Kernel.Get<IWindowManager>();
+            windowManager.ShowWindow(RootViewModel);
 
             Task.Run(() =>
             {
@@ -38,10 +42,6 @@ namespace Artemis.UI
                 {
                     // Start the Artemis core
                     _core = Kernel.Get<ICoreService>();
-                    // When the core is done, hide the splash and show the main window
-                    _core.Initialized += (sender, args) => ShowMainWindow(windowManager, splashViewModel);
-                    // While the core is instantiated, start listening for events on the splash
-                    splashViewModel.ListenToEvents();
                 }
                 catch (Exception e)
                 {
diff --git a/src/Artemis.UI/Ninject/UiModule.cs b/src/Artemis.UI/Ninject/UiModule.cs
index aafece9f7..6f9550f7b 100644
--- a/src/Artemis.UI/Ninject/UiModule.cs
+++ b/src/Artemis.UI/Ninject/UiModule.cs
@@ -4,8 +4,8 @@ using Artemis.UI.Screens;
 using Artemis.UI.Screens.Module.ProfileEditor;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.PropertyTree.PropertyInput;
 using Artemis.UI.Services.Interfaces;
+using Artemis.UI.Shared.Services.Dialog;
 using Artemis.UI.Stylet;
-using Artemis.UI.ViewModels.Dialogs;
 using FluentValidation;
 using Ninject.Extensions.Conventions;
 using Ninject.Modules;
diff --git a/src/Artemis.UI/Properties/launchSettings.json b/src/Artemis.UI/Properties/launchSettings.json
new file mode 100644
index 000000000..5901254fe
--- /dev/null
+++ b/src/Artemis.UI/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Artemis.UI": {
+      "commandName": "Project",
+      "commandLineArgs": "-autorun"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
index a40a8405c..7fad3c749 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Services.Dialog;
 using FluentValidation;
 using Stylet;
 
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileElementRenameViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileElementRenameViewModel.cs
index 3bfeca8c6..10794d99b 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileElementRenameViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileElementRenameViewModel.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Artemis.Core.Models.Profile;
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Services.Dialog;
 using FluentValidation;
 using Stylet;
 
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs
index 0a4aa1f33..08736326b 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs
@@ -14,6 +14,7 @@ using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties;
 using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree;
 using Artemis.UI.Screens.Module.ProfileEditor.Visualization;
 using Artemis.UI.Services.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
index 63778c3b9..36826950c 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
@@ -2,6 +2,7 @@
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Services.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
 {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
index 346ce07db..6c693318d 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
@@ -2,6 +2,7 @@
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Services.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
 {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
index cbc52223d..c2a1dc86d 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
@@ -7,6 +7,7 @@ using Artemis.UI.Exceptions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
 using Artemis.UI.Services.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
diff --git a/src/Artemis.UI/Screens/RootView.xaml b/src/Artemis.UI/Screens/RootView.xaml
index 47f1e15d8..7b94465f8 100644
--- a/src/Artemis.UI/Screens/RootView.xaml
+++ b/src/Artemis.UI/Screens/RootView.xaml
@@ -7,6 +7,7 @@
                     xmlns:s="https://github.com/canton7/Stylet"
                     xmlns:screens="clr-namespace:Artemis.UI.Screens"
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
+                    xmlns:tb="http://www.hardcodet.net/taskbar"
                     mc:Ignorable="d"
                     FadeContentIfInactive="False"
                     Icon="/Artemis.UI;component/Resources/logo-512.png"
@@ -50,15 +51,18 @@
         </Style>
     </mde:MaterialWindow.Resources>
     <materialDesign:DialogHost Identifier="RootDialog">
-        <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding IsSidebarVisible}">
-            <materialDesign:DrawerHost.LeftDrawerContent>
-                <ContentControl s:View.Model="{Binding SidebarViewModel}" Width="220" ClipToBounds="False" />
-            </materialDesign:DrawerHost.LeftDrawerContent>
-            <DockPanel>
-                <mde:AppBar Type="Dense" IsNavigationDrawerOpen="{Binding IsSidebarVisible, Mode=TwoWay}" Title="{Binding ActiveItem.DisplayName}" ShowNavigationDrawerButton="True"
-                            DockPanel.Dock="Top" />
-                <ContentControl s:View.Model="{Binding ActiveItem}" Style="{StaticResource InitializingFade}" />
-            </DockPanel>
-        </materialDesign:DrawerHost>
-    </materialDesign:DialogHost>
+            <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding IsSidebarVisible}">
+                <materialDesign:DrawerHost.LeftDrawerContent>
+                    <ContentControl s:View.Model="{Binding SidebarViewModel}" Width="220" ClipToBounds="False" />
+                </materialDesign:DrawerHost.LeftDrawerContent>
+                <DockPanel>
+                    <mde:AppBar Type="Dense"
+                                IsNavigationDrawerOpen="{Binding IsSidebarVisible, Mode=TwoWay}"
+                                Title="{Binding ActiveItem.DisplayName}"
+                                ShowNavigationDrawerButton="True"
+                                DockPanel.Dock="Top" />
+                    <ContentControl s:View.Model="{Binding ActiveItem}" Style="{StaticResource InitializingFade}" />
+                </DockPanel>
+            </materialDesign:DrawerHost>
+        </materialDesign:DialogHost>
 </mde:MaterialWindow>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/RootViewModel.cs b/src/Artemis.UI/Screens/RootViewModel.cs
index da6f4a4f7..4a494f6a9 100644
--- a/src/Artemis.UI/Screens/RootViewModel.cs
+++ b/src/Artemis.UI/Screens/RootViewModel.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
+using Artemis.Core.Services;
 using Artemis.UI.Events;
 using Artemis.UI.Screens.Sidebar;
 using Artemis.UI.Utilities;
diff --git a/src/Artemis.UI/Screens/Settings/SettingsView.xaml b/src/Artemis.UI/Screens/Settings/SettingsView.xaml
index 449ba2f28..25423ff05 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsView.xaml
+++ b/src/Artemis.UI/Screens/Settings/SettingsView.xaml
@@ -39,7 +39,7 @@
                                     <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Start up with Windows</TextBlock>
                                 </StackPanel>
                                 <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="Default ToggleButton Style" />
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding StartWithWindows}"/>
                                 </StackPanel>
                             </Grid>
                             <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
@@ -57,7 +57,7 @@
                                     <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Start up with Windows minimized</TextBlock>
                                 </StackPanel>
                                 <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="Default ToggleButton Style" />
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding StartMinimized}" IsEnabled="{Binding StartWithWindows}"/>
                                 </StackPanel>
                             </Grid>
                             <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
index 988ba4cb6..283a1f6b9 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Services;
@@ -12,8 +13,10 @@ using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Settings.Debug;
 using Artemis.UI.Screens.Settings.Tabs.Devices;
 using Artemis.UI.Screens.Settings.Tabs.Plugins;
+using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Shared.Utilities;
 using MaterialDesignThemes.Wpf;
+using Microsoft.Win32;
 using Ninject;
 using Serilog.Events;
 using Stylet;
@@ -23,6 +26,7 @@ namespace Artemis.UI.Screens.Settings
     public class SettingsViewModel : MainScreenViewModel
     {
         private readonly IDeviceSettingsVmFactory _deviceSettingsVmFactory;
+        private readonly IDialogService _dialogService;
         private readonly IKernel _kernel;
         private readonly IPluginService _pluginService;
         private readonly ISettingsService _settingsService;
@@ -32,6 +36,7 @@ namespace Artemis.UI.Screens.Settings
         public SettingsViewModel(IKernel kernel,
             ISurfaceService surfaceService,
             IPluginService pluginService,
+            IDialogService dialogService,
             IWindowManager windowManager,
             ISettingsService settingsService,
             IDeviceSettingsVmFactory deviceSettingsVmFactory)
@@ -43,6 +48,7 @@ namespace Artemis.UI.Screens.Settings
             _kernel = kernel;
             _surfaceService = surfaceService;
             _pluginService = pluginService;
+            _dialogService = dialogService;
             _windowManager = windowManager;
             _settingsService = settingsService;
             _deviceSettingsVmFactory = deviceSettingsVmFactory;
@@ -65,12 +71,33 @@ namespace Artemis.UI.Screens.Settings
 
         public List<Tuple<string, int>> TargetFrameRates { get; set; }
         public List<Tuple<string, double>> RenderScales { get; set; }
-        public IEnumerable<ValueDescription> LogLevels { get; private set; }
+        public IEnumerable<ValueDescription> LogLevels { get; }
 
         public List<int> SampleSizes { get; set; }
         public BindableCollection<DeviceSettingsViewModel> DeviceSettingsViewModels { get; set; }
         public BindableCollection<PluginSettingsViewModel> Plugins { get; set; }
 
+        public bool StartWithWindows
+        {
+            get => _settingsService.GetSetting("UI.AutoRun", false).Value;
+            set
+            {
+                _settingsService.GetSetting("UI.AutoRun", false).Value = value;
+                _settingsService.GetSetting("UI.AutoRun", false).Save();
+                Task.Run(ApplyAutorun);
+            }
+        }
+
+        public bool StartMinimized
+        {
+            get => !_settingsService.GetSetting("UI.ShowOnStartup", true).Value;
+            set
+            {
+                _settingsService.GetSetting("UI.ShowOnStartup", true).Value = !value;
+                _settingsService.GetSetting("UI.ShowOnStartup", true).Save();
+            }
+        }
+
         public Tuple<string, double> SelectedRenderScale
         {
             get => RenderScales.FirstOrDefault(s => Math.Abs(s.Item2 - RenderScale) < 0.01);
@@ -138,8 +165,10 @@ namespace Artemis.UI.Screens.Settings
             Process.Start(Constants.DataFolder);
         }
 
-        protected override void OnActivate()
+        protected override void OnInitialActivate()
         {
+            Task.Run(ApplyAutorun);
+
             DeviceSettingsViewModels.Clear();
             foreach (var device in _surfaceService.ActiveSurface.Devices)
                 DeviceSettingsViewModels.Add(_deviceSettingsVmFactory.Create(device));
@@ -149,7 +178,34 @@ namespace Artemis.UI.Screens.Settings
             foreach (var plugin in _pluginService.GetPluginsOfType<Plugin>())
                 Plugins.Add(new PluginSettingsViewModel(plugin));
 
-            base.OnActivate();
+            base.OnInitialActivate();
+        }
+
+        protected override void OnClose()
+        {
+            DeviceSettingsViewModels.Clear();
+            Plugins.Clear();
+            base.OnClose();
+        }
+
+        private async Task ApplyAutorun()
+        {
+            try
+            {
+                var key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+                if (key == null)
+                    key = Registry.CurrentUser.CreateSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run");
+
+                if (StartWithWindows)
+                    key.SetValue("Artemis", $"\"{Process.GetCurrentProcess().MainModule.FileName}\" -autorun");
+                else
+                    key.DeleteValue("Artemis", false);
+            }
+            catch (Exception e)
+            {
+                await _dialogService.ShowExceptionDialog("An exception occured while trying to apply the auto run setting", e);
+                throw;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Splash/SplashViewModel.cs b/src/Artemis.UI/Screens/Splash/SplashViewModel.cs
index e4f95549a..29438afc6 100644
--- a/src/Artemis.UI/Screens/Splash/SplashViewModel.cs
+++ b/src/Artemis.UI/Screens/Splash/SplashViewModel.cs
@@ -8,22 +8,26 @@ namespace Artemis.UI.Screens.Splash
 {
     public class SplashViewModel : Screen
     {
-        private readonly IKernel _kernel;
+        private readonly ICoreService _coreService;
+        private readonly IPluginService _pluginService;
 
-        public SplashViewModel(IKernel kernel)
+        public SplashViewModel(ICoreService coreService, IPluginService pluginService)
         {
-            _kernel = kernel;
+            _coreService = coreService;
+            _pluginService = pluginService;
             Status = "Initializing Core";
+
+            ListenToEvents();
         }
 
         public string Status { get; set; }
 
         public void ListenToEvents()
         {
-            var pluginService = _kernel.Get<IPluginService>();
-            pluginService.CopyingBuildInPlugins += (sender, args) => Status = "Updating built-in plugins";
-            pluginService.PluginLoading += (sender, args) => Status = "Loading plugin: " + args.PluginInfo.Name;
-            pluginService.PluginLoaded += (sender, args) => Status = "Initializing UI";
+            _coreService.Initialized += (sender, args) => Execute.OnUIThread(() => RequestClose());
+            _pluginService.CopyingBuildInPlugins += (sender, args) => Status = "Updating built-in plugins";
+            _pluginService.PluginLoading += (sender, args) => Status = "Loading plugin: " + args.PluginInfo.Name;
+            _pluginService.PluginLoaded += (sender, args) => Status = "Initializing UI";
         }
 
         // ReSharper disable once UnusedMember.Global - Called from view
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceCreateViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceCreateViewModel.cs
index 126e97f09..870af2e86 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceCreateViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceCreateViewModel.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Services.Dialog;
 using Stylet;
 
 namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigViewModel.cs
index ab58f6b4f..5ad430311 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigViewModel.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Artemis.UI.Screens.SurfaceEditor.Visualization;
-using Artemis.UI.ViewModels.Dialogs;
+using Artemis.UI.Shared.Services.Dialog;
 using Stylet;
 
 namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
index 3b8e52a45..87239d9ae 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
@@ -14,7 +14,7 @@ using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Screens.Shared;
 using Artemis.UI.Screens.SurfaceEditor.Dialogs;
 using Artemis.UI.Screens.SurfaceEditor.Visualization;
-using Artemis.UI.Services.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 using MaterialDesignThemes.Wpf;
 using Stylet;
 
diff --git a/src/Artemis.UI/Screens/TrayView.xaml b/src/Artemis.UI/Screens/TrayView.xaml
new file mode 100644
index 000000000..7e976721c
--- /dev/null
+++ b/src/Artemis.UI/Screens/TrayView.xaml
@@ -0,0 +1,36 @@
+<Window x:Class="Artemis.UI.Screens.TrayView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:tb="http://www.hardcodet.net/taskbar"
+        xmlns:s="https://github.com/canton7/Stylet"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        mc:Ignorable="d" 
+        Title="Artemis"
+        Height="1"
+        Width="1"
+        Visibility="Hidden">
+    <tb:TaskbarIcon x:Name="TrayIcon"
+                    IconSource="/Resources/logo-512.ico"
+                    MenuActivation="LeftOrRightClick"
+                    PopupActivation="DoubleClick"
+                    ToolTipText="Artemis"
+                    DoubleClickCommand="{s:Action TrayBringToForeground}">
+        <tb:TaskbarIcon.ContextMenu>
+            <ContextMenu>
+                <MenuItem Header="Bring to foreground" Command="{s:Action TrayBringToForeground}">
+                    <MenuItem.Icon>
+                        <materialDesign:PackIcon Kind="ArrangeBringToFront" />
+                    </MenuItem.Icon>
+                </MenuItem>
+                <Separator />
+                <MenuItem Header="Exit" Command="{s:Action TrayExit}">
+                    <MenuItem.Icon>
+                        <materialDesign:PackIcon Kind="Close" />
+                    </MenuItem.Icon>
+                </MenuItem>
+            </ContextMenu>
+        </tb:TaskbarIcon.ContextMenu>
+    </tb:TaskbarIcon>
+</Window>
diff --git a/src/Artemis.UI/Screens/TrayViewModel.cs b/src/Artemis.UI/Screens/TrayViewModel.cs
new file mode 100644
index 000000000..d563fe193
--- /dev/null
+++ b/src/Artemis.UI/Screens/TrayViewModel.cs
@@ -0,0 +1,67 @@
+using System.Windows;
+using Artemis.Core.Services;
+using Artemis.Core.Services.Interfaces;
+using Artemis.UI.Screens.Splash;
+using Ninject;
+using Stylet;
+
+namespace Artemis.UI.Screens
+{
+    public class TrayViewModel : Screen
+    {
+        private readonly ICoreService _coreService;
+        private readonly IKernel _kernel;
+        private readonly IWindowManager _windowManager;
+
+        public TrayViewModel(IKernel kernel, IWindowManager windowManager, ICoreService coreService, ISettingsService settingsService)
+        {
+            _kernel = kernel;
+            _windowManager = windowManager;
+            _coreService = coreService;
+            CanShowRootViewModel = true;
+
+            var autoRunning = Bootstrapper.StartupArguments.Contains("-autorun");
+            var showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value;
+            if (!autoRunning || showOnAutoRun)
+            {
+                ShowSplashScreen();
+                _coreService.Initialized += (sender, args) => TrayBringToForeground();
+            }
+        }
+
+        public bool CanShowRootViewModel { get; set; }
+
+        public void TrayBringToForeground()
+        {
+            if (!CanShowRootViewModel)
+                return;
+            CanShowRootViewModel = false;
+
+            Execute.OnUIThread(() =>
+            {
+                var rootViewModel = _kernel.Get<RootViewModel>();
+                rootViewModel.Closed += RootViewModelOnClosed;
+                _windowManager.ShowWindow(rootViewModel);
+            });
+        }
+
+        public void TrayExit()
+        {
+            Application.Current.Shutdown();
+        }
+
+        private void ShowSplashScreen()
+        {
+            Execute.OnUIThread(() =>
+            {
+                var splashViewModel = _kernel.Get<SplashViewModel>();
+                _windowManager.ShowWindow(splashViewModel);
+            });
+        }
+
+        private void RootViewModelOnClosed(object sender, CloseEventArgs e)
+        {
+            CanShowRootViewModel = true;
+        }
+    }
+}
\ No newline at end of file