diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 463beb38..177e4529 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -618,10 +618,10 @@
                         <HyperlinkButton x:Name="CurrencyRefreshBlock"
                                Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
                                Click="CurrencyRefreshButton_Click"
-                               AutomationProperties.AccessibilityView="Raw">
-                            <Underline x:Uid="RefreshButtonText"/>
+                               AutomationProperties.AccessibilityView="Control" 
+                               x:Uid="RefreshButtonText">
                         </HyperlinkButton>
-                        <TextBlock Style="{ThemeResource CaptionTextBlockStyle}">
+                        <TextBlock Style="{ThemeResource CaptionTextBlockStyle}" Margin="0, 7, 0, 0">
                             <Run x:Name="Spacing" Text="&#x200A;"/>
                             <Run x:Name="CurrencySecondaryStatus"
                                  FontWeight="SemiBold"