diff --git a/support/hololens/ServoApp/Assets/UI/back.png b/support/hololens/ServoApp/Assets/UI/back.png
new file mode 100644
index 00000000000..f22e1abfd2d
Binary files /dev/null and b/support/hololens/ServoApp/Assets/UI/back.png differ
diff --git a/support/hololens/ServoApp/Assets/UI/forward.png b/support/hololens/ServoApp/Assets/UI/forward.png
new file mode 100644
index 00000000000..de953a75f22
Binary files /dev/null and b/support/hololens/ServoApp/Assets/UI/forward.png differ
diff --git a/support/hololens/ServoApp/Assets/UI/reload.png b/support/hololens/ServoApp/Assets/UI/reload.png
new file mode 100644
index 00000000000..374a66a57a7
Binary files /dev/null and b/support/hololens/ServoApp/Assets/UI/reload.png differ
diff --git a/support/hololens/ServoApp/Assets/UI/stop.png b/support/hololens/ServoApp/Assets/UI/stop.png
new file mode 100644
index 00000000000..181ede7b298
Binary files /dev/null and b/support/hololens/ServoApp/Assets/UI/stop.png differ
diff --git a/support/hololens/ServoApp/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp
index 1a9b2073bbd..a4d5fcd2a94 100644
--- a/support/hololens/ServoApp/BrowserPage.cpp
+++ b/support/hololens/ServoApp/BrowserPage.cpp
@@ -28,12 +28,18 @@ void BrowserPage::BindServoEvents() {
     forwardButton().IsEnabled(forward);
   });
   servoControl().OnLoadStarted([=] {
+    throbber().IsActive(true);
     reloadButton().IsEnabled(false);
+    reloadButton().Visibility(Visibility::Collapsed);
     stopButton().IsEnabled(true);
+    stopButton().Visibility(Visibility::Visible);
   });
   servoControl().OnLoadEnded([=] {
+    throbber().IsActive(false);
     reloadButton().IsEnabled(true);
+    reloadButton().Visibility(Visibility::Visible);
     stopButton().IsEnabled(false);
+    stopButton().Visibility(Visibility::Collapsed);
   });
   servoControl().OnCaptureGesturesStarted([=] {
     servoControl().Focus(FocusState::Programmatic);
diff --git a/support/hololens/ServoApp/BrowserPage.xaml b/support/hololens/ServoApp/BrowserPage.xaml
index 50f5c7972ab..5255b3a4ab5 100644
--- a/support/hololens/ServoApp/BrowserPage.xaml
+++ b/support/hololens/ServoApp/BrowserPage.xaml
@@ -7,25 +7,105 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
+  <Page.Resources>
+    <Style x:Key="NavigationBarButton" TargetType="Button">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}"/>
+      <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}"/>
+      <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="Margin" Value="10,2"/>
+      <Setter Property="MinWidth" Value="30"/>
+      <Setter Property="MinHeight" Value="30"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
+      <Setter Property="FontWeight" Value="Normal"/>
+      <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
+      <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}"/>
+      <Setter Property="FocusVisualMargin" Value="-3"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="Button">
+            <ContentPresenter x:Name="ContentPresenter" AutomationProperties.AccessibilityView="Raw" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" CornerRadius="{TemplateBinding CornerRadius}" ContentTransitions="{TemplateBinding ContentTransitions}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualState x:Name="Normal">
+                    <Storyboard>
+                      <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter"/>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="PointerOver">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPointerOver}"/>
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPointerOver}"/>
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPointerOver}"/>
+                      </ObjectAnimationUsingKeyFrames>
+                      <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter"/>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="Pressed">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPressed}"/>
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPressed}"/>
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPressed}"/>
+                      </ObjectAnimationUsingKeyFrames>
+                      <PointerDownThemeAnimation Storyboard.TargetName="ContentPresenter"/>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="Disabled">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Opacity">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="0.2"/>
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+            </ContentPresenter>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+  </Page.Resources>
 
   <Grid VerticalAlignment="Stretch">
     <Grid.RowDefinitions>
       <RowDefinition Height="auto"/>
       <RowDefinition Height="*"/>
     </Grid.RowDefinitions>
-    <Grid Grid.Row="0" x:Name="navigationBar">
+    <Grid Grid.Row="0" x:Name="navigationBar" Background="{ThemeResource InkToolbarButtonBackgroundThemeBrush}">
       <Grid.ColumnDefinitions>
         <ColumnDefinition Width="auto"/>
         <ColumnDefinition Width="*"/>
         <ColumnDefinition Width="auto"/>
       </Grid.ColumnDefinitions>
       <StackPanel Orientation="Horizontal" Grid.Column="0">
-        <Button x:Name="backButton" IsTabStop="true" IsEnabled="false" Content="Back" Click="OnBackButtonClicked"/>
-        <Button x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Content="Forward" Click="OnForwardButtonClicked"/>
-        <Button x:Name="reloadButton" IsTabStop="true" IsEnabled="false" Content="reload" Click="OnReloadButtonClicked"/>
-        <Button x:Name="stopButton" IsTabStop="true" IsEnabled="false" Content="stop" Click="OnStopButtonClicked"/>
+          <Button Style="{StaticResource NavigationBarButton}" x:Name="backButton" IsTabStop="true" IsEnabled="false" Click="OnBackButtonClicked" AutomationProperties.Name="Back">
+          <Image Source="Assets/UI/back.png" Height="12"></Image>
+        </Button>
+          <Button Style="{StaticResource NavigationBarButton}" x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Click="OnForwardButtonClicked" AutomationProperties.Name="Forward">
+          <Image Source="Assets/UI/forward.png" Height="12"></Image>
+        </Button>
+          <Button Style="{StaticResource NavigationBarButton}" x:Name="reloadButton" IsTabStop="true" IsEnabled="false" Visibility="Visible" Click="OnReloadButtonClicked" AutomationProperties.Name="Reload">
+          <Image Source="Assets/UI/reload.png" Height="12"></Image>
+        </Button>
+          <Button Style="{StaticResource NavigationBarButton}" x:Name="stopButton" IsTabStop="true" IsEnabled="false" Visibility="Collapsed" Click="OnStopButtonClicked" AutomationProperties.Name="Stop">
+          <Image Source="Assets/UI/stop.png" Height="12"></Image>
+        </Button>
       </StackPanel>
-      <TextBox Text="" IsTabStop="true" InputScope="Url" PlaceholderText="Type a URL" x:Name="urlTextbox" Grid.Column="1" KeyUp="OnURLEdited"/>
+      <TextBox Text="" IsTabStop="true" InputScope="Url" PlaceholderText="Type a URL" x:Name="urlTextbox" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0"/>
+      <ProgressRing x:Name="throbber" Grid.Column="2" Margin="10,0"/>
     </Grid>
     <local:ServoControl TabIndex="0" x:Name="servoControl" Grid.Row="1"/>
   </Grid>
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 1f2683fe753..2c8ce4ca740 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -948,6 +948,10 @@
     <Image Include="Assets\StoreLogo.scale-100.png" />
     <Image Include="Assets\StoreLogo.scale-200.png" />
     <Image Include="Assets\StoreLogo.scale-400.png" />
+    <Image Include="Assets\UI\back.png" />
+    <Image Include="Assets\UI\forward.png" />
+    <Image Include="Assets\UI\reload.png" />
+    <Image Include="Assets\UI\stop.png" />
     <Image Include="Assets\Wide310x150Logo.scale-100.png" />
     <Image Include="Assets\Wide310x150Logo.scale-200.png" />
     <Image Include="Assets\Wide310x150Logo.scale-400.png" />
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index ab7d443ea8c..b8266255b83 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -123,6 +123,18 @@
     <Image Include="Assets\StoreLogo.scale-400.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\UI\back.png">
+      <Filter>Assets\UI</Filter>
+    </Image>
+    <Image Include="Assets\UI\forward.png">
+      <Filter>Assets\UI</Filter>
+    </Image>
+    <Image Include="Assets\UI\reload.png">
+      <Filter>Assets\UI</Filter>
+    </Image>
+    <Image Include="Assets\UI\stop.png">
+      <Filter>Assets\UI</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
@@ -876,6 +888,9 @@
     <Filter Include="ServoControl">
       <UniqueIdentifier>{d21a959c-19d1-4a54-b942-692c27e5b3a6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Assets\UI">
+      <UniqueIdentifier>{d49fe329-5e22-4470-8310-5b925419e6f8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />