diff --git a/src/modules/imageresizer/ui/Properties/Resources.Designer.cs b/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
index 559cadac02..2cc6f0bcd2 100644
--- a/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
+++ b/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
@@ -105,6 +105,15 @@ namespace ImageResizer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Fallback encoder.
+        /// </summary>
+        public static string Advanced_FallbackEncoder_Name {
+            get {
+                return ResourceManager.GetString("Advanced_FallbackEncoder_Name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File.
         /// </summary>
@@ -126,9 +135,9 @@ namespace ImageResizer.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Filename.
         /// </summary>
-        public static string Advanced_FileName_Tooltip {
+        public static string Advanced_FileName_Name {
             get {
-                return ResourceManager.GetString("Advanced_FileName_Tooltip", resourceCulture);
+                return ResourceManager.GetString("Advanced_FileName_Name", resourceCulture);
             }
         }
         
@@ -204,6 +213,15 @@ namespace ImageResizer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to JPEG quality level.
+        /// </summary>
+        public static string Advanced_JpegQualityLevel_Name {
+            get {
+                return ResourceManager.GetString("Advanced_JpegQualityLevel_Name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to _Use original date modified.
         /// </summary>
@@ -222,6 +240,15 @@ namespace ImageResizer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to PNG interlacing.
+        /// </summary>
+        public static string Advanced_PngInterlaceOption_Name {
+            get {
+                return ResourceManager.GetString("Advanced_PngInterlaceOption_Name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sizes.
         /// </summary>
@@ -240,6 +267,15 @@ namespace ImageResizer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to TIFF compression.
+        /// </summary>
+        public static string Advanced_TiffCompressOption_Name {
+            get {
+                return ResourceManager.GetString("Advanced_TiffCompressOption_Name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Settings.
         /// </summary>
diff --git a/src/modules/imageresizer/ui/Properties/Resources.resx b/src/modules/imageresizer/ui/Properties/Resources.resx
index 88336e6f53..04740ee39c 100644
--- a/src/modules/imageresizer/ui/Properties/Resources.resx
+++ b/src/modules/imageresizer/ui/Properties/Resources.resx
@@ -132,6 +132,9 @@
   <data name="Advanced_FallbackEncoder" xml:space="preserve">
     <value>_Fallback encoder:</value>
   </data>
+  <data name="Advanced_FallbackEncoder_Name" xml:space="preserve">
+    <value>Fallback encoder</value>
+  </data>
   <data name="Advanced_File" xml:space="preserve">
     <value>File</value>
   </data>
@@ -159,24 +162,33 @@
   <data name="Advanced_FileNameTokens" xml:space="preserve">
     <value>The following parameters can be used.</value>
   </data>
-  <data name="Advanced_FileName_Tooltip" xml:space="preserve">
+  <data name="Advanced_FileName_Name" xml:space="preserve">
     <value>Filename</value>
   </data>
   <data name="Advanced_JpegQualityLevel" xml:space="preserve">
     <value>_JPEG quality level:</value>
   </data>
+  <data name="Advanced_JpegQualityLevel_Name" xml:space="preserve">
+    <value>JPEG quality level</value>
+  </data>
   <data name="Advanced_KeepDateModified" xml:space="preserve">
     <value>_Use original date modified</value>
   </data>
   <data name="Advanced_PngInterlaceOption" xml:space="preserve">
     <value>_PNG interlacing:</value>
   </data>
+  <data name="Advanced_PngInterlaceOption_Name" xml:space="preserve">
+    <value>PNG interlacing</value>
+  </data>
   <data name="Advanced_Sizes" xml:space="preserve">
     <value>Sizes</value>
   </data>
   <data name="Advanced_TiffCompressOption" xml:space="preserve">
     <value>_TIFF compression:</value>
   </data>
+  <data name="Advanced_TiffCompressOption_Name" xml:space="preserve">
+    <value>TIFF compression</value>
+  </data>
   <data name="Advanced_Title" xml:space="preserve">
     <value>Settings</value>
   </data>
diff --git a/src/modules/imageresizer/ui/Themes/HighContrast1.xaml b/src/modules/imageresizer/ui/Themes/HighContrast1.xaml
index 22a82b5d49..3370cf45c0 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrast1.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrast1.xaml
@@ -19,5 +19,5 @@
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF00ff00" />
-    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="#FFffff00"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrast2.xaml b/src/modules/imageresizer/ui/Themes/HighContrast2.xaml
index f57f74d600..6bd9baf31c 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrast2.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrast2.xaml
@@ -20,5 +20,5 @@
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF00ff00" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FFc0c0c0" />
-    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="#FF00ff00"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml b/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
index e4369cbf5f..38854e4f65 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
@@ -19,5 +19,5 @@
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffffff" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF1aebff" />
-    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="White"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml b/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
index 177ed95b59..16a61918bd 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
@@ -19,5 +19,5 @@
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" />
-    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Black"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml b/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
index 4fdccc663d..e6c9de0c99 100644
--- a/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
+++ b/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
@@ -61,6 +61,7 @@
                                     <TextBox Width="96"
                                              MaxWidth="96"
                                              TextWrapping="Wrap"
+                                             AutomationProperties.Name="{Binding Name}"
                                              Text="{Binding Name}"/>
                                     <ComboBox Grid.Column="1"
                                               Margin="8,0,0,0"
@@ -128,6 +129,7 @@
                                             Grid.Column="6"
                                             Margin="8,0,0,0"
                                             VerticalAlignment="Center"
+                                            AutomationProperties.Name="{x:Static p:Resources.Advanced_DeleteSize}"
                                             ToolTip="{x:Static p:Resources.Advanced_DeleteSize}" 
                                             Command="{Binding DataContext.RemoveSizeCommand,ElementName=_this}"
                                             CommandParameter="{Binding}" />
@@ -158,6 +160,7 @@
                     <ComboBox Grid.Column="1"
                               HorizontalAlignment="Left"
                               ItemsSource="{Binding Encoders}"
+                              AutomationProperties.Name="{x:Static p:Resources.Advanced_FallbackEncoder_Name}"
                               Name="_fallbackEncoderComboBox"
                               SelectedItem="{Binding Settings.FallbackEncoder}">
                         <ComboBox.ItemTemplate>
@@ -175,6 +178,7 @@
                              Grid.Column="1"
                              Width="56"
                              TextWrapping="Wrap"
+                             AutomationProperties.Name="{x:Static p:Resources.Advanced_JpegQualityLevel_Name}"
                              Margin="0,8,0,0"
                              HorizontalAlignment="Left"
                              Name="_jpegQualityLevelTextBox"
@@ -188,6 +192,7 @@
                               Grid.Column="1"
                               Margin="0,8,0,0"
                               HorizontalAlignment="Left"
+                              AutomationProperties.Name="{x:Static p:Resources.Advanced_PngInterlaceOption_Name}"
                               ItemsSource="{Binding Source={StaticResource PngInterlaceOptionValues}}"
                               Name="_pngInterlaceComboBox"
                               SelectedItem="{Binding Settings.PngInterlaceOption}">
@@ -206,6 +211,7 @@
                               Grid.Column="1"
                               Margin="0,8,0,0"
                               HorizontalAlignment="Left"
+                              AutomationProperties.Name="{x:Static p:Resources.Advanced_TiffCompressOption_Name}"
                               ItemsSource="{Binding Source={StaticResource TiffCompressOptionValues}}"
                               Name="_tiffCompressComboBox"
                               SelectedItem="{Binding Settings.TiffCompressOption}">
@@ -254,7 +260,7 @@
                                  TabIndex="0"
                                  TextWrapping="Wrap"
                                  Name="fileNameTextBox"
-                                 AutomationProperties.Name="{x:Static p:Resources.Advanced_FileName_Tooltip}"
+                                 AutomationProperties.Name="{x:Static p:Resources.Advanced_FileName_Name}"
                                  Text="{Binding Settings.FileName}"/>
                     </Grid>
                     <Separator Margin="0,12,0,0"/>
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index dfafc51d6c..c62048fc16 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -83,6 +83,7 @@
                     <StackPanel Orientation="Horizontal" Margin="0,-8,0,0">
                         <TextBlock VerticalAlignment="Center"
                                    Text="{Binding Name}"
+                                   Foreground="{DynamicResource PrimaryForegroundBrush}"
                                    FontWeight="Bold"/>
                         <ComboBox Margin="8,0,0,0"
                                   ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"