diff --git a/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml b/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml
index 8d783f52..81c32bde 100644
--- a/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="16" d:DesignWidth="16">
+             d:DesignHeight="16" d:DesignWidth="16" Margin="5,0">
     <Grid>
         <Button x:Name="IconButton" Click="Icon_Click" Background="#00000000" BorderThickness="0">
             <Button.Template>
diff --git a/SafeExamBrowser.UserInterface/Images/LogNotification.ico b/SafeExamBrowser.UserInterface/Images/LogNotification.ico
index 267f0e7d..1c7fb20f 100644
Binary files a/SafeExamBrowser.UserInterface/Images/LogNotification.ico and b/SafeExamBrowser.UserInterface/Images/LogNotification.ico differ
diff --git a/SafeExamBrowser.UserInterface/LogWindow.xaml b/SafeExamBrowser.UserInterface/LogWindow.xaml
index 7e0350ae..e5bbd073 100644
--- a/SafeExamBrowser.UserInterface/LogWindow.xaml
+++ b/SafeExamBrowser.UserInterface/LogWindow.xaml
@@ -11,7 +11,7 @@
         <SolidColorBrush Color="Black" Opacity="0.8" />
     </Window.Background>
     <Grid>
-        <TextBox x:Name="LogContent" AcceptsReturn="True" Background="Transparent" FontFamily="Consolas"  Foreground="White"
+        <TextBox x:Name="LogContent" AcceptsReturn="True" Background="Transparent" FontFamily="Consolas" Foreground="ForestGreen"
                  HorizontalScrollBarVisibility="Auto" IsReadOnly="True" Text="{Binding Path=Text, Mode=OneWay}"
                  VerticalScrollBarVisibility="Auto" TextChanged="LogContent_TextChanged" />
     </Grid>
diff --git a/SafeExamBrowser.UserInterface/LogWindow.xaml.cs b/SafeExamBrowser.UserInterface/LogWindow.xaml.cs
index dd50344c..bf125645 100644
--- a/SafeExamBrowser.UserInterface/LogWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface/LogWindow.xaml.cs
@@ -28,15 +28,11 @@ namespace SafeExamBrowser.UserInterface
 
 		public LogWindow(ILogger logger, ILogContentFormatter formatter, IText text)
 		{
-			InitializeComponent();
-
 			this.logger = logger;
 			this.model = new LogViewModel(logger.GetLog(), formatter, text);
 
-			DataContext = model;
-			LogContent.DataContext = model;
-
-			logger.Subscribe(model);
+			InitializeComponent();
+			InitializeLogWindow();
 		}
 
 		public void BringToForeground()
@@ -46,11 +42,7 @@ namespace SafeExamBrowser.UserInterface
 
 		public new void Close()
 		{
-			Dispatcher.Invoke(() =>
-			{
-				logger.Unsubscribe(model);
-				base.Close();
-			});
+			Dispatcher.Invoke(base.Close);
 		}
 
 		public new void Show()
@@ -62,5 +54,23 @@ namespace SafeExamBrowser.UserInterface
 		{
 			LogContent.ScrollToEnd();
 		}
+
+		private void InitializeLogWindow()
+		{
+			DataContext = model;
+			LogContent.DataContext = model;
+			Closing += LogWindow_Closing;
+
+			logger.Subscribe(model);
+			logger.Info("Opened log window.");
+		}
+
+		private void LogWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			logger.Unsubscribe(model);
+			logger.Info("Closed log window.");
+
+			closing?.Invoke();
+		}
 	}
 }
diff --git a/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
index 51a297da..7b9adc43 100644
--- a/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
+++ b/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
@@ -50,7 +50,7 @@ namespace SafeExamBrowser.UserInterface
 			});
 
 			logWindowThread.SetApartmentState(ApartmentState.STA);
-			logWindowThread.Name = "Log Window Thread";
+			logWindowThread.Name = nameof(LogWindow);
 			logWindowThread.IsBackground = true;
 			logWindowThread.Start();
 
@@ -80,7 +80,7 @@ namespace SafeExamBrowser.UserInterface
 			});
 
 			splashScreenThread.SetApartmentState(ApartmentState.STA);
-			splashScreenThread.Name = "Splash Screen Thread";
+			splashScreenThread.Name = nameof(SplashScreen);
 			splashScreenThread.IsBackground = true;
 			splashScreenThread.Start();