diff --git a/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml b/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml
index e5d93b53..fe8a0920 100644
--- a/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml
@@ -5,12 +5,29 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="75">
-    <Grid ToolTip="{Binding Path=ToolTip}" Margin="5,0">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="1*" />
-            <RowDefinition Height="1*" />
-        </Grid.RowDefinitions>
-        <TextBlock x:Name="TimeTextBlock" Grid.Row="0" Text="{Binding Path=Time}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
-        <TextBlock x:Name="DateTextBlock" Grid.Row="1" Text="{Binding Path=Date}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
-    </Grid>
+    <Button Background="#00000000" BorderThickness="0" ToolTip="{Binding Path=ToolTip}">
+        <Button.Template>
+            <ControlTemplate TargetType="Button">
+                <Border x:Name="ButtonContent" Background="{TemplateBinding Background}">
+                    <ContentPresenter ContentSource="Content" />
+                </Border>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsMouseOver" Value="True">
+                        <Setter TargetName="ButtonContent" Property="Background" Value="#2AFFFFFF" />
+                    </Trigger>
+                    <Trigger Property="IsPressed" Value="True">
+                        <Setter TargetName="ButtonContent" Property="Background" Value="#2AFFFFFF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+        </Button.Template>
+        <Grid Margin="5,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*" />
+                <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <TextBlock x:Name="TimeTextBlock" Grid.Row="0" Text="{Binding Path=Time}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <TextBlock x:Name="DateTextBlock" Grid.Row="1" Text="{Binding Path=Date}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </Grid>
+    </Button>
 </UserControl>
diff --git a/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml b/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml
index 2f00d863..a19c29e5 100644
--- a/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/NotificationIcon.xaml
@@ -4,24 +4,22 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              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" Margin="5,0">
-    <Grid>
-        <Button x:Name="IconButton" Click="Icon_Click" Background="#00000000" BorderThickness="0">
-            <Button.Template>
-                <ControlTemplate TargetType="Button">
-                    <Border x:Name="ButtonContent" Background="{TemplateBinding Background}" Padding="2,1">
-                        <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center" ContentSource="Content" Height="16" Width="16" RenderOptions.BitmapScalingMode="HighQuality" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ButtonContent" Property="Background" Value="#00000000" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="ButtonContent" Property="Background" Value="#00000000" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Button.Template>
-        </Button>
-    </Grid>
+             mc:Ignorable="d" d:DesignHeight="16" d:DesignWidth="26">
+    <Button x:Name="IconButton" Click="Icon_Click" Background="#00000000" BorderThickness="0">
+        <Button.Template>
+            <ControlTemplate TargetType="Button">
+                <Border x:Name="ButtonContent" Background="{TemplateBinding Background}" Padding="5,0">
+                    <ContentPresenter ContentSource="Content" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="18" RenderOptions.BitmapScalingMode="HighQuality" />
+                </Border>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsMouseOver" Value="True">
+                        <Setter TargetName="ButtonContent" Property="Background" Value="#2AFFFFFF" />
+                    </Trigger>
+                    <Trigger Property="IsPressed" Value="True">
+                        <Setter TargetName="ButtonContent" Property="Background" Value="#10FFFFFF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
 </UserControl>
diff --git a/SafeExamBrowser.UserInterface/Taskbar.xaml b/SafeExamBrowser.UserInterface/Taskbar.xaml
index ded567f0..7643bca3 100644
--- a/SafeExamBrowser.UserInterface/Taskbar.xaml
+++ b/SafeExamBrowser.UserInterface/Taskbar.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
-        Title="Taskbar" Height="40" Width="750" WindowStyle="None" AllowsTransparency="True" Topmost="True" Visibility="Collapsed"
+        Title="Taskbar" Height="40" Width="750" WindowStyle="None" AllowsTransparency="True" Topmost="True" Visibility="Visible"
         ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico">
     <Window.Background>
         <SolidColorBrush Color="Black" Opacity="0.8" />
@@ -25,12 +25,7 @@
                 </ScrollViewer.Resources>
                 <StackPanel x:Name="ApplicationStackPanel" Orientation="Horizontal" />
             </ScrollViewer>
-            <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
-                <ScrollViewer.Resources>
-                    <s:Double x:Key="{x:Static SystemParameters.VerticalScrollBarWidthKey}">5</s:Double>
-                </ScrollViewer.Resources>
-                <WrapPanel x:Name="NotificationWrapPanel" Margin="10,2,5,2" MaxWidth="100" VerticalAlignment="Center" />
-            </ScrollViewer>
+            <StackPanel Grid.Column="1" x:Name="NotificationStackPanel" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Stretch" />
             <local:DateTimeControl Grid.Column="2" />
             <local:QuitButton Grid.Column="3" />
         </Grid>
diff --git a/SafeExamBrowser.UserInterface/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
index 27fed1c3..a03d1661 100644
--- a/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
@@ -38,7 +38,7 @@ namespace SafeExamBrowser.UserInterface
 		{
 			if (button is UIElement)
 			{
-				NotificationWrapPanel.Children.Add(button as UIElement);
+				NotificationStackPanel.Children.Add(button as UIElement);
 			}
 		}