diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml
index 3935c805..fe81bb0a 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/Controls/WirelessNetworkControl.xaml
@@ -26,13 +26,12 @@
                 </ScrollViewer>
             </Border>
         </Popup>
-        <Button x:Name="Button" Background="Transparent" HorizontalContentAlignment="Stretch" Padding="5" Template="{StaticResource TaskbarButton}"
-                ToolTipService.ShowOnDisabled="True" VerticalContentAlignment="Stretch" Width="40">
-            <Grid>
+        <Button x:Name="Button" Background="Transparent" Padding="5" Template="{StaticResource TaskbarButton}" ToolTipService.ShowOnDisabled="True" Width="40">
+            <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                 <Viewbox x:Name="SignalStrengthIcon" Stretch="Uniform" Width="Auto" />
                 <fa:ImageAwesome x:Name="NoAdapterIcon" Foreground="Red" Icon="Ban" Margin="1" Opacity="0.2" Visibility="Collapsed" />
                 <fa:ImageAwesome x:Name="LoadingIcon" Foreground="Gray" Icon="Cog" Margin="5" Spin="True" SpinDuration="2" Visibility="Collapsed" />
-                <Image x:Name="NetworkStatusIcon" Height="10" HorizontalAlignment="Right" Margin="0,2" Panel.ZIndex="10" VerticalAlignment="Bottom" />
+                <Image x:Name="NetworkStatusIcon" Height="8" HorizontalAlignment="Right" Panel.ZIndex="10" VerticalAlignment="Bottom" />
             </Grid>
         </Button>
     </Grid>
diff --git a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml
index f028280b..787ae7f1 100644
--- a/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/RuntimeWindow.xaml
@@ -7,6 +7,13 @@
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d" Background="White" Foreground="Black" Height="500" Width="850" WindowStyle="None" WindowStartupLocation="CenterScreen"
         Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
     <Grid>
         <Border x:Name="AnimatedBorder" Panel.ZIndex="10" BorderBrush="DodgerBlue" BorderThickness="5" Visibility="{Binding AnimatedBorderVisibility}">
             <Border.Effect>
@@ -47,11 +54,7 @@
                 <TextBlock x:Name="StatusTextBlock" Grid.Row="1" FontSize="12" FontWeight="Bold" HorizontalAlignment="Center"
                            Text="{Binding Status}" VerticalAlignment="Center" />
                 <Border Grid.Row="2" BorderBrush="DodgerBlue" BorderThickness="0,0.5,0,0">
-                    <ScrollViewer x:Name="LogScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="0,10,0,0">
-                        <ScrollViewer.Resources>
-                            <s:Double x:Key="{x:Static SystemParameters.HorizontalScrollBarHeightKey}">5</s:Double>
-                            <s:Double x:Key="{x:Static SystemParameters.VerticalScrollBarWidthKey}">5</s:Double>
-                        </ScrollViewer.Resources>
+                    <ScrollViewer x:Name="LogScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="0,10,0,0" Template="{StaticResource SmallBarScrollViewer}">
                         <TextBlock x:Name="LogTextBlock" Background="Transparent" FontFamily="Consolas" FontSize="10" />
                     </ScrollViewer>
                 </Border>
diff --git a/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml b/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml
index c1442c2e..cc5553db 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/Taskbar.xaml
@@ -23,7 +23,7 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="40" />
         </Grid.ColumnDefinitions>
-        <ScrollViewer Grid.Column="0" x:Name="ApplicationScrollViewer" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto"
+        <ScrollViewer Grid.Column="0" x:Name="ApplicationScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
                       Template="{StaticResource SmallBarScrollViewer}">
             <StackPanel x:Name="ApplicationStackPanel" Orientation="Horizontal" />
         </ScrollViewer>
diff --git a/SafeExamBrowser.UserInterface.Desktop/Templates/ScrollViewers.xaml b/SafeExamBrowser.UserInterface.Desktop/Templates/ScrollViewers.xaml
index b5ed1720..1f7d7402 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Templates/ScrollViewers.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/Templates/ScrollViewers.xaml
@@ -2,37 +2,57 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Templates">
     <ControlTemplate x:Key="Thumb" TargetType="{x:Type Thumb}">
-        <Border Background="DarkGray" Height="Auto" Width="Auto" />
+        <Rectangle x:Name="Rectangle" Fill="DarkGray" Height="Auto" Width="Auto" />
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsDragging" Value="True">
+                <Setter TargetName="Rectangle" Property="Fill" Value="Black" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="RepeatButton" TargetType="RepeatButton">
+        <Rectangle Fill="DarkGray" Height="Auto" Width="Auto" />
     </ControlTemplate>
     <ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
         <Track Name="PART_Track" Height="Auto" IsDirectionReversed="True" Width="10">
+            <Track.DecreaseRepeatButton>
+                <RepeatButton Margin="4.5,0" Template="{StaticResource RepeatButton}" />
+            </Track.DecreaseRepeatButton>
             <Track.Thumb>
-                <Thumb Template="{StaticResource Thumb}" Focusable="False" Margin="2.5" OverridesDefaultStyle="True" SnapsToDevicePixels="True" />
+                <Thumb Cursor="ScrollNS" Focusable="False" Margin="2.5,0" OverridesDefaultStyle="True" SnapsToDevicePixels="True" Template="{StaticResource Thumb}" />
             </Track.Thumb>
+            <Track.IncreaseRepeatButton>
+                <RepeatButton Margin="4.5,0" Template="{StaticResource RepeatButton}" />
+            </Track.IncreaseRepeatButton>
         </Track>
     </ControlTemplate>
     <ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
         <Track Name="PART_Track" Height="10" IsDirectionReversed="False" Width="Auto">
+            <Track.DecreaseRepeatButton>
+                <RepeatButton Margin="0,4.5" Template="{StaticResource RepeatButton}" />
+            </Track.DecreaseRepeatButton>
             <Track.Thumb>
-                <Thumb Template="{StaticResource Thumb}" Focusable="False" Margin="2.5" OverridesDefaultStyle="True" SnapsToDevicePixels="True" />
+                <Thumb Cursor="ScrollWE" Focusable="False" Margin="0,2.5" OverridesDefaultStyle="True" SnapsToDevicePixels="True" Template="{StaticResource Thumb}" />
             </Track.Thumb>
+            <Track.IncreaseRepeatButton>
+                <RepeatButton Margin="0,4.5" Template="{StaticResource RepeatButton}" />
+            </Track.IncreaseRepeatButton>
         </Track>
     </ControlTemplate>
     <ControlTemplate x:Key="SmallBarScrollViewer" TargetType="{x:Type ScrollViewer}">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <ScrollContentPresenter Grid.Column="0" Grid.Row="0" />
-            <ScrollBar Name="PART_VerticalScrollBar" Grid.Column="1" Grid.Row="0" OverridesDefaultStyle="True" Value="{TemplateBinding VerticalOffset}"
-                       Maximum="{TemplateBinding ScrollableHeight}" Template="{StaticResource VerticalScrollBar}"
+            <ScrollBar Name="PART_VerticalScrollBar" Grid.Column="1" Grid.Row="0" Background="LightGray" OverridesDefaultStyle="True"
+                       Value="{TemplateBinding VerticalOffset}" Maximum="{TemplateBinding ScrollableHeight}" Template="{StaticResource VerticalScrollBar}"
                        ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" />
-            <ScrollBar Name="PART_HorizontalScrollBar" Grid.Column="0" Grid.Row="1" OverridesDefaultStyle="True" Orientation="Horizontal"
+            <ScrollBar Name="PART_HorizontalScrollBar" Grid.Column="0" Grid.Row="1" Background="LightGray" OverridesDefaultStyle="True" Orientation="Horizontal"
                        Value="{TemplateBinding HorizontalOffset}" Maximum="{TemplateBinding ScrollableWidth}" Template="{StaticResource HorizontalScrollBar}"
                        ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
         </Grid>