diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index bf0151c0..d938ffd3 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -428,17 +428,21 @@
                 </VisualState>
             </VisualStateGroup>
             <VisualStateGroup x:Name="CurrencySecondaryStatusStates">
-                <VisualState x:Name="NormalCurrencyStatus"/>
+                <VisualState x:Name="NormalCurrencyStatus">
+                    <VisualState.Setters>
+                        <Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Collapsed"/>
+                    </VisualState.Setters>
+                </VisualState>
                 <VisualState x:Name="ChargesMayApplyCurrencyStatus">
                     <VisualState.Setters>
                         <Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextBaseHighColorBrush}"/>
-                        <Setter Target="CurrencySecondaryStatusTextBlock.Visibility" Value="Visible"/>
+                        <Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Visible"/>
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="FailedCurrencyStatus">
                     <VisualState.Setters>
                         <Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextRedColorBrush}"/>
-                        <Setter Target="CurrencySecondaryStatusTextBlock.Visibility" Value="Visible"/>
+                        <Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Visible"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -618,11 +622,9 @@
                                          x:Uid="RefreshButtonText"
                                          Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
                                          Click="CurrencyRefreshButton_Click"/>
-                        <TextBlock x:Name="CurrencySecondaryStatusTextBlock"
-                                   Margin="0,7,0,0"
-                                   Style="{ThemeResource CaptionTextBlockStyle}"
-                                   Visibility="Collapsed">
-                            <Run x:Name="Spacing" Text="&#x200A;"/>
+                        <TextBlock x:Name="CurrencySecondaryStatusBlock"
+                                   Margin="3,7,0,0"
+                                   Style="{ThemeResource CaptionTextBlockStyle}">
                             <Run x:Name="CurrencySecondaryStatus"
                                  FontWeight="SemiBold"
                                  Text=""/>
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index dddd38eb..cc3a523a 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -152,19 +152,20 @@ void UnitConverter::OnOfflineNetworkAccess()
 
 void UnitConverter::SetNormalCurrencyStatus()
 {
-    VisualStateManager::GoToState(this, NormalCurrencyStatus->Name, false);
+    VisualStateManager::GoToState(this, L"NormalCurrencyStatus", false);
+    CurrencySecondaryStatus->Text = L"";
 }
 
 void UnitConverter::SetChargesMayApplyStatus()
 {
+    VisualStateManager::GoToState(this, L"ChargesMayApplyCurrencyStatus", false);
     CurrencySecondaryStatus->Text = m_chargesMayApplyText;
-    VisualStateManager::GoToState(this, ChargesMayApplyCurrencyStatus->Name, false);
 }
 
 void UnitConverter::SetFailedToRefreshStatus()
 {
+    VisualStateManager::GoToState(this, L"FailedCurrencyStatus", false);
     CurrencySecondaryStatus->Text = m_failedToRefreshText;
-    VisualStateManager::GoToState(this, FailedCurrencyStatus->Name, false);
 }
 
 void UnitConverter::InitializeOfflineStatusTextBlock()