diff --git a/App.xaml.cs b/App.xaml.cs
index 77cc29a..c45a0e6 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -76,7 +76,7 @@ namespace WorkIndicator
             if (status == UpdateCheck.UpdateStatus.None)
                 message = WorkIndicator.Properties.Resources.Loading;
 
-            _dispatcher.Invoke(() => TrayIcon.SetText(message));
+            // _dispatcher.Invoke(() => TrayIcon.SetText(message));
         }
 
         protected override void OnExit(ExitEventArgs e)
diff --git a/Options/AboutOptionsPanel.xaml b/Options/AboutOptionsPanel.xaml
index a437ade..bf41ee4 100644
--- a/Options/AboutOptionsPanel.xaml
+++ b/Options/AboutOptionsPanel.xaml
@@ -4,21 +4,43 @@
                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                        xmlns:windows="clr-namespace:Common.Wpf.Windows;assembly=Common.Wpf"
+                       xmlns:properties="clr-namespace:WorkIndicator.Properties"
                        mc:Ignorable="d"
                        d:DesignHeight="300"
                        d:DesignWidth="300">
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="*"></RowDefinition>
+        </Grid.RowDefinitions>
         <TextBlock Text="[Application Name]"
                    Name="ApplicationNameLabel"
                    VerticalAlignment="Top"
-                   FontWeight="Bold" />
+                   FontWeight="Bold"
+                   Grid.Row="0" />
         <TextBlock Text="[Application Version]"
-                   Margin="0,22,0,0"
+                   Margin="0,6,0,0"
                    Name="VersionLabel"
-                   VerticalAlignment="Top" />
+                   VerticalAlignment="Top" 
+                   Grid.Row="1" />
         <TextBlock Text="[Company]"
-                   Margin="0,44,0,0"
+                   Margin="0,6,0,0"
                    Name="CompanyLabel"
-                   VerticalAlignment="Top" />
+                   VerticalAlignment="Top" 
+                   Grid.Row="2" />
+        <StackPanel Grid.Row="3"
+                    Grid.Column="0"
+                    Margin="0,20,0,0"
+                    Orientation="Horizontal">
+            <Button Content="{x:Static properties:Resources.CheckUpdate}"
+                HorizontalAlignment="Left"                
+                Padding="6,2"               
+                Click="HandleCheckForUpdateButtonClick"
+                VerticalContentAlignment="Center" />
+            <Label Name="UpdateMessage" Content="" VerticalContentAlignment="Center" Padding="6,0" />
+        </StackPanel>
     </Grid>
 </windows:CategoryPanel>
diff --git a/Options/AboutOptionsPanel.xaml.cs b/Options/AboutOptionsPanel.xaml.cs
index 0f08288..2e1234f 100644
--- a/Options/AboutOptionsPanel.xaml.cs
+++ b/Options/AboutOptionsPanel.xaml.cs
@@ -1,5 +1,6 @@
 using Common.Update;
 using System.Reflection;
+using System.Windows;
 
 namespace WorkIndicator.Options
 {
@@ -32,5 +33,10 @@ namespace WorkIndicator.Options
         }
 
         public override string CategoryName => Properties.Resources.OptionCategory_About;
+
+        private async void HandleCheckForUpdateButtonClick(object sender, RoutedEventArgs e)
+        {
+            await UpdateCheck.CheckUpdate((status, message) => UpdateMessage.Content = message);
+        }
     }
 }
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index ebca6de..77b8ca0 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -133,6 +133,15 @@ namespace WorkIndicator.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Check for Update.
+        /// </summary>
+        public static string CheckUpdate {
+            get {
+                return ResourceManager.GetString("CheckUpdate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enabled.
         /// </summary>
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index ec7c0fd..1263abc 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -241,4 +241,7 @@
   <data name="Loading" xml:space="preserve">
     <value>Loading...</value>
   </data>
+  <data name="CheckUpdate" xml:space="preserve">
+    <value>_Check for Update</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TrayIcon.cs b/TrayIcon.cs
index 5e1da4f..f743c5d 100644
--- a/TrayIcon.cs
+++ b/TrayIcon.cs
@@ -136,7 +136,7 @@ namespace WorkIndicator
 
             if (dialogResult.HasValue && dialogResult.Value)
             {
-                Properties.Settings.Default.Save();
+                Settings.Default.Save();
             }
         }
     }