diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 4b9a7ab44..fedabecf9 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -20,7 +20,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<ApplicationIcon>Resources\Images\Logo\logo-512.ico</ApplicationIcon>
+		<ApplicationIcon>Resources\Images\Logo\bow.ico</ApplicationIcon>
 	</PropertyGroup>
 	<PropertyGroup>
 		<PostBuildEvent />
@@ -84,9 +84,10 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="Resources\Fonts\RobotoMono-Regular.ttf" />
+		<Resource Include="Resources\Images\Logo\bow-white.ico" />
+		<Resource Include="Resources\Images\Logo\bow-white.svg" />
+		<Resource Include="Resources\Images\Logo\bow.ico" />
 		<Resource Include="Resources\Images\Logo\bow.svg" />
-		<Resource Include="Resources\Images\Logo\logo-512.ico" />
-		<Resource Include="Resources\Images\Logo\logo-512.png" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="Resources\Cursors\aero_rotate_tl.cur" />
@@ -310,8 +311,10 @@
 	</ItemGroup>
 	<ItemGroup>
 		<None Remove="Resources\Fonts\RobotoMono-Regular.ttf" />
+		<None Remove="Resources\Images\Logo\bow-white.ico" />
+		<None Remove="Resources\Images\Logo\bow-white.svg" />
+		<None Remove="Resources\Images\Logo\bow.ico" />
 		<None Remove="Resources\Images\Logo\bow.svg" />
-		<None Remove="Resources\Images\Logo\logo-512.ico" />
 		<None Remove="Resources\Images\PhysicalLayouts\abnt.png" />
 		<None Remove="Resources\Images\PhysicalLayouts\ansi.png" />
 		<None Remove="Resources\Images\PhysicalLayouts\iso.png" />
diff --git a/src/Artemis.UI/Resources/Images/Logo/bow-white.ico b/src/Artemis.UI/Resources/Images/Logo/bow-white.ico
new file mode 100644
index 000000000..ab10952b9
Binary files /dev/null and b/src/Artemis.UI/Resources/Images/Logo/bow-white.ico differ
diff --git a/src/Artemis.UI/Resources/Images/Logo/bow-white.svg b/src/Artemis.UI/Resources/Images/Logo/bow-white.svg
new file mode 100644
index 000000000..8d2160536
--- /dev/null
+++ b/src/Artemis.UI/Resources/Images/Logo/bow-white.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+	<defs>
+		<style>.cls-1,.cls-2{fill:#fff;}.cls-2{fill-rule:evenodd;}</style>
+	</defs>
+	<g id="Layer_10" data-name="Layer 10">
+		<path class="cls-1" d="M52.32,17.68l-2.83,5a1.16,1.16,0,0,1-2,0l-.57-1-.54.32c-.22-.44-.46-.88-.71-1.31s-.66-1.1-1-1.63l.53-.3-.63-1.06a1.16,1.16,0,0,1,1-1.74l5.75,0A1.15,1.15,0,0,1,52.32,17.68Z"/>
+		<path class="cls-1" d="M24.71,25.63l-4.84,2.58-.53.28a38.15,38.15,0,0,1-5.54-2.18c-4.51-1.49-1.48-7,1.93-4.31.34.22.69.44,1,.64.59.35,1.21.67,1.82,1A25.88,25.88,0,0,0,24.71,25.63Z"/>
+		<path class="cls-1" d="M30.83,36.22c-.15.43-.28.86-.41,1.29a25.74,25.74,0,0,0-.81,4.09,26.72,26.72,0,0,0-.17,3.1c0,.37,0,.75,0,1.12A2.45,2.45,0,0,1,25,47.72c-.56-1-.22-2-.18-3.08s.21-2,.39-3c.12-.74.27-1.47.43-2.2l.53-.33,3.63-2.26Z"/>
+		<path class="cls-1" d="M35,28.71l-.91.57L31.3,31,24,35.59l-4.45,2.78-2.22,1.37a2.6,2.6,0,0,1-1.26.34,2.45,2.45,0,0,1-.8-4.72l.58-.31,1.3-.69,4.67-2.5,7.6-4.05,2.94-1.57.94-.5a17.91,17.91,0,0,1,1,1.55C34.57,27.75,34.82,28.23,35,28.71Z"/>
+		<path class="cls-2" d="M39.29,53.89a2.56,2.56,0,0,1-1.09.74l-.34.08a.13.13,0,0,1-.09,0,1.84,1.84,0,0,1-.33,0,2.41,2.41,0,0,1-1.84-4,22.32,22.32,0,0,0,5-18.09c0-.24-.08-.48-.13-.72s-.1-.48-.16-.73-.11-.48-.18-.72-.12-.45-.2-.68a20.49,20.49,0,0,0-.7-1.94c-.06-.18-.14-.34-.21-.51a21.83,21.83,0,0,0-1.09-2.16c-.14-.22-.27-.45-.4-.66-.25-.4-.51-.78-.77-1.16s-.63-.85-1-1.26l-.48-.56c-.35-.4-.72-.78-1.09-1.14a6.51,6.51,0,0,0-.54-.51l-.45-.4a22.08,22.08,0,0,0-3-2.2c-.17-.11-.36-.21-.54-.31s-.42-.24-.63-.35l-.46-.23a19.7,19.7,0,0,0-2.31-1l-.44-.15-.1,0c-.53-.18-1.07-.34-1.63-.48l-.25-.06a19.61,19.61,0,0,0-2-.39c-.35-.06-.7-.1-1-.13s-.8-.07-1.2-.08-.65,0-1,0h0a22.18,22.18,0,0,0-4,.36,3.28,3.28,0,0,1-.43,0,2.42,2.42,0,0,1-.42-4.8A26,26,0,0,1,18,9.26h.62c.43,0,.86,0,1.28,0l1,.07,1.07.11c.52.07,1,.14,1.53.24.23,0,.46.08.7.13l.14,0c.35.08.69.15,1,.25a20.61,20.61,0,0,1,2.16.65c.48.16.94.33,1.4.52h0c.33.14.67.28,1,.44s.58.27.86.42l.27.13c.28.14.56.29.82.45s.64.36,1,.55c.49.31,1,.62,1.45,1l.15.11c.31.22.62.46.93.7l.11.08c.36.28.71.58,1.06.89l0,0c.33.28.64.57,1,.88s.64.62.94.95c.1.1.19.21.29.32.26.29.52.58.77.88,0,0,0,.05.06.09.28.34.55.68.81,1s.55.75.82,1.15l.28.44c.21.33.42.67.62,1A27.14,27.14,0,0,1,39.29,53.89Z"/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/Artemis.UI/Resources/Images/Logo/bow.ico b/src/Artemis.UI/Resources/Images/Logo/bow.ico
new file mode 100644
index 000000000..d3b788ab7
Binary files /dev/null and b/src/Artemis.UI/Resources/Images/Logo/bow.ico differ
diff --git a/src/Artemis.UI/Resources/Images/Logo/bow.svg b/src/Artemis.UI/Resources/Images/Logo/bow.svg
index 66817473d..20c9e4c42 100644
--- a/src/Artemis.UI/Resources/Images/Logo/bow.svg
+++ b/src/Artemis.UI/Resources/Images/Logo/bow.svg
@@ -1,44 +1,27 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="242.000000pt" height="341.000000pt" viewBox="0 0 242.000000 341.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-</metadata>
-<g transform="translate(0.000000,341.000000) scale(0.100000,-0.100000)"
-fill="#ffffff" stroke="none">
-<path d="M46 3388 l-48 -22 5 -47 c15 -121 99 -212 249 -268 l75 -28 1 36 c1
-20 4 71 8 114 3 46 2 77 -3 77 -16 0 -33 49 -33 94 0 40 -3 45 -31 55 -54 19
--168 13 -223 -11z"/>
-<path d="M378 3281 c-24 -19 -25 -26 -31 -173 -3 -84 -24 -409 -47 -723 -22
--313 -44 -628 -48 -700 -5 -71 -10 -111 -11 -88 l-1 42 -85 -37 c-46 -20 -85
--42 -85 -47 0 -6 38 -19 85 -29 l85 -19 0 -43 c0 -57 14 -92 44 -105 l25 -12
--40 -79 c-22 -44 -39 -81 -37 -83 5 -5 472 215 484 228 6 7 21 51 34 98 l22
-86 615 288 c337 158 615 286 617 284 2 -2 -9 -49 -25 -103 -16 -55 -27 -102
--24 -104 7 -8 144 108 235 198 92 91 230 263 230 286 0 27 -334 14 -562 -22
--60 -10 -108 -20 -108 -24 0 -4 45 -27 100 -52 l100 -45 -172 -81 c-684 -321
--1017 -476 -1042 -485 -24 -8 -44 -5 -110 18 l-82 28 -98 -46 c-55 -26 -101
--45 -103 -43 -5 5 87 1349 93 1355 2 2 4 -12 4 -31 0 -29 4 -37 23 -41 12 -4
-132 -18 267 -32 333 -35 482 -69 585 -133 62 -38 86 -63 111 -117 33 -69 31
--135 -6 -247 l-30 -89 77 -110 c42 -61 80 -112 84 -115 4 -2 55 18 113 45
-l105 50 -49 73 -48 74 41 84 c41 81 42 86 42 184 0 96 -2 104 -34 163 -34 64
--118 154 -184 199 -21 14 -81 46 -135 72 l-97 47 -325 6 c-179 4 -358 12 -397
-18 -40 7 -78 9 -84 6 -6 -4 -20 -21 -31 -39 -24 -37 -22 -30 16 57 l29 68 -28
-29 c-34 35 -71 39 -107 11z"/>
-<path d="M1730 2035 c-52 -25 -99 -46 -103 -48 -5 -1 8 -66 28 -144 l37 -141
-45 -12 c115 -28 217 -106 244 -186 47 -138 -16 -306 -236 -635 -74 -110 -147
--221 -162 -246 -26 -45 -26 -46 -7 -60 34 -27 98 -53 129 -52 27 0 37 11 103
-112 40 62 105 151 145 198 39 48 110 131 155 185 100 119 116 148 149 273 32
-125 34 267 6 357 -47 145 -150 232 -314 266 -34 7 -63 17 -65 23 -2 5 -13 43
--24 83 -12 39 -25 72 -28 72 -4 0 -50 -20 -102 -45z"/>
-<path d="M450 1273 l-35 -15 25 -17 c13 -9 123 -86 245 -172 121 -85 360 -254
-530 -374 171 -120 352 -251 403 -292 79 -62 98 -72 120 -67 61 15 79 42 64 99
--8 27 -17 33 -113 65 -103 35 -109 39 -641 413 -296 207 -543 377 -550 376 -7
-0 -29 -8 -48 -16z"/>
-<path d="M1486 380 c-29 -90 -34 -190 -12 -253 17 -46 65 -117 85 -125 20 -8
-117 45 147 81 14 16 36 51 49 77 l24 48 -44 45 c-25 24 -45 53 -45 64 0 13
--26 38 -77 75 -43 30 -83 58 -89 61 -7 4 -21 -22 -38 -73z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+	<defs>
+		<style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:url(#linear-gradient-3);}.cls-4{fill:url(#linear-gradient-4);}.cls-5{fill-rule:evenodd;fill:url(#linear-gradient-5);}</style>
+		<linearGradient id="linear-gradient" x1="10.89" y1="4.3" x2="132.29" y2="43.7" gradientUnits="userSpaceOnUse">
+			<stop offset="0" stop-color="#f39f25"/>
+			<stop offset="0.12" stop-color="#f83d3d"/>
+			<stop offset="0.28" stop-color="#cb3cee"/>
+			<stop offset="0.44" stop-color="#2667f6"/>
+			<stop offset="0.56" stop-color="#1cb8e9"/>
+			<stop offset="1" stop-color="#d1e926"/>
+		</linearGradient>
+		<linearGradient id="linear-gradient-2" x1="5.67" y1="20.39" x2="127.07" y2="59.79" xlink:href="#linear-gradient"/>
+		<linearGradient id="linear-gradient-3" x1="1.17" y1="34.25" x2="122.57" y2="73.65" xlink:href="#linear-gradient"/>
+		<linearGradient id="linear-gradient-4" x1="3.87" y1="25.93" x2="125.27" y2="65.33" xlink:href="#linear-gradient"/>
+		<linearGradient id="linear-gradient-5" x1="18.41" y1="11.59" x2="55.36" y2="54.71" gradientUnits="userSpaceOnUse">
+			<stop offset="0" stop-color="#009587"/>
+			<stop offset="1" stop-color="#045e53"/>
+		</linearGradient>
+	</defs>
+	<g id="Layer_26" data-name="Layer 26">
+		<path class="cls-1" d="M56.55,16.11l-3.14,5.54a1.28,1.28,0,0,1-2.22,0l-.63-1.08-.6.35c-.25-.48-.52-1-.79-1.45s-.73-1.21-1.11-1.8l.58-.34L48,16.17a1.29,1.29,0,0,1,1.1-1.93l6.38-.05A1.28,1.28,0,0,1,56.55,16.11Z"/>
+		<path class="cls-2" d="M25.91,24.93l-5.37,2.86-.59.32a43.86,43.86,0,0,1-6.15-2.42C8.8,24,12.16,18,15.94,20.9c.38.25.77.49,1.16.72.66.38,1.34.73,2,1.06A29,29,0,0,0,25.91,24.93Z"/>
+		<path class="cls-3" d="M32.7,36.69c-.17.47-.31.94-.45,1.42a28.75,28.75,0,0,0-1.09,8c0,.42,0,.83.05,1.25a2.72,2.72,0,0,1-5,2.11c-.62-1.08-.24-2.27-.2-3.42s.24-2.23.43-3.33c.14-.82.31-1.64.49-2.45l.58-.35,4-2.51Z"/>
+		<path class="cls-4" d="M37.38,28.35l-1,.63-3.15,2L25.12,36l-4.94,3.08c-.82.5-1.63,1-2.46,1.52a2.87,2.87,0,0,1-1.4.38,2.72,2.72,0,0,1-.89-5.24l.65-.35,1.44-.76,5.18-2.77,8.44-4.5,3.26-1.74,1.05-.56c.39.56.77,1.13,1.11,1.72S37.13,27.81,37.38,28.35Z"/>
+		<path class="cls-5" d="M42.09,56.29a3,3,0,0,1-.68.58,2.79,2.79,0,0,1-.53.24,2.49,2.49,0,0,1-.37.09.2.2,0,0,1-.11,0,1.47,1.47,0,0,1-.36,0,2.65,2.65,0,0,1-1.73-.64A2.68,2.68,0,0,1,38,52.83a24.76,24.76,0,0,0,5.51-20.07c0-.27-.09-.54-.14-.81s-.11-.53-.18-.8-.13-.53-.2-.8-.14-.5-.22-.75c-.22-.73-.48-1.45-.77-2.16-.08-.2-.16-.38-.24-.57-.36-.81-.77-1.61-1.22-2.4l-.44-.73c-.27-.44-.56-.87-.85-1.28s-.7-.95-1.08-1.4c-.17-.21-.35-.42-.53-.62-.39-.44-.79-.87-1.21-1.27a8,8,0,0,0-.6-.56c-.16-.16-.34-.31-.5-.45A24,24,0,0,0,32,15.72l-.6-.35c-.23-.14-.47-.27-.7-.38s-.34-.18-.51-.26a22.68,22.68,0,0,0-2.57-1.12l-.47-.16-.12,0c-.59-.2-1.19-.37-1.81-.53l-.28-.07a20.71,20.71,0,0,0-2.22-.43c-.38-.06-.77-.11-1.16-.14s-.89-.08-1.33-.1l-1.09,0h0a24.23,24.23,0,0,0-4.4.39,2.61,2.61,0,0,1-.48.05,2.69,2.69,0,0,1-.47-5.33,29.56,29.56,0,0,1,4.66-.47h.69c.48,0,.95,0,1.42,0s.75,0,1.12.08.8.07,1.19.11c.57.08,1.13.16,1.69.27q.39.06.78.15l.16,0c.39.08.76.16,1.14.26a22.84,22.84,0,0,1,2.4.73c.53.17,1,.37,1.56.58h0c.37.15.75.31,1.11.49s.64.29,1,.45l.31.15c.3.16.61.32.91.5s.71.4,1.06.61c.55.35,1.09.69,1.61,1.07l.16.12,1,.77.12.1c.4.31.79.64,1.18,1l0,0c.36.31.71.63,1.05,1s.71.69,1,1.06c.11.11.22.23.32.35.3.32.58.64.86,1l.07.09c.31.38.61.77.9,1.16s.61.84.9,1.28c.1.16.22.32.32.49.24.37.47.74.69,1.13A30.11,30.11,0,0,1,42.09,56.29Z"/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/Artemis.UI/Resources/Images/Logo/logo-512.ico b/src/Artemis.UI/Resources/Images/Logo/logo-512.ico
deleted file mode 100644
index 015d1ffa8..000000000
Binary files a/src/Artemis.UI/Resources/Images/Logo/logo-512.ico and /dev/null differ
diff --git a/src/Artemis.UI/Resources/Images/Logo/logo-512.png b/src/Artemis.UI/Resources/Images/Logo/logo-512.png
deleted file mode 100644
index d1cd8ebe7..000000000
Binary files a/src/Artemis.UI/Resources/Images/Logo/logo-512.png and /dev/null differ
diff --git a/src/Artemis.UI/Screens/Home/HomeView.xaml b/src/Artemis.UI/Screens/Home/HomeView.xaml
index 78db3be5c..0842eb9dc 100644
--- a/src/Artemis.UI/Screens/Home/HomeView.xaml
+++ b/src/Artemis.UI/Screens/Home/HomeView.xaml
@@ -7,6 +7,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:home="clr-namespace:Artemis.UI.Screens.Home"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              mc:Ignorable="d"
              d:DesignHeight="574.026"
              d:DesignWidth="1029.87"
@@ -37,7 +38,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             
-            <shared:ArtemisIcon SvgSource="/Resources/Images/Logo/bow.svg" Width="100" Height="100"/>
+            <Image Source="{svgc:SvgImage Source=/Resources/Images/Logo/bow.svg}" Height="100" Width="100"/>
             <StackPanel Grid.Column="1" Margin="24 0 0 0" VerticalAlignment="Center">
                 <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap">Welcome to Artemis, RGB on steroids.</TextBlock>
                 <Button Style="{StaticResource MaterialDesignFlatButton}"
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
index 208a1ba50..be12eadb1 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
@@ -18,7 +18,7 @@
                          d:DesignHeight="800"
                          d:DesignWidth="800"
                          d:DataContext="{d:DesignInstance windows:LayerBrushSettingsWindowViewModel}"
-                         Icon="/Resources/Images/Logo/logo-512.png">
+                         Icon="/Resources/Images/Logo/bow.ico">
     <materialDesign:DialogHost IsTabStop="False"
                                Focusable="False"
                                Identifier="BrushSettingsDialog"
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
index ea915b311..df0b68f16 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
@@ -20,7 +20,7 @@
                          d:DesignHeight="800"
                          d:DesignWidth="800"
                          d:DataContext="{d:DesignInstance windows:LayerEffectSettingsWindowViewModel}"
-                         Icon="/Resources/Images/Logo/logo-512.png">
+                         Icon="/Resources/Images/Logo/bow.ico">
     <DockPanel>
         <controls:AppBar Type="Dense" Title="{Binding ActiveItem.LayerEffect.Descriptor.DisplayName}" DockPanel.Dock="Top" Margin="-18 0 0 0" ShowShadow="False">
             <controls:AppBar.AppIcon>
diff --git a/src/Artemis.UI/Screens/RootView.xaml b/src/Artemis.UI/Screens/RootView.xaml
index 66a7a286b..29a889221 100644
--- a/src/Artemis.UI/Screens/RootView.xaml
+++ b/src/Artemis.UI/Screens/RootView.xaml
@@ -8,11 +8,12 @@
                     xmlns:screens="clr-namespace:Artemis.UI.Screens"
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                     xmlns:converters="clr-namespace:Artemis.UI.Converters"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     FadeContentIfInactive="False"
-                    Icon="/Resources/Images/Logo/logo-512.png"
+                    Icon="/Resources/Images/Logo/bow.ico"
                     Title="{Binding WindowTitle}"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
diff --git a/src/Artemis.UI/Screens/RootViewModel.cs b/src/Artemis.UI/Screens/RootViewModel.cs
index cb726d024..97e19b281 100644
--- a/src/Artemis.UI/Screens/RootViewModel.cs
+++ b/src/Artemis.UI/Screens/RootViewModel.cs
@@ -27,7 +27,6 @@ namespace Artemis.UI.Screens
     {
         private readonly IRegistrationService _builtInRegistrationService;
         private readonly IMessageService _messageService;
-        private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
         private readonly ICoreService _coreService;
         private readonly IWindowManager _windowManager;
         private readonly IDebugService _debugService;
@@ -36,7 +35,6 @@ namespace Artemis.UI.Screens
         private readonly ISettingsService _settingsService;
         private readonly Timer _frameTimeUpdateTimer;
         private readonly SidebarViewModel _sidebarViewModel;
-        private readonly ThemeWatcher _themeWatcher;
         private readonly PluginSetting<WindowSize> _windowSize;
         private bool _activeItemReady;
         private string _frameTime;
@@ -67,12 +65,7 @@ namespace Artemis.UI.Screens
             _sidebarViewModel = sidebarViewModel;
             _frameTimeUpdateTimer = new Timer(500);
 
-            _colorScheme = _settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
             _windowSize = _settingsService.GetSetting<WindowSize>("UI.RootWindowSize");
-
-            _themeWatcher = new ThemeWatcher();
-            ApplyColorSchemeSetting();
-
             _sidebarViewModel.ConductWith(this);
 
             ActiveItem = sidebarViewModel.SelectedItem;
@@ -191,52 +184,12 @@ namespace Artemis.UI.Screens
 
             }
         }
-
-        private void ApplyColorSchemeSetting()
-        {
-            if (_colorScheme.Value == ApplicationColorScheme.Automatic)
-                ApplyWindowsTheme(_themeWatcher.GetWindowsTheme());
-            else
-                ChangeMaterialColors(_colorScheme.Value);
-        }
-
-        private void ApplyWindowsTheme(ThemeWatcher.WindowsTheme windowsTheme)
-        {
-            if (_colorScheme.Value != ApplicationColorScheme.Automatic)
-                return;
-
-            if (windowsTheme == ThemeWatcher.WindowsTheme.Dark)
-                ChangeMaterialColors(ApplicationColorScheme.Dark);
-            else
-                ChangeMaterialColors(ApplicationColorScheme.Light);
-        }
-
-        private void ChangeMaterialColors(ApplicationColorScheme colorScheme)
-        {
-            PaletteHelper paletteHelper = new();
-            ITheme theme = paletteHelper.GetTheme();
-            theme.SetBaseTheme(colorScheme == ApplicationColorScheme.Dark ? Theme.Dark : Theme.Light);
-            paletteHelper.SetTheme(theme);
-
-            MaterialDesignExtensions.Themes.PaletteHelper extensionsPaletteHelper = new();
-            extensionsPaletteHelper.SetLightDark(colorScheme == ApplicationColorScheme.Dark);
-        }
-
+        
         private void OnFrameTimeUpdateTimerOnElapsed(object sender, ElapsedEventArgs args)
         {
             UpdateFrameTime();
         }
-
-        private void ThemeWatcherOnThemeChanged(object sender, WindowsThemeEventArgs e)
-        {
-            ApplyWindowsTheme(e.Theme);
-        }
-
-        private void ColorSchemeOnSettingChanged(object sender, EventArgs e)
-        {
-            ApplyColorSchemeSetting();
-        }
-
+        
         private void PinSidebarOnSettingChanged(object sender, EventArgs e)
         {
             UpdateSidebarPinState();
@@ -280,8 +233,6 @@ namespace Artemis.UI.Screens
             _builtInRegistrationService.RegisterBuiltInPropertyEditors();
 
             _frameTimeUpdateTimer.Elapsed += OnFrameTimeUpdateTimerOnElapsed;
-            _colorScheme.SettingChanged += ColorSchemeOnSettingChanged;
-            _themeWatcher.ThemeChanged += ThemeWatcherOnThemeChanged;
             _sidebarViewModel.PropertyChanged += SidebarViewModelOnPropertyChanged;
             PinSidebar.SettingChanged += PinSidebarOnSettingChanged;
 
@@ -315,8 +266,6 @@ namespace Artemis.UI.Screens
             _windowSize.Save();
 
             _frameTimeUpdateTimer.Elapsed -= OnFrameTimeUpdateTimerOnElapsed;
-            _colorScheme.SettingChanged -= ColorSchemeOnSettingChanged;
-            _themeWatcher.ThemeChanged -= ThemeWatcherOnThemeChanged;
             _sidebarViewModel.PropertyChanged -= SidebarViewModelOnPropertyChanged;
             PinSidebar.SettingChanged -= PinSidebarOnSettingChanged;
 
diff --git a/src/Artemis.UI/Screens/Settings/Debug/DebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/DebugView.xaml
index 32f2e6256..1c70ff37c 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/DebugView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Debug/DebugView.xaml
@@ -7,9 +7,10 @@
                     xmlns:s="https://github.com/canton7/Stylet"
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                     xmlns:debug="clr-namespace:Artemis.UI.Screens.Settings.Debug"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     Title="Artemis debugger"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
@@ -18,7 +19,7 @@
                     Width="1200"
                     Height="800"
                     d:DesignHeight="800" d:DesignWidth="800" d:DataContext="{d:DesignInstance debug:DebugViewModel}"
-                    Icon="/Resources/Images/Logo/logo-512.png"
+                    Icon="/Resources/Images/Logo/bow.ico"
                     Topmost="{Binding StayOnTopSetting.Value}">
     <materialDesign:DialogHost IsTabStop="False"
                                Focusable="False"
diff --git a/src/Artemis.UI/Screens/Settings/Device/DeviceDialogView.xaml b/src/Artemis.UI/Screens/Settings/Device/DeviceDialogView.xaml
index fe4ab6371..cecc74966 100644
--- a/src/Artemis.UI/Screens/Settings/Device/DeviceDialogView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Device/DeviceDialogView.xaml
@@ -8,9 +8,10 @@
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                     xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
                     xmlns:device="clr-namespace:Artemis.UI.Screens.Settings.Device"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     Title="{Binding DisplayName}"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
@@ -20,7 +21,7 @@
                     Height="800"
                     d:DesignHeight="800" d:DesignWidth="800"
                     d:DataContext="{d:DesignInstance device:DeviceDialogViewModel}"
-                    Icon="/Resources/Images/Logo/logo-512.png">
+                    Icon="/Resources/Images/Logo/bow.ico">
     <mde:MaterialWindow.Resources>
         <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
     </mde:MaterialWindow.Resources>
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/About/AboutTabView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/About/AboutTabView.xaml
index f7a3f14c2..cdf393383 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/About/AboutTabView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/About/AboutTabView.xaml
@@ -6,13 +6,14 @@
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Tabs.About"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:AboutTabViewModel}">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
         <StackPanel Margin="15" MaxWidth="800">
             <StackPanel Orientation="Horizontal">
-                <shared:ArtemisIcon SvgSource="/Resources/Images/Logo/bow.svg" Width="60" Height="80" Margin="0 0 20 0" />
+                <Image Source="{svgc:SvgImage Source=/Resources/Images/Logo/bow.svg}" Width="60" Height="80" Margin="0 0 20 0" />
                 <TextBlock Style="{StaticResource MaterialDesignHeadline2TextBlock}">
                     Artemis 2
                 </TextBlock>
@@ -49,7 +50,8 @@
                     </StackPanel>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" LineHeight="25" Margin="10 0 0 0">
                         - All the people on Discord providing feedback and testing<LineBreak />
-                        - Aureshion - Default device images
+                        - Aureshion - Default device images<LineBreak />
+                        - kaisax - Logo design
                     </TextBlock>
                 </StackPanel>
             </materialDesign:Card>
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml
index 0d1655136..ad7623595 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml
@@ -18,7 +18,7 @@
                          d:DesignHeight="800"
                          d:DesignWidth="800"
                          d:DataContext="{d:DesignInstance local:PluginSettingsWindowViewModel}"
-                         Icon="/Resources/Images/Logo/logo-512.png">
+                         Icon="/Resources/Images/Logo/bow.ico">
     <materialDesign:DialogHost IsTabStop="False"
                                Focusable="False"
                                Identifier="PluginSettingsDialog"
diff --git a/src/Artemis.UI/Screens/Splash/SplashView.xaml b/src/Artemis.UI/Screens/Splash/SplashView.xaml
index 0840bde6f..6031dab27 100644
--- a/src/Artemis.UI/Screens/Splash/SplashView.xaml
+++ b/src/Artemis.UI/Screens/Splash/SplashView.xaml
@@ -6,28 +6,29 @@
                          xmlns:splash="clr-namespace:Artemis.UI.Screens.Splash"
                          xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                          xmlns:s="https://github.com/canton7/Stylet"
+                         xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                          mc:Ignorable="d"
                          Title=" "
                          ResizeMode="NoResize"
-                         BorderBackgroundBrush="{DynamicResource PrimaryHueMidBrush}"
+                         BorderBackgroundBrush="{DynamicResource MaterialDesignPaper}"
                          Height="450"
                          Width="400"
                          WindowStartupLocation="CenterScreen"
                          FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
                          MouseDown="{s:Action MouseDown}"
                          d:DataContext="{d:DesignInstance splash:SplashViewModel}">
-    <Grid Background="{DynamicResource PrimaryHueMidBrush}">
+    <Grid Background="{DynamicResource MaterialDesignPaper}">
         <Grid.RowDefinitions>
             <RowDefinition Height="250" />
             <RowDefinition Height="50" />
             <RowDefinition Height="Auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Image Source="{StaticResource BowIcon}" Stretch="Uniform" Margin="50" />
-        <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="White" FontSize="16">
+        <Image Source="{svgc:SvgImage Source=/Resources/Images/Logo/bow.svg}" Stretch="Uniform" Margin="50"/>
+        <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="{DynamicResource MaterialDesignBody}" FontSize="16">
             Artemis is initializing...
         </TextBlock>
-        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Foreground="#FFDDDDDD" Text="{Binding Status}" />
-        <ProgressBar Grid.Row="3" IsIndeterminate="True" Maximum="1" Minimum="1" Margin="16 0" />
+        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Foreground="{DynamicResource MaterialDesignBody}" Text="{Binding Status}" />
+        <ProgressBar  Grid.Row="3" IsIndeterminate="True" Maximum="1" Minimum="1" Margin="16 0" />
     </Grid>
 </controls:MaterialWindow>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
index b81bbab63..8ef0f1ff3 100644
--- a/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
@@ -6,13 +6,14 @@
                     xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
                     xmlns:s="https://github.com/canton7/Stylet"
                     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     Width="800"
                     Height="600"
                     ResizeMode="NoResize"
-                    Icon="/Resources/Images/Logo/logo-512.png"
+                    Icon="/Resources/Images/Logo/bow.ico"
                     Title="Artemis startup wizard"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
diff --git a/src/Artemis.UI/Screens/TrayView.xaml b/src/Artemis.UI/Screens/TrayView.xaml
index 6e43c046d..20863ad1f 100644
--- a/src/Artemis.UI/Screens/TrayView.xaml
+++ b/src/Artemis.UI/Screens/TrayView.xaml
@@ -7,7 +7,7 @@
         xmlns:s="https://github.com/canton7/Stylet"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d">
-    <tb:TaskbarIcon IconSource="/Resources/Images/Logo/logo-512.ico"
+    <tb:TaskbarIcon IconSource="/Resources/Images/Logo/bow-white.ico"
                     MenuActivation="LeftOrRightClick"
                     PopupActivation="DoubleClick"
                     DoubleClickCommand="{s:Action TrayBringToForeground}"
diff --git a/src/Artemis.UI/Screens/TrayViewModel.cs b/src/Artemis.UI/Screens/TrayViewModel.cs
index 9b94f0594..efdcf26d5 100644
--- a/src/Artemis.UI/Screens/TrayViewModel.cs
+++ b/src/Artemis.UI/Screens/TrayViewModel.cs
@@ -5,11 +5,14 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Events;
+using Artemis.UI.Screens.Settings.Tabs.General;
 using Artemis.UI.Screens.Splash;
 using Artemis.UI.Services;
 using Artemis.UI.Shared.Services;
+using Artemis.UI.Utilities;
 using Hardcodet.Wpf.TaskbarNotification;
 using MaterialDesignThemes.Wpf;
 using Ninject;
@@ -24,10 +27,12 @@ namespace Artemis.UI.Screens
         private readonly IEventAggregator _eventAggregator;
         private readonly IKernel _kernel;
         private readonly IWindowManager _windowManager;
+        private readonly ThemeWatcher _themeWatcher;
+        private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
         private RootViewModel _rootViewModel;
         private SplashViewModel _splashViewModel;
         private TaskbarIcon _taskBarIcon;
-
+        
         public TrayViewModel(IKernel kernel,
             IWindowManager windowManager,
             IWindowService windowService,
@@ -46,6 +51,13 @@ namespace Artemis.UI.Screens
             Core.Utilities.ShutdownRequested += UtilitiesOnShutdownRequested;
             Core.Utilities.RestartRequested += UtilitiesOnShutdownRequested;
 
+            _themeWatcher = new ThemeWatcher();
+            _colorScheme = settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
+            _colorScheme.SettingChanged += ColorSchemeOnSettingChanged;
+            _themeWatcher.ThemeChanged += ThemeWatcherOnThemeChanged;
+
+            ApplyColorSchemeSetting();
+
             windowService.ConfigureMainWindowProvider(this);
             messageService.ConfigureNotificationProvider(this);
             bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun");
@@ -151,6 +163,50 @@ namespace Artemis.UI.Screens
             OnMainWindowClosed();
         }
 
+        #region Theme
+
+        private void ApplyColorSchemeSetting()
+        {
+            if (_colorScheme.Value == ApplicationColorScheme.Automatic)
+                ApplyWindowsTheme(_themeWatcher.GetWindowsTheme());
+            else
+                ChangeMaterialColors(_colorScheme.Value);
+        }
+
+        private void ApplyWindowsTheme(ThemeWatcher.WindowsTheme windowsTheme)
+        {
+            if (_colorScheme.Value != ApplicationColorScheme.Automatic)
+                return;
+
+            if (windowsTheme == ThemeWatcher.WindowsTheme.Dark)
+                ChangeMaterialColors(ApplicationColorScheme.Dark);
+            else
+                ChangeMaterialColors(ApplicationColorScheme.Light);
+        }
+
+        private void ChangeMaterialColors(ApplicationColorScheme colorScheme)
+        {
+            PaletteHelper paletteHelper = new();
+            ITheme theme = paletteHelper.GetTheme();
+            theme.SetBaseTheme(colorScheme == ApplicationColorScheme.Dark ? Theme.Dark : Theme.Light);
+            paletteHelper.SetTheme(theme);
+
+            MaterialDesignExtensions.Themes.PaletteHelper extensionsPaletteHelper = new();
+            extensionsPaletteHelper.SetLightDark(colorScheme == ApplicationColorScheme.Dark);
+        }
+
+        private void ThemeWatcherOnThemeChanged(object sender, WindowsThemeEventArgs e)
+        {
+            ApplyWindowsTheme(e.Theme);
+        }
+
+        private void ColorSchemeOnSettingChanged(object sender, EventArgs e)
+        {
+            ApplyColorSchemeSetting();
+        }
+
+        #endregion
+
         #region Implementation of INotificationProvider
 
         /// <inheritdoc />