diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs
index 0fc4032c..b2ce756d 100644
--- a/SafeExamBrowser.I18n.Contracts/TextKey.cs
+++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs
@@ -24,13 +24,19 @@ namespace SafeExamBrowser.I18n.Contracts
 		Browser_LoadErrorTitle,
 		Browser_Name,
 		Browser_Tooltip,
+		BrowserWindow_BackwardButton,
 		BrowserWindow_DeveloperConsoleMenuItem,
 		BrowserWindow_Downloading,
 		BrowserWindow_DownloadCancelled,
 		BrowserWindow_DownloadComplete,
+		BrowserWindow_DownloadsButton,
 		BrowserWindow_FindCaseSensitive,
 		BrowserWindow_FindMenuItem,
+		BrowserWindow_ForwardButton,
+		BrowserWindow_HomeButton,
+		BrowserWindow_MenuButton,
 		BrowserWindow_ReloadButton,
+		BrowserWindow_UrlTextBox,
 		BrowserWindow_ZoomMenuItem,
 		Build,
 		ExamSelectionDialog_Cancel,
diff --git a/SafeExamBrowser.I18n/Data/en.xml b/SafeExamBrowser.I18n/Data/en.xml
index 316029d1..00fb5b46 100644
--- a/SafeExamBrowser.I18n/Data/en.xml
+++ b/SafeExamBrowser.I18n/Data/en.xml
@@ -49,7 +49,25 @@
         Search page...
     </Entry>
     <Entry key="BrowserWindow_ReloadButton">
-        Reload button
+        Reload
+    </Entry>
+    <Entry key="BrowserWindow_BackwardButton">
+        Backward
+    </Entry>
+    <Entry key="BrowserWindow_ForwardButton">
+        Forward
+    </Entry>
+    <Entry key="BrowserWindow_DownloadsButton">
+        Download
+    </Entry>
+    <Entry key="BrowserWindow_HomeButton">
+        Home
+    </Entry>
+    <Entry key="BrowserWindow_MenuButton">
+        Menu
+    </Entry>
+    <Entry key="BrowserWindow_UrlTextBox">
+        Enter URL
     </Entry>
     <Entry key="BrowserWindow_ZoomMenuItem">
         Page Zoom
diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml
index 27a637d7..592ac0b4 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/QuitButton.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Controls"
+             x:Name="root"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="40">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -15,6 +16,7 @@
     </UserControl.Resources>
     <Grid>
         <Button x:Name="Button" Click="Button_Click" Background="{StaticResource BackgroundBrush}" HorizontalAlignment="Stretch"
-                Template="{StaticResource TaskbarButton}" VerticalAlignment="Stretch" />
+                Template="{StaticResource TaskbarButton}" VerticalAlignment="Stretch"
+                AutomationProperties.Name="{Binding Path=(AutomationProperties.Name), ElementName=root}"/>
     </Grid>
 </UserControl>
diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
index cd780b66..c73fbbee 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
@@ -578,6 +578,12 @@ if (typeof __SEB_focusElement === 'undefined') {
 			FindMenuText.Text = text.Get(TextKey.BrowserWindow_FindMenuItem);
 			ZoomText.Text = text.Get(TextKey.BrowserWindow_ZoomMenuItem);
 			ReloadButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_ReloadButton));
+			BackwardButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_BackwardButton));
+			ForwardButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_ForwardButton));
+			DownloadsButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_DownloadsButton));
+			HomeButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_HomeButton));
+			MenuButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_MenuButton));
+			UrlTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_UrlTextBox));
 		}
 
 		public void FocusToolbar(bool forward)
diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs
index f60ed3f0..20898424 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs
@@ -125,7 +125,9 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
 		{
 			Dispatcher.Invoke(() =>
 			{
-				QuitButton.ToolTip = text.Get(TextKey.Shell_QuitButton);
+				var txt = text.Get(TextKey.Shell_QuitButton);
+				QuitButton.ToolTip = txt;
+				QuitButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, txt);
 			});
 		}