From 850864c6f11e1658dab1ea7141ed3a715f4d390a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=AD=20Climent?= <marticlilop@gmail.com>
Date: Sat, 16 Mar 2024 15:29:37 +0100
Subject: [PATCH] minor accessibility improvements

---
 .../SoftwarePages/DiscoverPackages.xaml       | 15 +++--
 .../SoftwarePages/DiscoverPackages.xaml.cs    |  2 +
 .../SoftwarePages/InstalledPackages.xaml      | 13 ++--
 .../SoftwarePages/InstalledPackages.xaml.cs   |  2 +
 .../SoftwarePages/PackageBundle.xaml          | 11 ++--
 .../SoftwarePages/PackageBundle.xaml.cs       |  1 +
 .../SoftwarePages/SoftwareUpdates.xaml        | 13 ++--
 .../SoftwarePages/SoftwareUpdates.xaml.cs     |  2 +
 src/wingetui/Interface/Widgets/Announcer.xaml |  2 +-
 .../Interface/Widgets/Announcer.xaml.cs       |  3 +-
 src/wingetui/Interface/Widgets/NavButton.xaml | 59 ++++++-------------
 .../Interface/Widgets/NavButton.xaml.cs       | 19 ++----
 12 files changed, 65 insertions(+), 77 deletions(-)

diff --git a/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml b/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml
index 77cba11a5..7bb0d6942 100644
--- a/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml
+++ b/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml
@@ -621,10 +621,10 @@
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <TextBox Grid.Column="0" x:Name="QueryBlock" Height="30" CornerRadius="4,0,0,4" Padding="7,5,5,5"
-                         VerticalContentAlignment="Center"
+                         VerticalContentAlignment="Center" 
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -635,7 +635,7 @@
                     </AnimatedIcon>
                 </Button>
                 <Button Grid.Column="2" x:Name="ReloadButton" CornerRadius="4"
-                        Margin="6,0,4,0" Padding="0"
+                        Margin="6,0,4,0" Padding="0" AutomationProperties.HelpText="Reload packages"
                         Height="32" Width="32">
                     <FontIcon Glyph="&#xE72C;" FontSize="16"/>
                 </Button>
@@ -672,7 +672,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                        AutomationProperties.Name="Filter by source">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -709,7 +710,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -739,7 +741,8 @@
                     <!-- Search Mode Expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>
diff --git a/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml.cs b/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml.cs
index 422c5287c..8effede74 100644
--- a/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml.cs
+++ b/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml.cs
@@ -165,6 +165,8 @@ public DiscoverPackagesPage()
             LoadInterface();
             _ = __load_packages();
 
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
+
         }
 
         protected async Task __load_packages()
diff --git a/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml b/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml
index de28f55d9..7603ff8dc 100644
--- a/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml
+++ b/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml
@@ -624,7 +624,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -635,7 +635,7 @@
                     </AnimatedIcon>
                 </Button>
                 <Button Grid.Column="2" x:Name="ReloadButton" CornerRadius="4"
-                        Margin="6,0,4,0" Padding="0"
+                        Margin="6,0,4,0" Padding="0" AutomationProperties.HelpText="Reload packages"
                         Height="32" Width="32">
                     <FontIcon Glyph="&#xE72C;" FontSize="16"/>
                 </Button>
@@ -672,7 +672,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter by source">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -709,7 +710,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -739,7 +741,8 @@
                     <!-- Search mode Expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>
diff --git a/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml.cs b/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml.cs
index de40ab874..fb929477b 100644
--- a/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml.cs
+++ b/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml.cs
@@ -170,6 +170,8 @@ public InstalledPackagesPage()
             GenerateToolBar();
             LoadInterface();
             _ = LoadPackages();
+
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
         }
 
         public void ReloadPackages()
diff --git a/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml b/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml
index 5c42b300d..6359cbb01 100644
--- a/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml
+++ b/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml
@@ -625,7 +625,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -673,7 +673,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter by source">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -710,7 +711,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -740,7 +742,8 @@
                     <!-- Search Mode Expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>
diff --git a/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml.cs b/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml.cs
index 8b7afb8b5..bfaad0528 100644
--- a/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml.cs
+++ b/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml.cs
@@ -161,6 +161,7 @@ public PackageBundlePage()
 
             GenerateToolBar();
             LoadInterface();
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
         }
 
 
diff --git a/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml b/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml
index 63c522edf..3778c4dce 100644
--- a/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml
+++ b/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml
@@ -639,7 +639,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -650,7 +650,7 @@
                     </AnimatedIcon>
                 </Button>
                 <Button Grid.Column="2" x:Name="ReloadButton" CornerRadius="4"
-                        Margin="6,0,4,0" Padding="0"
+                        Margin="6,0,4,0" Padding="0" AutomationProperties.HelpText="Reload packages"
                         Height="32" Width="32">
                     <FontIcon Glyph="&#xE72C;" FontSize="16"/>
                 </Button>
@@ -687,7 +687,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter by sources">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -725,7 +726,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -755,7 +757,8 @@
                     <!-- Search mode expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>
diff --git a/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml.cs b/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml.cs
index ac564a2c9..e708eb630 100644
--- a/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml.cs
+++ b/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml.cs
@@ -167,6 +167,8 @@ public SoftwareUpdatesPage()
             GenerateToolBar();
             LoadInterface();
             _ = LoadPackages(ManualCheck: false);
+
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
         }
 
         protected void AddPackageToSourcesList(UpgradablePackage package)
diff --git a/src/wingetui/Interface/Widgets/Announcer.xaml b/src/wingetui/Interface/Widgets/Announcer.xaml
index 9d937f466..a322c9148 100644
--- a/src/wingetui/Interface/Widgets/Announcer.xaml
+++ b/src/wingetui/Interface/Widgets/Announcer.xaml
@@ -8,7 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid TabIndex="99">
         <Grid x:Name="g">
             <Grid.RowDefinitions>
                 <RowDefinition Height="80"/>
diff --git a/src/wingetui/Interface/Widgets/Announcer.xaml.cs b/src/wingetui/Interface/Widgets/Announcer.xaml.cs
index 1b510d00b..4d1d85fc5 100644
--- a/src/wingetui/Interface/Widgets/Announcer.xaml.cs
+++ b/src/wingetui/Interface/Widgets/Announcer.xaml.cs
@@ -42,7 +42,8 @@ public Announcer()
             DefaultStyleKey = typeof(Announcer);
             BringIntoViewRequested += (s, e) => { LoadAnnouncements(); };
 
-            PointerPressed += (s, e) => { LoadAnnouncements(); };
+            int i = 0;
+            PointerPressed += (s, e) => { if(i++ %3 != 0) LoadAnnouncements(); };
 
             SetText(binder.Translate("Fetching latest announcements, please wait..."));
             _textblock.TextWrapping = TextWrapping.Wrap;
diff --git a/src/wingetui/Interface/Widgets/NavButton.xaml b/src/wingetui/Interface/Widgets/NavButton.xaml
index f12760aa6..4385c7e4f 100644
--- a/src/wingetui/Interface/Widgets/NavButton.xaml
+++ b/src/wingetui/Interface/Widgets/NavButton.xaml
@@ -22,14 +22,31 @@
                 <animations:OpacityAnimation Duration="0:0:0.25" From="0" To="1"/>
             </animations:Implicit.ShowAnimations>
         </Border-->
+        <Grid Margin="1,0,1,0" Padding="0" Name="VariableGrid">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <FontIcon 
+            Grid.Row="0" x:Name="IconBlock"
+            FontSize="16" VerticalAlignment="Bottom"/>
+            <TextBlock
+                x:Name="TextBlock"
+                FontSize="11" Grid.Row="1" 
+                MinHeight="28" VerticalAlignment="Center"
+                HorizontalAlignment="Center"
+                TextAlignment="Center"
+                TextWrapping="Wrap" Padding="1,4,2,4"
+            />
+        </Grid>
         <ToggleButton x:Name="ToggleButton"
-            x:FieldModifier="public"
+            x:FieldModifier="public" Foreground="Transparent"
             Click="ToggleButton_Click">
             <ToggleButton.Style>
                 <Style TargetType="ToggleButton">
                     <Setter Property="Background" Value="{ThemeResource ControlAltFillColorTransparent}" />
                     <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-                    <Setter Property="Foreground" Value="{ThemeResource ToggleButtonForeground}" />
+                    <Setter Property="Foreground" Value="Transparent" />
                     <Setter Property="BorderBrush" Value="{ThemeResource ExpanderContentBorderBrush}" />
                     <Setter Property="BorderThickness" Value="1" />
                     <Setter Property="Padding" Value="0,0,0,0" />
@@ -68,9 +85,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ControlAltFillColorTransparent}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForeground}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ControlAltFillColorTransparent}" />
                                                     </ObjectAnimationUsingKeyFrames>
@@ -88,9 +102,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonBackgroundDisabled}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForeground}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                 </Storyboard>
                                             </VisualState>
                                             <VisualState x:Name="Disabled">
@@ -98,9 +109,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonBackgroundDisabled}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForeground}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                 </Storyboard>
                                             </VisualState>
                                             <VisualState x:Name="Checked">
@@ -108,9 +116,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonBackgroundPointerOver}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForeground}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                 </Storyboard>
                                             </VisualState>
                                             <VisualState x:Name="CheckedPointerOver">
@@ -118,9 +123,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonBackgroundPointerOver}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForeground}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                 </Storyboard>
                                             </VisualState>
                                             <VisualState x:Name="CheckedPressed">
@@ -128,9 +130,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonBackgroundPointerOver}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForeground}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                 </Storyboard>
                                             </VisualState>
                                             <VisualState x:Name="CheckedDisabled">
@@ -138,9 +137,6 @@
                                                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                         <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonBackgroundCheckedDisabled}" />
                                                     </ObjectAnimationUsingKeyFrames>
-                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleButtonForegroundCheckedDisabled}" />
-                                                    </ObjectAnimationUsingKeyFrames>
                                                 </Storyboard>
                                             </VisualState>
                                         </VisualStateGroup>
@@ -151,23 +147,6 @@
                     </Setter>
                 </Style>
             </ToggleButton.Style>
-            <Grid Margin="1,0,1,0" Padding="0" Name="VariableGrid">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <FontIcon 
-                Grid.Row="0" x:Name="IconBlock"
-                FontSize="16" VerticalAlignment="Bottom"/>
-                <TextBlock
-                    x:Name="TextBlock"
-                    FontSize="11" Grid.Row="1" 
-                    MinHeight="28" VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-                    TextAlignment="Center"
-                    TextWrapping="Wrap" Padding="1,4,2,4"
-                />
-            </Grid>
         </ToggleButton>
     </Grid>
 </UserControl>
diff --git a/src/wingetui/Interface/Widgets/NavButton.xaml.cs b/src/wingetui/Interface/Widgets/NavButton.xaml.cs
index 434656899..003428e33 100644
--- a/src/wingetui/Interface/Widgets/NavButton.xaml.cs
+++ b/src/wingetui/Interface/Widgets/NavButton.xaml.cs
@@ -1,9 +1,12 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Media;
 using ModernWindow.Structures;
 using System;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using Windows.Media.Devices;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -50,22 +53,8 @@ public NavButton()
                 {
                     string val = Tools.Translate((string)e.NewValue);
                     int count = val.Count(x => x == ' ');
-                    /*if (count > 0)
-                    {
-                        Height = 58 + 14*count;
-                        VariableGrid.RowDefinitions[1].Height = new GridLength(26 + 14 * count);
-                        TextBlock.Height = 18 + 14 * count;
-                        TextBlock.HorizontalAlignment = HorizontalAlignment.Center;
-                        TextBlock.VerticalAlignment = VerticalAlignment.Center;
-                        TextBlock.TextAlignment = TextAlignment.Center;
-                    }
-                    else
-                    {
-                        Height = 58;
-                        TextBlock.Height = 18;
-                        VariableGrid.RowDefinitions[1].Height = new GridLength(26);
-                    }*/
                     TextBlock.Text = val.Replace(" ", "\x0a");
+                    ToggleButton.Content = val.Replace(" ", "\x0a");
                 }))
             );