diff --git a/src/Artemis.UI/Models/WindowSize.cs b/src/Artemis.UI/Models/WindowSize.cs
index d6872d78c..8879d8c33 100644
--- a/src/Artemis.UI/Models/WindowSize.cs
+++ b/src/Artemis.UI/Models/WindowSize.cs
@@ -49,15 +49,16 @@ public class WindowSize
 
         try
         {
+            // The -8 seems to be a FluentAvalonia thing?
             _applying = true;
             if (IsMaximized)
             {
-                window.Position = new PixelPoint(MaximizedLeft, MaximizedTop);
+                window.Position = new PixelPoint(Math.Max(-8, MaximizedLeft), Math.Max(-8, MaximizedTop));
                 window.WindowState = WindowState.Maximized;
             }
             else
             {
-                window.Position = new PixelPoint(Left, Top);
+                window.Position = new PixelPoint(Math.Max(-8, Left), Math.Max(-8, Top));
                 window.Height = Height;
                 window.Width = Width;
                 window.WindowState = WindowState.Normal;
diff --git a/src/Artemis.UI/Screens/Home/HomeView.axaml b/src/Artemis.UI/Screens/Home/HomeView.axaml
index 650adab1d..a20f0df65 100644
--- a/src/Artemis.UI/Screens/Home/HomeView.axaml
+++ b/src/Artemis.UI/Screens/Home/HomeView.axaml
@@ -70,7 +70,7 @@
 							<Grid Margin="8" RowDefinitions="*,*">
 								<controls:HyperlinkButton Grid.Row="0" NavigateUri="https://github.com/Artemis-RGB/Artemis">
 									<StackPanel Orientation="Horizontal">
-										<avalonia:MaterialIcon Kind="Gift" />
+										<avalonia:MaterialIcon Kind="Github" />
 										<TextBlock Margin="8 0 0 0" VerticalAlignment="Center">GitHub</TextBlock>
 									</StackPanel>
 								</controls:HyperlinkButton>