diff --git a/SafeExamBrowser.Browser/BrowserApplicationInfo.cs b/SafeExamBrowser.Browser/BrowserApplicationInfo.cs
index ea4562e0..de0daa79 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationInfo.cs
+++ b/SafeExamBrowser.Browser/BrowserApplicationInfo.cs
@@ -12,7 +12,7 @@ namespace SafeExamBrowser.Browser
 {
 	public class BrowserApplicationInfo : IApplicationInfo
 	{
-		public string Name => "Chromium Browser";
+		public string Name => "Safe Exam Browser";
 		public string Tooltip => Name;
 		public IIconResource IconResource { get; } = new BrowserIconResource();
 	}
diff --git a/SafeExamBrowser.Browser/BrowserIconResource.cs b/SafeExamBrowser.Browser/BrowserIconResource.cs
index 5a12659b..af496011 100644
--- a/SafeExamBrowser.Browser/BrowserIconResource.cs
+++ b/SafeExamBrowser.Browser/BrowserIconResource.cs
@@ -13,8 +13,8 @@ namespace SafeExamBrowser.Browser
 {
 	public class BrowserIconResource : IIconResource
 	{
-		public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.Browser;component/Images/ChromiumLogo.xaml");
-		public bool IsBitmapResource => false;
-		public bool IsXamlResource => true;
+		public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/SafeExamBrowser.ico");
+		public bool IsBitmapResource => true;
+		public bool IsXamlResource => false;
 	}
 }
diff --git a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml b/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml
index 1754f754..f1073082 100644
--- a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Classic"
         mc:Ignorable="d"
-        Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="500" WindowState="Maximized" Icon=".\Images\Chromium.ico">
+        Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="500" WindowState="Maximized" Icon=".\Images\SafeExamBrowser.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
diff --git a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs
index fa1b7114..d13b9200 100644
--- a/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs
@@ -6,10 +6,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using System;
 using System.Windows;
 using System.Windows.Input;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.UserInterface;
+using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic
 {
@@ -86,6 +88,7 @@ namespace SafeExamBrowser.UserInterface.Classic
 			ForwardButton.Click += (o, args) => ForwardNavigationRequested?.Invoke();
 
 			ApplySettings();
+			LoadIcons();
 		}
 
 		private void BrowserWindow_KeyUp(object sender, KeyEventArgs e)
@@ -125,5 +128,19 @@ namespace SafeExamBrowser.UserInterface.Classic
 			ForwardButton.IsEnabled = settings.AllowForwardNavigation;
 			ForwardButton.Visibility = settings.AllowForwardNavigation ? Visibility.Visible : Visibility.Collapsed;
 		}
+
+		private void LoadIcons()
+		{
+			var backUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/NavigateBack.xaml");
+			var forwardUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/NavigateForward.xaml");
+			var reloadUri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/Reload.xaml");
+			var back = new XamlIconResource(backUri);
+			var forward = new XamlIconResource(forwardUri);
+			var reload = new XamlIconResource(reloadUri);
+
+			ReloadButton.Content = IconResourceLoader.Load(reload);
+			BackButton.Content = IconResourceLoader.Load(back);
+			ForwardButton.Content = IconResourceLoader.Load(forward);
+		}
 	}
 }
diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml b/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml
index aa0d262e..a61bff00 100644
--- a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml
+++ b/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml
@@ -14,6 +14,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
-        <Button Click="Button_Click" Background="{StaticResource BackgroundBrush}" HorizontalAlignment="Stretch" Template="{StaticResource TaskbarButton}" VerticalAlignment="Stretch">Quit</Button>
+        <Button x:Name="Button" Click="Button_Click" Background="{StaticResource BackgroundBrush}" HorizontalAlignment="Stretch"
+                Template="{StaticResource TaskbarButton}" VerticalAlignment="Stretch" />
     </Grid>
 </UserControl>
diff --git a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs b/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs
index 52ee9c66..5f91f06d 100644
--- a/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs
@@ -6,8 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using System;
 using System.Windows;
 using System.Windows.Controls;
+using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic.Controls
 {
@@ -16,11 +18,20 @@ namespace SafeExamBrowser.UserInterface.Classic.Controls
 		public QuitButton()
 		{
 			InitializeComponent();
+			LoadIcon();
 		}
 
 		private void Button_Click(object sender, RoutedEventArgs e)
 		{
 			Application.Current.MainWindow.Close();
 		}
+
+		private void LoadIcon()
+		{
+			var uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/ShutDown.xaml");
+			var resource = new XamlIconResource(uri);
+
+			Button.Content = IconResourceLoader.Load(resource);
+		}
 	}
 }
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Battery.xaml b/SafeExamBrowser.UserInterface.Classic/Images/Battery.xaml
new file mode 100644
index 00000000..998b72d4
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/Battery.xaml
@@ -0,0 +1,11 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 112.000,300.000 L 951.000,300.000 C 970.330,300.000 986.000,315.670 986.000,335.000 L 986.000,689.000 C 986.000,708.330 970.330,724.000 951.000,724.000 L 112.000,724.000 C 92.670,724.000 77.000,708.330 77.000,689.000 L 77.000,335.000 C 77.000,315.670 92.670,300.000 112.000,300.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 25.000,462.500 L 50.000,462.500 C 52.760,462.500 55.000,464.740 55.000,467.500 L 55.000,557.500 C 55.000,560.260 52.760,562.500 50.000,562.500 L 25.000,562.500 C 22.240,562.500 20.000,560.260 20.000,557.500 L 20.000,467.500 C 20.000,464.740 22.240,462.500 25.000,462.500 Z"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Keyboard.xaml b/SafeExamBrowser.UserInterface.Classic/Images/Keyboard.xaml
new file mode 100644
index 00000000..f90b0365
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/Keyboard.xaml
@@ -0,0 +1,34 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 134.000,339.000 L 889.000,339.000 C 908.330,339.000 924.000,354.670 924.000,374.000 L 924.000,649.000 C 924.000,668.330 908.330,684.000 889.000,684.000 L 134.000,684.000 C 114.670,684.000 99.000,668.330 99.000,649.000 L 99.000,374.000 C 99.000,354.670 114.670,339.000 134.000,339.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 152.000,582.000 L 192.000,582.000 C 194.760,582.000 197.000,584.240 197.000,587.000 L 197.000,627.000 C 197.000,629.760 194.760,632.000 192.000,632.000 L 152.000,632.000 C 149.240,632.000 147.000,629.760 147.000,627.000 L 147.000,587.000 C 147.000,584.240 149.240,582.000 152.000,582.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 747.000,582.000 L 787.000,582.000 C 789.760,582.000 792.000,584.240 792.000,587.000 L 792.000,627.000 C 792.000,629.760 789.760,632.000 787.000,632.000 L 747.000,632.000 C 744.240,632.000 742.000,629.760 742.000,627.000 L 742.000,587.000 C 742.000,584.240 744.240,582.000 747.000,582.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 152.000,487.000 L 192.000,487.000 C 194.760,487.000 197.000,489.240 197.000,492.000 L 197.000,532.000 C 197.000,534.760 194.760,537.000 192.000,537.000 L 152.000,537.000 C 149.240,537.000 147.000,534.760 147.000,532.000 L 147.000,492.000 C 147.000,489.240 149.240,487.000 152.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 322.000,487.000 L 362.000,487.000 C 364.760,487.000 367.000,489.240 367.000,492.000 L 367.000,532.000 C 367.000,534.760 364.760,537.000 362.000,537.000 L 322.000,537.000 C 319.240,537.000 317.000,534.760 317.000,532.000 L 317.000,492.000 C 317.000,489.240 319.240,487.000 322.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 492.000,487.000 L 532.000,487.000 C 534.760,487.000 537.000,489.240 537.000,492.000 L 537.000,532.000 C 537.000,534.760 534.760,537.000 532.000,537.000 L 492.000,537.000 C 489.240,537.000 487.000,534.760 487.000,532.000 L 487.000,492.000 C 487.000,489.240 489.240,487.000 492.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 747.000,487.000 L 787.000,487.000 C 789.760,487.000 792.000,489.240 792.000,492.000 L 792.000,532.000 C 792.000,534.760 789.760,537.000 787.000,537.000 L 747.000,537.000 C 744.240,537.000 742.000,534.760 742.000,532.000 L 742.000,492.000 C 742.000,489.240 744.240,487.000 747.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 152.000,392.000 L 192.000,392.000 C 194.760,392.000 197.000,394.240 197.000,397.000 L 197.000,437.000 C 197.000,439.760 194.760,442.000 192.000,442.000 L 152.000,442.000 C 149.240,442.000 147.000,439.760 147.000,437.000 L 147.000,397.000 C 147.000,394.240 149.240,392.000 152.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 322.000,392.000 L 362.000,392.000 C 364.760,392.000 367.000,394.240 367.000,397.000 L 367.000,437.000 C 367.000,439.760 364.760,442.000 362.000,442.000 L 322.000,442.000 C 319.240,442.000 317.000,439.760 317.000,437.000 L 317.000,397.000 C 317.000,394.240 319.240,392.000 322.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 492.000,392.000 L 532.000,392.000 C 534.760,392.000 537.000,394.240 537.000,397.000 L 537.000,437.000 C 537.000,439.760 534.760,442.000 532.000,442.000 L 492.000,442.000 C 489.240,442.000 487.000,439.760 487.000,437.000 L 487.000,397.000 C 487.000,394.240 489.240,392.000 492.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 747.000,392.000 L 787.000,392.000 C 789.760,392.000 792.000,394.240 792.000,397.000 L 792.000,437.000 C 792.000,439.760 789.760,442.000 787.000,442.000 L 747.000,442.000 C 744.240,442.000 742.000,439.760 742.000,437.000 L 742.000,397.000 C 742.000,394.240 744.240,392.000 747.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 237.000,582.000 L 277.000,582.000 C 279.760,582.000 282.000,584.240 282.000,587.000 L 282.000,627.000 C 282.000,629.760 279.760,632.000 277.000,632.000 L 237.000,632.000 C 234.240,632.000 232.000,629.760 232.000,627.000 L 232.000,587.000 C 232.000,584.240 234.240,582.000 237.000,582.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 322.000,582.000 L 702.000,582.000 C 704.760,582.000 707.000,584.240 707.000,587.000 L 707.000,627.000 C 707.000,629.760 704.760,632.000 702.000,632.000 L 322.000,632.000 C 319.240,632.000 317.000,629.760 317.000,627.000 L 317.000,587.000 C 317.000,584.240 319.240,582.000 322.000,582.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 832.000,582.000 L 872.000,582.000 C 874.760,582.000 877.000,584.240 877.000,587.000 L 877.000,627.000 C 877.000,629.760 874.760,632.000 872.000,632.000 L 832.000,632.000 C 829.240,632.000 827.000,629.760 827.000,627.000 L 827.000,587.000 C 827.000,584.240 829.240,582.000 832.000,582.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 237.000,487.000 L 277.000,487.000 C 279.760,487.000 282.000,489.240 282.000,492.000 L 282.000,532.000 C 282.000,534.760 279.760,537.000 277.000,537.000 L 237.000,537.000 C 234.240,537.000 232.000,534.760 232.000,532.000 L 232.000,492.000 C 232.000,489.240 234.240,487.000 237.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 407.000,487.000 L 447.000,487.000 C 449.760,487.000 452.000,489.240 452.000,492.000 L 452.000,532.000 C 452.000,534.760 449.760,537.000 447.000,537.000 L 407.000,537.000 C 404.240,537.000 402.000,534.760 402.000,532.000 L 402.000,492.000 C 402.000,489.240 404.240,487.000 407.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 577.000,487.000 L 617.000,487.000 C 619.760,487.000 622.000,489.240 622.000,492.000 L 622.000,532.000 C 622.000,534.760 619.760,537.000 617.000,537.000 L 577.000,537.000 C 574.240,537.000 572.000,534.760 572.000,532.000 L 572.000,492.000 C 572.000,489.240 574.240,487.000 577.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 662.000,487.000 L 702.000,487.000 C 704.760,487.000 707.000,489.240 707.000,492.000 L 707.000,532.000 C 707.000,534.760 704.760,537.000 702.000,537.000 L 662.000,537.000 C 659.240,537.000 657.000,534.760 657.000,532.000 L 657.000,492.000 C 657.000,489.240 659.240,487.000 662.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 832.000,487.000 L 872.000,487.000 C 874.760,487.000 877.000,489.240 877.000,492.000 L 877.000,532.000 C 877.000,534.760 874.760,537.000 872.000,537.000 L 832.000,537.000 C 829.240,537.000 827.000,534.760 827.000,532.000 L 827.000,492.000 C 827.000,489.240 829.240,487.000 832.000,487.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 237.000,392.000 L 277.000,392.000 C 279.760,392.000 282.000,394.240 282.000,397.000 L 282.000,437.000 C 282.000,439.760 279.760,442.000 277.000,442.000 L 237.000,442.000 C 234.240,442.000 232.000,439.760 232.000,437.000 L 232.000,397.000 C 232.000,394.240 234.240,392.000 237.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 407.000,392.000 L 447.000,392.000 C 449.760,392.000 452.000,394.240 452.000,397.000 L 452.000,437.000 C 452.000,439.760 449.760,442.000 447.000,442.000 L 407.000,442.000 C 404.240,442.000 402.000,439.760 402.000,437.000 L 402.000,397.000 C 402.000,394.240 404.240,392.000 407.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 577.000,392.000 L 617.000,392.000 C 619.760,392.000 622.000,394.240 622.000,397.000 L 622.000,437.000 C 622.000,439.760 619.760,442.000 617.000,442.000 L 577.000,442.000 C 574.240,442.000 572.000,439.760 572.000,437.000 L 572.000,397.000 C 572.000,394.240 574.240,392.000 577.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 662.000,392.000 L 702.000,392.000 C 704.760,392.000 707.000,394.240 707.000,397.000 L 707.000,437.000 C 707.000,439.760 704.760,442.000 702.000,442.000 L 662.000,442.000 C 659.240,442.000 657.000,439.760 657.000,437.000 L 657.000,397.000 C 657.000,394.240 659.240,392.000 662.000,392.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 832.000,392.000 L 872.000,392.000 C 874.760,392.000 877.000,394.240 877.000,397.000 L 877.000,437.000 C 877.000,439.760 874.760,442.000 872.000,442.000 L 832.000,442.000 C 829.240,442.000 827.000,439.760 827.000,437.000 L 827.000,397.000 C 827.000,394.240 829.240,392.000 832.000,392.000 Z"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 668.000,201.000 L 512.000,90.000 L 668.000,201.000 Z M 356.000,201.000 L 512.000,90.000 L 356.000,201.000 Z"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/NavigateBack.xaml b/SafeExamBrowser.UserInterface.Classic/Images/NavigateBack.xaml
new file mode 100644
index 00000000..571e4427
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/NavigateBack.xaml
@@ -0,0 +1,12 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 753.838,835.919 L 268.162,510.424 L 753.838,188.341"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 766.763,835.919"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 766.763,188.341"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/NavigateForward.xaml b/SafeExamBrowser.UserInterface.Classic/Images/NavigateForward.xaml
new file mode 100644
index 00000000..957c1f83
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/NavigateForward.xaml
@@ -0,0 +1,12 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 268.162,835.919 L 753.838,510.424 L 268.162,188.341"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 766.763,835.919"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 766.763,188.341"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/Reload.xaml b/SafeExamBrowser.UserInterface.Classic/Images/Reload.xaml
new file mode 100644
index 00000000..f797b87c
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/Reload.xaml
@@ -0,0 +1,10 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+        <Canvas>
+            <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+            <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 862.000,557.000 C 862.000,750.300 705.300,907.000 512.000,907.000 C 318.700,907.000 162.000,750.300 162.000,557.000 C 162.000,363.700 318.700,207.000 512.000,207.000"/>
+        </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/ShutDown.xaml b/SafeExamBrowser.UserInterface.Classic/Images/ShutDown.xaml
new file mode 100644
index 00000000..a73e0262
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/ShutDown.xaml
@@ -0,0 +1,12 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path StrokeThickness="79.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 512.000,902.000 C 296.610,902.000 122.000,727.280 122.000,511.740 C 122.000,388.110 179.450,277.910 269.090,206.400"/>
+          <Path StrokeThickness="79.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 512.000,902.000 C 727.390,902.000 902.000,727.280 902.000,511.740 C 902.000,388.110 844.550,277.910 754.910,206.400"/>
+          <Path StrokeThickness="79.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 512.560,112.000 L 512.560,494.460"/>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/SkipBack.xaml b/SafeExamBrowser.UserInterface.Classic/Images/SkipBack.xaml
new file mode 100644
index 00000000..f7ff20bf
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/SkipBack.xaml
@@ -0,0 +1,11 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 301.086,510.424 L 786.763,188.341 L 786.763,835.919 L 301.086,510.424 Z"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data="F1 M 235.016,188.341 L 235.016,835.919"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_0.xaml b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_0.xaml
new file mode 100644
index 00000000..ca328bff
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_0.xaml
@@ -0,0 +1,16 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ffaaaaaa" Data=" M 467.000,811.000 C 467.000,786.150 487.150,766.000 512.000,766.000 C 536.850,766.000 557.000,786.150 557.000,811.000 C 557.000,835.850 536.850,856.000 512.000,856.000 C 487.150,856.000 467.000,835.850 467.000,811.000 Z"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.220 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.220 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_100.xaml b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_100.xaml
new file mode 100644
index 00000000..74fd45d8
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_100.xaml
@@ -0,0 +1,16 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 467.000,811.000 C 467.000,786.150 487.150,766.000 512.000,766.000 C 536.850,766.000 557.000,786.150 557.000,811.000 C 557.000,835.850 536.850,856.000 512.000,856.000 C 487.150,856.000 467.000,835.850 467.000,811.000 Z"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.221 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.221 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_33.xaml b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_33.xaml
new file mode 100644
index 00000000..da1e2a15
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_33.xaml
@@ -0,0 +1,16 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+            <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+            <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 467.000,811.000 C 467.000,786.150 487.150,766.000 512.000,766.000 C 536.850,766.000 557.000,786.150 557.000,811.000 C 557.000,835.850 536.850,856.000 512.000,856.000 C 487.150,856.000 467.000,835.850 467.000,811.000 Z"/>
+            <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+            <Path StrokeThickness="70.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+            <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.220 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+            <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.220 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+            <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+            <Path StrokeThickness="70.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/WiFi_66.xaml b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_66.xaml
new file mode 100644
index 00000000..f6b214bc
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/WiFi_66.xaml
@@ -0,0 +1,16 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="1024.000" Height="1024.000">
+      <Canvas>
+          <Path Data=" M 0.000,0.000 L 1024.000,0.000 L 1024.000,1024.000 L 0.000,1024.000 L 0.000,0.000 Z"/>
+          <Path StrokeThickness="1.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Fill="#ff000000" Data=" M 467.000,811.000 C 467.000,786.150 487.150,766.000 512.000,766.000 C 536.850,766.000 557.000,786.150 557.000,811.000 C 557.000,835.850 536.850,856.000 512.000,856.000 C 487.150,856.000 467.000,835.850 467.000,811.000 Z"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ffaaaaaa" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 82.530,352.000 C 191.500,240.330 343.650,171.000 512.000,171.000 C 680.350,171.000 832.500,240.330 941.470,352.000"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.220 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 346.620,660.000 C 384.600,610.220 444.550,578.100 512.000,578.100 C 579.900,578.100 640.200,610.650 678.140,661.000"/>
+          <Path StrokeThickness="35.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+          <Path StrokeThickness="70.0" Stroke="#ff000000" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round" Data=" M 213.050,505.000 C 288.650,426.810 394.650,378.200 512.000,378.200 C 629.350,378.200 735.350,426.810 810.950,505.000"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageIn.xaml b/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageIn.xaml
new file mode 100644
index 00000000..e7f4acab
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageIn.xaml
@@ -0,0 +1,12 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="40.000" Height="40.000">
+      <Canvas>
+        <Path Data="F1 M 32.000,36.000 L 9.000,36.000 L 9.000,5.000 L 32.000,5.000 L 32.000,36.000 Z"/>
+      </Canvas>
+      <Canvas>
+          <Path StrokeThickness="1.9" Stroke="#ff666666" StrokeLineJoin="Round" Data="F1 M 31.258,13.484 L 23.773,6.000 M 31.258,35.000 L 9.742,35.000 L 9.742,6.001 L 23.773,6.001 L 23.773,13.485 L 31.258,13.484 L 31.258,35.000 Z"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageOut.xaml b/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageOut.xaml
new file mode 100644
index 00000000..74a53e6c
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Images/ZoomPageOut.xaml
@@ -0,0 +1,12 @@
+<Viewbox
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Canvas Width="40.000" Height="40.000">
+      <Canvas>
+          <Path Data="F1 M 32.000,36.000 L 9.000,36.000 L 9.000,5.000 L 32.000,5.000 L 32.000,36.000 Z"/>
+      </Canvas>
+      <Canvas>
+          <Path StrokeThickness="2.0" Stroke="#ff666666" StrokeLineJoin="Round" Data="F1 M 27.000,14.870 L 22.129,10.000 M 27.000,28.869 L 13.000,28.869 L 13.000,10.000 L 22.129,10.000 L 22.129,14.870 L 27.000,14.870 L 27.000,28.869 Z"/>
+      </Canvas>
+    </Canvas>
+</Viewbox>
\ No newline at end of file
diff --git a/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj b/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj
index 31e62bc7..d89dfd61 100644
--- a/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj
+++ b/SafeExamBrowser.UserInterface.Classic/SafeExamBrowser.UserInterface.Classic.csproj
@@ -93,6 +93,7 @@
     <Compile Include="UserInterfaceFactory.cs" />
     <Compile Include="Utilities\IconResourceLoader.cs" />
     <Compile Include="Utilities\VisualExtensions.cs" />
+    <Compile Include="Utilities\XamlIconResource.cs" />
     <Compile Include="ViewModels\DateTimeViewModel.cs" />
     <Compile Include="ViewModels\LogViewModel.cs" />
     <Compile Include="ViewModels\SplashScreenViewModel.cs" />
@@ -124,6 +125,58 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Resource Include="Images\Battery.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\Keyboard.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\NavigateBack.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\NavigateForward.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\Reload.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\ShutDown.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\SkipBack.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\WiFi_0.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\WiFi_100.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\WiFi_33.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\WiFi_66.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\ZoomPageIn.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Images\ZoomPageOut.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
     <Page Include="LogWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/SafeExamBrowser.UserInterface.Classic/Templates/Buttons.xaml b/SafeExamBrowser.UserInterface.Classic/Templates/Buttons.xaml
index 5a5280c6..223954fb 100644
--- a/SafeExamBrowser.UserInterface.Classic/Templates/Buttons.xaml
+++ b/SafeExamBrowser.UserInterface.Classic/Templates/Buttons.xaml
@@ -5,7 +5,8 @@
         <ResourceDictionary Source="../Templates/Colors.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <ControlTemplate x:Key="TaskbarButton" TargetType="Button">
-        <Border x:Name="ButtonContent" Background="{TemplateBinding Background}" BorderThickness="1" Padding="{TemplateBinding Padding}">
+        <Border x:Name="ButtonContent" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding Background}"
+                BorderThickness="1" Padding="{TemplateBinding Padding}">
             <ContentPresenter ContentSource="Content" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                               RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="{TemplateBinding VerticalAlignment}" />
         </Border>
diff --git a/SafeExamBrowser.UserInterface.Classic/Utilities/XamlIconResource.cs b/SafeExamBrowser.UserInterface.Classic/Utilities/XamlIconResource.cs
new file mode 100644
index 00000000..18d2b6ff
--- /dev/null
+++ b/SafeExamBrowser.UserInterface.Classic/Utilities/XamlIconResource.cs
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2017 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+using System;
+using SafeExamBrowser.Contracts.Configuration;
+
+namespace SafeExamBrowser.UserInterface.Classic.Utilities
+{
+	internal class XamlIconResource : IIconResource
+	{
+		public Uri Uri { get; private set; }
+		public bool IsBitmapResource => false;
+		public bool IsXamlResource => true;
+
+		public XamlIconResource(Uri uri)
+		{
+			Uri = uri;
+		}
+	}
+}