diff --git a/Gremlin/GUI/ChooseDB.xaml b/Gremlin/GUI/ChooseDB.xaml
index 08499e8..7e5e1ae 100644
--- a/Gremlin/GUI/ChooseDB.xaml
+++ b/Gremlin/GUI/ChooseDB.xaml
@@ -7,7 +7,6 @@
         Title="ChooseDB" Height="309" Width="600" 
         WindowStyle="None"
         ResizeMode="NoResize"
-        Topmost="True" 
         WindowStartupLocation="CenterScreen" 
         SizeToContent="Height" 
         ShowInTaskbar="False">
diff --git a/Gremlin/GUI/Login.xaml b/Gremlin/GUI/Login.xaml
index ea12992..4d33841 100644
--- a/Gremlin/GUI/Login.xaml
+++ b/Gremlin/GUI/Login.xaml
@@ -7,6 +7,7 @@
         Title="Gremlin Login" Height="130" Width="350"
         WindowStyle="None"
         ResizeMode="NoResize"
+        SizeToContent="Height" 
         WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
diff --git a/Gremlin/GUI/Login.xaml.cs b/Gremlin/GUI/Login.xaml.cs
index c9e5288..0e63e88 100644
--- a/Gremlin/GUI/Login.xaml.cs
+++ b/Gremlin/GUI/Login.xaml.cs
@@ -27,8 +27,8 @@ namespace Gremlin.GUI
                 _ = MessageBox.Show("Login Name oder Passwort falsch!", "Login failed!", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             MainWindow mainWindow = new();
-            mainWindow.Show();
             Close();
+            mainWindow.Show();
         }
     }
 }
diff --git a/Gremlin/GUI/MainWindow.xaml b/Gremlin/GUI/MainWindow.xaml
index ed69223..83d2816 100644
--- a/Gremlin/GUI/MainWindow.xaml
+++ b/Gremlin/GUI/MainWindow.xaml
@@ -6,6 +6,7 @@
         mc:Ignorable="d"
         Title="Gremlin" Height="850" Width="1200"
         ResizeMode="NoResize"
+        WindowStyle="SingleBorderWindow"
         WindowStartupLocation="CenterScreen" >
     <Grid Width="1189">
         <Grid.RowDefinitions>
diff --git a/Gremlin/Gremlin.csproj b/Gremlin/Gremlin.csproj
index 436d4c5..1ff07f2 100644
--- a/Gremlin/Gremlin.csproj
+++ b/Gremlin/Gremlin.csproj
@@ -10,6 +10,7 @@
     <RepositoryUrl>https://github.com/Basimodo/Gremlin</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
     <Copyright>2021</Copyright>
+    <ApplicationIcon>gremlin.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Gremlin/Images/gremlin.ico b/Gremlin/Images/gremlin.ico
new file mode 100644
index 0000000..f9b9c65
Binary files /dev/null and b/Gremlin/Images/gremlin.ico differ
diff --git a/Gremlin/Images/gremlin.jpg b/Gremlin/Images/gremlin.jpg
new file mode 100644
index 0000000..01a8e5d
Binary files /dev/null and b/Gremlin/Images/gremlin.jpg differ
diff --git a/Gremlin/gremlin.ico b/Gremlin/gremlin.ico
new file mode 100644
index 0000000..190f84d
Binary files /dev/null and b/Gremlin/gremlin.ico differ