[Settings] UX fixes (#45513)

## Summary of the Pull Request

This PR includes:
- UI improvements to the Mouse Without Borders settings page.
- UI improvements to the AOT settings page.
- Multiple small fixes (e.g. to enable proper disabled states)
- Using GH Copilot CLI to loc strings that were hardcoded.
- Using GH Copilot CLI to remove dead loc strings from `Resources.resw`
(@jay-o-way will appreciated this 😁):

<img width="606" height="245" alt="image"
src="https://github.com/user-attachments/assets/aeab1201-1129-4ac9-a714-ac5ea7a227cc"
/>


## PR Checklist

- [x] Closes: #41688
- [x] Closes: #32869
- [x] Closes: #36200

<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

---------

Co-authored-by: Jiří Polášek <me@jiripolasek.com>

src/settings-ui/Settings.UI/SettingsXAML/App.xaml

@@ -76,6 +76,17 @@
 
             <Style BasedOn="{StaticResource DefaultCheckBoxStyle}" TargetType="controls:CheckBoxWithDescriptionControl" />
 
+            <tkcontrols:MarkdownThemes
+                x:Key="DescriptionTextMarkdownThemeConfig"
+                InlineCodeBackground="{StaticResource ControlFillColorDefaultBrush}"
+                InlineCodeBorderBrush="{StaticResource ControlElevationBorderBrush}"
+                InlineCodeCornerRadius="2"
+                InlineCodeFontSize="12"
+                InlineCodeForeground="{StaticResource TextFillColorSecondaryBrush}"
+                InlineCodePadding="2,0,2,1" />
+
+            <tkcontrols:MarkdownConfig x:Key="DescriptionTextMarkdownConfig" Themes="{StaticResource DescriptionTextMarkdownThemeConfig}" />
+
             <TransitionCollection x:Key="SettingsCardsAnimations">
                 <EntranceThemeTransition FromVerticalOffset="50" />
                 <!--  Animates cards when loaded  -->

src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs

@@ -12,11 +12,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
 {
     public partial class CheckBoxWithDescriptionControl : CheckBox
     {
-        private CheckBoxWithDescriptionControl _checkBoxSubTextControl;
-
         public CheckBoxWithDescriptionControl()
         {
-            _checkBoxSubTextControl = (CheckBoxWithDescriptionControl)this;
             this.Loaded += CheckBoxSubTextControl_Loaded;
         }
 
@@ -45,17 +42,17 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
               panel.Children.Add(new IsEnabledTextBlock() { Style = (Style)App.Current.Resources["SecondaryIsEnabledTextBlockStyle"], Text = Description });
             }
 
-            _checkBoxSubTextControl.Content = panel;
+            this.Content = panel;
         }
 
         public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            "Header",
+            nameof(Header),
             typeof(string),
             typeof(CheckBoxWithDescriptionControl),
             new PropertyMetadata(default(string)));
 
         public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
-            "Description",
+            nameof(Description),
             typeof(string),
             typeof(CheckBoxWithDescriptionControl),
             new PropertyMetadata(default(string)));

src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml

@@ -100,10 +100,10 @@
                                         Keys="{x:Bind Hotkey.GetKeysList()}"
                                         LabelPlacement="Before" />
                                     <CheckBox
+                                        x:Uid="ShortcutConflictWindow_IgnoreShortcut"
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
                                         Click="OnIgnoreConflictClicked"
-                                        Content="Ignore shortcut"
                                         IsChecked="{x:Bind ConflictIgnored, Mode=OneWay}" />
                                 </Grid>
 

src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml

@@ -3,6 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
 
+    <Style BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}" TargetType="controls:IsEnabledTextBlock" />
+
     <Style x:Key="DefaultIsEnabledTextBlockStyle" TargetType="controls:IsEnabledTextBlock">
         <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
         <Setter Property="IsTabStop" Value="False" />
@@ -16,6 +18,7 @@
                             FontSize="{TemplateBinding FontSize}"
                             FontWeight="{TemplateBinding FontWeight}"
                             Foreground="{TemplateBinding Foreground}"
+                            IsTextSelectionEnabled="{TemplateBinding IsTextSelectionEnabled}"
                             Text="{TemplateBinding Text}"
                             TextWrapping="WrapWholeWords" />
                         <VisualStateManager.VisualStateGroups>

src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml.cs

@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
     {
         public IsEnabledTextBlock()
         {
-            this.Style = (Style)App.Current.Resources["DefaultIsEnabledTextBlockStyle"];
+            this.DefaultStyleKey = typeof(KeyVisual);
         }
 
         protected override void OnApplyTemplate()
@@ -26,11 +26,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             base.OnApplyTemplate();
         }
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-           "Text",
-           typeof(string),
-           typeof(IsEnabledTextBlock),
-           null);
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(IsEnabledTextBlock), new PropertyMetadata(null));
 
         [Localizable(true)]
         public string Text
@@ -39,6 +35,14 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             set => SetValue(TextProperty, value);
         }
 
+        public static readonly DependencyProperty IsTextSelectionEnabledProperty = DependencyProperty.Register(nameof(IsTextSelectionEnabled), typeof(bool), typeof(IsEnabledTextBlock), new PropertyMetadata(false));
+
+        public bool IsTextSelectionEnabled
+        {
+            get => (bool)GetValue(IsTextSelectionEnabledProperty);
+            set => SetValue(IsTextSelectionEnabledProperty, value);
+        }
+
         private void IsEnabledTextBlock_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             SetEnabledState();

src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml

@@ -39,13 +39,9 @@
             Grid.Row="1"
             Padding="4"
             IsClosable="False"
-            IsOpen="True"
-            Message="Foundry Local is still in Public Preview">
+            IsOpen="True">
             <InfoBar.ActionButton>
-                <HyperlinkButton
-                    x:Uid="AdvancedPaste_FL_LearnMoreFoundryLocal"
-                    Content="Learn more"
-                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/what-is-foundry-local" />
+                <HyperlinkButton x:Uid="AdvancedPaste_FL_LearnMoreFoundryLocal" NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/what-is-foundry-local" />
             </InfoBar.ActionButton>
         </InfoBar>
         <StackPanel

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml

@@ -135,7 +135,6 @@
                                 Grid.Row="2"
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="To pick a color:"
                                 TextWrapping="Wrap" />
                             <controls:ShortcutWithTextLabelControl
                                 x:Name="ColorPickerHotkeyControl"

src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml

@@ -104,7 +104,7 @@
                             </tkcontrols:SettingsExpander.Description>
                             <tkcontrols:SettingsExpander.ItemsHeader>
                                 <tkcontrols:SettingsCard x:Uid="AdvancedPaste_ModelProviders" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
-                                    <Button Content="Add model" Style="{StaticResource AccentButtonStyle}">
+                                    <Button x:Uid="AdvancedPaste_AddModelButton" Style="{StaticResource AccentButtonStyle}">
                                         <Button.Flyout>
                                             <MenuFlyout x:Name="AddProviderMenuFlyout" Opening="AddProviderMenuFlyout_Opening" />
                                         </Button.Flyout>
@@ -431,7 +431,6 @@
         <ContentDialog
             x:Name="PasteAIProviderConfigurationDialog"
             x:Uid="AdvancedPaste_EndpointDialog"
-            Title="Paste with AI provider configuration"
             Closed="PasteAIProviderConfigurationDialog_Closed"
             PrimaryButtonClick="PasteAIProviderConfigurationDialog_PrimaryButtonClick"
             PrimaryButtonStyle="{ThemeResource AccentButtonStyle}">
@@ -533,7 +532,6 @@
                             MinHeight="76"
                             HorizontalAlignment="Stretch"
                             AcceptsReturn="True"
-                            Header="System prompt"
                             Text="{x:Bind ViewModel.PasteAIProviderDraft.SystemPrompt, Mode=TwoWay}"
                             TextWrapping="Wrap" />
                         <Grid
@@ -549,9 +547,9 @@
                             Spacing="8">
                             <TextBox
                                 x:Name="PasteAIModelPathTextBox"
+                                x:Uid="AdvancedPaste_ModelPath"
                                 MinWidth="200"
                                 HorizontalAlignment="Stretch"
-                                Header="Model path"
                                 PlaceholderText="C:\Models\phi-3.onnx"
                                 Text="{x:Bind ViewModel.PasteAIProviderDraft.ModelPath, Mode=TwoWay}" />
                             <Button

src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml

@@ -10,7 +10,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-
+    <local:NavigablePage.Resources />
     <controls:SettingsPageControl
         x:Uid="AlwaysOnTop"
         IsTabStop="False"
@@ -38,24 +38,7 @@
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
                     </tkcontrols:SettingsExpander>
-                    <tkcontrols:SettingsExpander
-                        x:Uid="AlwaysOnTop_TransparencyInfo"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
-                        IsExpanded="True">
-                        <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard ContentAlignment="Left">
-                                <controls:ShortcutWithTextLabelControl x:Uid="AlwaysOnTop_IncreaseOpacity" Keys="{x:Bind ViewModel.IncreaseOpacityKeysList, Mode=OneWay}" />
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard ContentAlignment="Left">
-                                <controls:ShortcutWithTextLabelControl x:Uid="AlwaysOnTop_DecreaseOpacity" Keys="{x:Bind ViewModel.DecreaseOpacityKeysList, Mode=OneWay}" />
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard>
-                                <tkcontrols:SettingsCard.Description>
-                                    <TextBlock x:Uid="AlwaysOnTop_TransparencyRange" Style="{StaticResource SecondaryTextStyle}" />
-                                </tkcontrols:SettingsCard.Description>
-                            </tkcontrols:SettingsCard>
-                        </tkcontrols:SettingsExpander.Items>
-                    </tkcontrols:SettingsExpander>
+
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="AlwaysOnTop_Behavior_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
@@ -113,6 +96,22 @@
                     <tkcontrols:SettingsCard x:Uid="AlwaysOnTop_Sound" HeaderIcon="{ui:FontIcon Glyph=&#xE7F3;}">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.SoundEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
+
+                    <tkcontrols:SettingsExpander
+                        x:Uid="AlwaysOnTop_TransparencyInfo"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
+                        IsExpanded="True">
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard.Description>
+                                    <StackPanel Orientation="Vertical">
+                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.IncreaseOpacityShortcut, Mode=OneWay}" />
+                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.DecreaseOpacityShortcut, Mode=OneWay}" />
+                                    </StackPanel>
+                                </tkcontrols:SettingsCard.Description>
+                            </tkcontrols:SettingsCard>
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml

@@ -52,11 +52,11 @@
                             Source="/Assets/Settings/Modules/CmdPal_Background.png"
                             Stretch="UniformToFill" />
                         <TextBlock
+                            x:Uid="CmdPal_HeroTitle"
                             Margin="0,24,0,12"
                             HorizontalAlignment="Center"
                             FontSize="36"
-                            FontWeight="Bold"
-                            Text="Command Palette">
+                            FontWeight="Bold">
                             <TextBlock.Foreground>
                                 <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                                     <GradientStop Offset="0.0" Color="#FFB9EBFF" />
@@ -171,7 +171,6 @@
                         Grid.Row="3"
                         ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
                         Click="LaunchCard_Click"
-                        Header="Launch Command Palette"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE945;}"
                         IsClickEnabled="True"
                         IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml

@@ -483,9 +483,9 @@
                                             Style="{StaticResource SecondaryTextStyle}"
                                             TextWrapping="WrapWholeWords" />
                                         <HyperlinkButton
+                                            x:Uid="GeneralPage_ViewDiagnosticDataButton"
                                             Margin="0,2,0,0"
                                             Click="ViewDiagnosticData_Click"
-                                            Content="View diagnostic data"
                                             FontWeight="SemiBold" />
                                     </StackPanel>
                                 </tkcontrols:SettingsCard.Description>

src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml

@@ -99,20 +99,19 @@
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock
+                                    <controls:IsEnabledTextBlock
                                         x:Name="pathTextBlock"
                                         Grid.Column="0"
                                         VerticalAlignment="Center"
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                         IsTextSelectionEnabled="True"
-                                        Text="{x:Bind ViewModel.BackupPath, Mode=TwoWay}"
-                                        TextWrapping="Wrap">
+                                        Text="{x:Bind ViewModel.BackupPath, Mode=TwoWay}">
                                         <ToolTipService.ToolTip>
                                             <ToolTip IsEnabled="{Binding IsTextTrimmed, ElementName=pathTextBlock, Mode=OneWay}">
                                                 <TextBlock Text="{x:Bind ViewModel.BackupPath, Mode=TwoWay}" />
                                             </ToolTip>
                                         </ToolTipService.ToolTip>
-                                    </TextBlock>
+                                    </controls:IsEnabledTextBlock>
                                     <Button
                                         Grid.Column="1"
                                         Command="{x:Bind ViewModel.SelectBackupPathEventHandler}"

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml

@@ -77,18 +77,18 @@
 
                     <tkcontrols:SettingsCard Name="MouseWithoutBordersThisMachineNameLabel" x:Uid="MouseWithoutBorders_ThisMachineNameLabel">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <TextBlock
+                            <controls:IsEnabledTextBlock
                                 VerticalAlignment="Center"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                 IsTextSelectionEnabled="True"
                                 Text="{x:Bind ViewModel.MachineHostName, Mode=OneTime}" />
                             <Button
-                                Width="32"
-                                Height="32"
                                 Padding="4"
                                 Command="{x:Bind CopyPCNameCommand, Mode=OneTime}"
-                                Content="&#xE8C8;"
-                                FontFamily="{StaticResource SymbolThemeFontFamily}">
+                                Content="{ui:FontIcon Glyph=&#xE8C8;,
+                                                      FontSize=16}"
+                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                Style="{StaticResource SubtleButtonStyle}">
                                 <ToolTipService.ToolTip>
                                     <TextBlock x:Uid="MouseWithoutBorders_CopyMachineName" TextWrapping="Wrap" />
                                 </ToolTipService.ToolTip>
@@ -108,6 +108,7 @@
                             <ItemsControl
                                 x:Name="DevicesItemsControl"
                                 HorizontalAlignment="Center"
+                                IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
                                 ItemsSource="{Binding MachineMatrixString, Mode=TwoWay}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
@@ -142,7 +143,6 @@
                                                     <RowDefinition Height="*" />
                                                     <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
-
                                                 <FontIcon
                                                     Margin="0,12,0,0"
                                                     VerticalAlignment="Center"
@@ -166,8 +166,6 @@
                                 </ToolTipService.ToolTip>
                                 <TextBlock x:Uid="MouseWithoutBorders_ReconnectButton" />
                             </Button>
-
-
                         </StackPanel>
                     </tkcontrols:SettingsCard>
                     <InfoBar
@@ -185,35 +183,39 @@
                     x:Uid="MouseWithoutBorders_ServiceSettings"
                     IsEnabled="{x:Bind ViewModel.CanToggleUseService, Mode=OneWay}">
                     <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.ShowPolicyConfiguredInfoForServiceSettings, Mode=OneWay}">
-                        <tkcontrols:SettingsCard
+                        <tkcontrols:SettingsExpander
                             Name="MouseWithoutBordersUseService"
                             x:Uid="MouseWithoutBorders_UseService"
                             IsEnabled="{x:Bind ViewModel.UseServiceSettingIsEnabled, Mode=OneWay}">
                             <ToggleSwitch x:Uid="MouseWithoutBorders_UseService_ToggleSwitch" IsOn="{x:Bind ViewModel.UseService, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsExpander.Items>
+                                <tkcontrols:SettingsCard
+                                    Name="MouseWithoutBordersUninstallService"
+                                    x:Uid="MouseWithoutBorders_UninstallService"
+                                    ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
+                                    Command="{x:Bind ViewModel.UninstallServiceEventHandler}"
+                                    IsClickEnabled="{x:Bind ViewModel.CanUninstallService, Mode=OneWay}"
+                                    IsEnabled="{x:Bind ViewModel.CanUninstallService, Mode=OneWay}" />
+                            </tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsExpander.ItemsFooter>
+                                <InfoBar
+                                    x:Uid="MouseWithoutBorders_ServiceUserUninstallWarning"
+                                    IsClosable="False"
+                                    IsOpen="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
+                                    IsTabStop="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
+                                    Severity="Warning" />
+                            </tkcontrols:SettingsExpander.ItemsFooter>
+                        </tkcontrols:SettingsExpander>
                     </controls:GPOInfoControl>
-                    <StackPanel Orientation="Vertical">
-                        <InfoBar
-                            x:Uid="MouseWithoutBorders_RunAsAdminText"
-                            IsClosable="False"
-                            IsOpen="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
-                            IsTabStop="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
-                            Severity="Informational" />
-                        <InfoBar
-                            x:Uid="MouseWithoutBorders_ServiceUserUninstallWarning"
-                            IsClosable="False"
-                            IsOpen="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
-                            IsTabStop="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
-                            Severity="Warning" />
-                    </StackPanel>
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersUninstallService"
-                        x:Uid="MouseWithoutBorders_UninstallService"
-                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
-                        Command="{x:Bind ViewModel.UninstallServiceEventHandler}"
-                        IsClickEnabled="{x:Bind ViewModel.CanUninstallService, Mode=OneWay}"
-                        IsEnabled="{x:Bind ViewModel.CanUninstallService, Mode=OneWay}" />
+                    <InfoBar
+                        x:Uid="MouseWithoutBorders_RunAsAdminText"
+                        IsClosable="False"
+                        IsOpen="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
+                        IsTabStop="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
+                        Severity="Informational" />
                 </controls:SettingsGroup>
+
+
                 <controls:SettingsGroup
                     x:Name="BehaviorSettingsGroup"
                     x:Uid="MouseWithoutBorders_Settings"
@@ -228,79 +230,97 @@
                             <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
                         </InfoBar.IconSource>
                     </InfoBar>
-                    <tkcontrols:SettingsCard Name="MouseWithoutBordersWrapMouse" x:Uid="MouseWithoutBorders_WrapMouse">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_WrapMouse_ToggleSwitch" IsOn="{x:Bind ViewModel.WrapMouse, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
+
+                    <tkcontrols:SettingsExpander x:Uid="MouseWithoutBorders_MouseBehavior" HeaderIcon="{ui:FontIcon Glyph=&#xE962;}">
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersWrapMouse" ContentAlignment="Left">
+                                <CheckBox x:Uid="MouseWithoutBorders_WrapMouse" IsChecked="{x:Bind ViewModel.WrapMouse, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersMoveMouseRelatively" ContentAlignment="Left">
+                                <controls:CheckBoxWithDescriptionControl x:Uid="MouseWithoutBorders_MoveMouseRelatively" IsChecked="{x:Bind ViewModel.MoveMouseRelatively, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersBlockMouseAtScreenCorners" ContentAlignment="Left">
+                                <CheckBox x:Uid="MouseWithoutBorders_BlockMouseAtScreenCorners" IsChecked="{x:Bind ViewModel.BlockMouseAtScreenCorners, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersHideMouseAtScreenEdge" ContentAlignment="Left">
+                                <controls:CheckBoxWithDescriptionControl x:Uid="MouseWithoutBorders_HideMouseAtScreenEdge" IsChecked="{x:Bind ViewModel.HideMouseAtScreenEdge, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersDrawMouseCursor" ContentAlignment="Left">
+                                <controls:CheckBoxWithDescriptionControl x:Uid="MouseWithoutBorders_DrawMouseCursor" IsChecked="{x:Bind ViewModel.DrawMouseCursor, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
+
                     <tkcontrols:SettingsExpander
                         Name="MouseWithoutBordersShareClipboard"
                         x:Uid="MouseWithoutBorders_ShareClipboard"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xF0E3;}"
                         IsEnabled="{x:Bind ViewModel.CardForShareClipboardSettingIsEnabled, Mode=OneWay}"
                         IsExpanded="True">
                         <ToggleSwitch x:Uid="MouseWithoutBorders_ShareClipboard_ToggleSwitch" IsOn="{x:Bind ViewModel.ShareClipboard, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard
                                 Name="MouseWithoutBordersTransferFile"
-                                x:Uid="MouseWithoutBorders_TransferFile"
+                                ContentAlignment="Left"
                                 IsEnabled="{x:Bind ViewModel.CardForTransferFileSettingIsEnabled, Mode=OneWay}">
-                                <ToggleSwitch x:Uid="MouseWithoutBorders_TransferFile_ToggleSwitch" IsOn="{x:Bind ViewModel.TransferFile, Mode=TwoWay}" />
+                                <CheckBox x:Uid="MouseWithoutBorders_TransferFile" IsChecked="{x:Bind ViewModel.TransferFile, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
                     </tkcontrols:SettingsExpander>
-                    <tkcontrols:SettingsCard Name="MouseWithoutBordersHideMouseAtScreenEdge" x:Uid="MouseWithoutBorders_HideMouseAtScreenEdge">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_HideMouseAtScreenEdge_ToggleSwitch" IsOn="{x:Bind ViewModel.HideMouseAtScreenEdge, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <tkcontrols:SettingsCard Name="MouseWithoutBordersDrawMouseCursor" x:Uid="MouseWithoutBorders_DrawMouseCursor">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_DrawMouseCursor_ToggleSwitch" IsOn="{x:Bind ViewModel.DrawMouseCursor, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
+
                     <tkcontrols:SettingsCard
                         Name="MouseWithoutBordersValidateRemoteMachineIP"
                         x:Uid="MouseWithoutBorders_ValidateRemoteMachineIP"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA3;}"
                         IsEnabled="{x:Bind ViewModel.CardForValidateRemoteIpSettingIsEnabled, Mode=OneWay}">
                         <ToggleSwitch x:Uid="MouseWithoutBorders_ValidateRemoteMachineIP_ToggleSwitch" IsOn="{x:Bind ViewModel.ValidateRemoteMachineIP, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                     <tkcontrols:SettingsCard
                         Name="MouseWithoutBordersSameSubnetOnly"
                         x:Uid="MouseWithoutBorders_SameSubnetOnly"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA3;}"
                         IsEnabled="{x:Bind ViewModel.CardForSameSubnetOnlySettingIsEnabled, Mode=OneWay}">
                         <ToggleSwitch x:Uid="MouseWithoutBorders_SameSubnetOnly_ToggleSwitch" IsOn="{x:Bind ViewModel.SameSubnetOnly, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                     <tkcontrols:SettingsCard
                         Name="MouseWithoutBordersBlockScreenSaverOnOtherMachines"
                         x:Uid="MouseWithoutBorders_BlockScreenSaverOnOtherMachines"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xF16A;}"
                         IsEnabled="{x:Bind ViewModel.CardForBlockScreensaverSettingIsEnabled, Mode=OneWay}">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_BlockScreenSaverOnOtherMachines_ToggleSwitch" IsOn="{x:Bind ViewModel.BlockScreenSaverOnOtherMachines, Mode=TwoWay}" />
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.BlockScreenSaverOnOtherMachines, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
-                    <tkcontrols:SettingsCard Name="MouseWithoutBordersMoveMouseRelatively" x:Uid="MouseWithoutBorders_MoveMouseRelatively">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_MoveMouseRelatively_ToggleSwitch" IsOn="{x:Bind ViewModel.MoveMouseRelatively, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <tkcontrols:SettingsCard Name="MouseWithoutBordersBlockMouseAtScreenCorners" x:Uid="MouseWithoutBorders_BlockMouseAtScreenCorners">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_BlockMouseAtScreenCorners_ToggleSwitch" IsOn="{x:Bind ViewModel.BlockMouseAtScreenCorners, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <tkcontrols:SettingsCard Name="MouseWithoutBordersShowClipboardAndNetworkStatusMessages" x:Uid="MouseWithoutBorders_ShowClipboardAndNetworkStatusMessages">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_ShowClipboardAndNetworkStatusMessages_ToggleSwitch" IsOn="{x:Bind ViewModel.ShowClipboardAndNetworkStatusMessages, Mode=TwoWay}" />
+                    <tkcontrols:SettingsCard
+                        Name="MouseWithoutBordersShowClipboardAndNetworkStatusMessages"
+                        x:Uid="MouseWithoutBorders_ShowClipboardAndNetworkStatusMessages"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE91C;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.ShowClipboardAndNetworkStatusMessages, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
+
                 <controls:SettingsGroup x:Uid="MouseWithoutBorders_EasyMouseSettings_Group" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsCard x:Uid="MouseWithoutBorders_EasyMouseOption" HeaderIcon="{ui:FontIcon Glyph=&#xE962;}">
+                    <tkcontrols:SettingsExpander x:Uid="MouseWithoutBorders_EasyMouseOption" HeaderIcon="{ui:FontIcon Glyph=&#xE962;}">
                         <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind Path=ViewModel.EasyMouseOptionIndex, Mode=TwoWay}">
                             <ComboBoxItem x:Uid="MouseWithoutBorders_EasyMouseOption_Disabled" />
                             <ComboBoxItem x:Uid="MouseWithoutBorders_EasyMouseOption_Enabled" />
                             <ComboBoxItem x:Uid="MouseWithoutBorders_EasyMouseOption_Ctrl" />
                             <ComboBoxItem x:Uid="MouseWithoutBorders_EasyMouseOption_Shift" />
                         </ComboBox>
-                    </tkcontrols:SettingsCard>
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersDisableEasyMouseWhenForegroundWindowIsFullscreen"
-                        x:Uid="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE962;}"
-                        IsEnabled="{x:Bind ViewModel.EasyMouseEnabled, Mode=OneWay}">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen_ToggleSwitch" IsOn="{x:Bind ViewModel.DisableEasyMouseWhenForegroundWindowIsFullscreen, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="MouseWithoutBorders_CanOnlyStopEasyMouseIfMovingFromHostMachine"
-                        IsClosable="False"
-                        IsOpen="True"
-                        Severity="Informational" />
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard
+                                Name="MouseWithoutBordersDisableEasyMouseWhenForegroundWindowIsFullscreen"
+                                x:Uid="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen"
+                                IsEnabled="{x:Bind ViewModel.EasyMouseEnabled, Mode=OneWay}">
+                                <ToggleSwitch x:Uid="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen_ToggleSwitch" IsOn="{x:Bind ViewModel.DisableEasyMouseWhenForegroundWindowIsFullscreen, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                        </tkcontrols:SettingsExpander.Items>
+                        <tkcontrols:SettingsExpander.ItemsFooter>
+                            <InfoBar
+                                x:Uid="MouseWithoutBorders_CanOnlyStopEasyMouseIfMovingFromHostMachine"
+                                IsClosable="False"
+                                IsOpen="True"
+                                Severity="Informational" />
+                        </tkcontrols:SettingsExpander.ItemsFooter>
+                    </tkcontrols:SettingsExpander>
 
                     <tkcontrols:SettingsExpander
                         Name="MouseWithoutBordersDisableEasyMouseWhenForegroundWindowIsFullscreen_Expander"
@@ -311,7 +331,6 @@
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard
                                 Name="MouseWithoutBordersDisableEasyMouseWhenForegroundWindowIsFullscreenExcludedApps"
-                                x:Uid="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen_ExcludedApps"
                                 HorizontalContentAlignment="Stretch"
                                 ContentAlignment="Vertical">
                                 <TextBox
@@ -334,57 +353,45 @@
                     Name="MouseWithoutBordersKeyboardShortcutsGroup"
                     x:Uid="MouseWithoutBorders_KeyboardShortcuts_Group"
                     IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersToggleEasyMouseShortcut"
-                        x:Uid="MouseWithoutBorders_ToggleEasyMouseShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AllowDisable="True"
-                            HotkeySettings="{x:Bind Path=ViewModel.ToggleEasyMouseShortcut, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
+                    <tkcontrols:SettingsExpander x:Uid="MouseWithoutBorders_Shortcuts" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersToggleEasyMouseShortcut" x:Uid="MouseWithoutBorders_ToggleEasyMouseShortcut">
+                                <controls:ShortcutControl
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AllowDisable="True"
+                                    HotkeySettings="{x:Bind Path=ViewModel.ToggleEasyMouseShortcut, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersLockMachinesShortcut" x:Uid="MouseWithoutBorders_LockMachinesShortcut">
+                                <controls:ShortcutControl
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AllowDisable="True"
+                                    HotkeySettings="{x:Bind Path=ViewModel.LockMachinesShortcut, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
 
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersLockMachinesShortcut"
-                        x:Uid="MouseWithoutBorders_LockMachinesShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AllowDisable="True"
-                            HotkeySettings="{x:Bind Path=ViewModel.LockMachinesShortcut, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersSwitch2AllPcShortcut" x:Uid="MouseWithoutBorders_Switch2AllPcShortcut">
+                                <controls:ShortcutControl
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AllowDisable="True"
+                                    HotkeySettings="{x:Bind Path=ViewModel.HotKeySwitch2AllPC, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
 
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersSwitch2AllPcShortcut"
-                        x:Uid="MouseWithoutBorders_Switch2AllPcShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AllowDisable="True"
-                            HotkeySettings="{x:Bind Path=ViewModel.HotKeySwitch2AllPC, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersReconnectShortcut" x:Uid="MouseWithoutBorders_ReconnectShortcut">
+                                <controls:ShortcutControl
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AllowDisable="True"
+                                    HotkeySettings="{x:Bind Path=ViewModel.ReconnectShortcut, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
 
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersReconnectShortcut"
-                        x:Uid="MouseWithoutBorders_ReconnectShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AllowDisable="True"
-                            HotkeySettings="{x:Bind Path=ViewModel.ReconnectShortcut, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersSwitchBetweenMachineShortcut"
-                        x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind Path=ViewModel.SelectedSwitchBetweenMachineShortcutOptionsIndex, Mode=TwoWay}">
-                            <!--  These should be in the same order as the array items in MouseWithoutBordersViewModel.cs  -->
-                            <ComboBoxItem x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut_F1" />
-                            <ComboBoxItem x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut_1" />
-                            <ComboBoxItem x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut_Disabled" />
-                        </ComboBox>
-                    </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard Name="MouseWithoutBordersSwitchBetweenMachineShortcut" x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut">
+                                <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind Path=ViewModel.SelectedSwitchBetweenMachineShortcutOptionsIndex, Mode=TwoWay}">
+                                    <!--  These should be in the same order as the array items in MouseWithoutBordersViewModel.cs  -->
+                                    <ComboBoxItem x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut_F1" />
+                                    <ComboBoxItem x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut_1" />
+                                    <ComboBoxItem x:Uid="MouseWithoutBorders_SwitchBetweenMachineShortcut_Disabled" />
+                                </ComboBox>
+                            </tkcontrols:SettingsCard>
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup
                     x:Name="AdvancedSettingsGroup"

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -76,7 +76,6 @@
                     x:Uid="Shell_Search_ShowAll"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Center"
-                    Text="Show all results"
                     TextAlignment="Center" />
             </Grid>
         </DataTemplate>
@@ -259,7 +258,7 @@
                 <!--  Windowing & Layouts  -->
                 <NavigationViewItem
                     x:Name="WindowingAndLayoutsNavigationItem"
-                    x:Uid="Shell_TopLevelWindowsAndLayouts "
+                    x:Uid="Shell_TopLevelWindowsAndLayouts"
                     AutomationProperties.AutomationId="WindowingAndLayoutsNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/WindowingAndLayouts.png}"
                     SelectsOnInvoked="False">

src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml

@@ -16,15 +16,6 @@
         <converters:ZoomItTypeSpeedSliderConverter x:Key="ZoomItTypeSpeedSliderConverter" />
         <converters:ZoomItOpacitySliderConverter x:Key="ZoomItOpacitySliderConverter" />
         <converters:HotkeySettingsToLocalizedStringConverter x:Key="HotkeySettingsToLocalizedStringConverter" />
-        <tkcontrols:MarkdownThemes
-            x:Key="ZoomItMarkdownThemeConfig"
-            InlineCodeBackground="{StaticResource ControlFillColorDefaultBrush}"
-            InlineCodeBorderBrush="{StaticResource ControlElevationBorderBrush}"
-            InlineCodeCornerRadius="2"
-            InlineCodeFontSize="12"
-            InlineCodeForeground="{StaticResource TextFillColorSecondaryBrush}"
-            InlineCodePadding="2,0,2,1" />
-        <tkcontrols:MarkdownConfig x:Key="ZoomItMarkdownConfig" Themes="{StaticResource ZoomItMarkdownThemeConfig}" />
     </local:NavigablePage.Resources>
     <controls:SettingsPageControl
         x:Uid="ZoomIt"
@@ -78,7 +69,7 @@
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_ZoomFAQ" Config="{StaticResource ZoomItMarkdownConfig}" />
+                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_ZoomFAQ" Config="{StaticResource DescriptionTextMarkdownConfig}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -94,7 +85,7 @@
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock Config="{StaticResource ZoomItMarkdownConfig}" Text="{x:Bind ViewModel.LiveZoomToggleKeyDraw, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_LiveZoom_Shortcut_Draw}" />
+                                    <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.LiveZoomToggleKeyDraw, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_LiveZoom_Shortcut_Draw}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -110,7 +101,7 @@
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_DrawFAQ" Config="{StaticResource ZoomItMarkdownConfig}" />
+                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_DrawFAQ" Config="{StaticResource DescriptionTextMarkdownConfig}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -124,25 +115,24 @@
                         IsExpanded="True">
                         <tkcontrols:SettingsExpander.Description>
                             <TextBlock
+                                x:Uid="ZoomIt_Type_DemoSample"
                                 FontFamily="{x:Bind ViewModel.DemoSampleFontFamily, Mode=OneWay}"
                                 FontSize="{x:Bind ViewModel.DemoSampleFontSize, Mode=OneWay}"
                                 FontStyle="{x:Bind ViewModel.DemoSampleFontStyle, Mode=OneWay}"
                                 FontWeight="{x:Bind ViewModel.DemoSampleFontWeight, Mode=OneWay}"
-                                Text="Sample"
                                 TextDecorations="{x:Bind ViewModel.DemoSampleTextDecoration, Mode=OneWay}" />
                         </tkcontrols:SettingsExpander.Description>
                         <Button x:Uid="ZoomIt_Type_Font_Button" Command="{x:Bind ViewModel.SelectTypeFontCommand, Mode=OneWay}" />
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_TypeFAQ" Config="{StaticResource ZoomItMarkdownConfig}" />
+                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_TypeFAQ" Config="{StaticResource DescriptionTextMarkdownConfig}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
                     </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="ZoomIt_DemoTypeGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-
                     <tkcontrols:SettingsExpander
                         Name="ZoomItDemoTypeShortcut"
                         x:Uid="ZoomIt_DemoType_Shortcut"
@@ -169,7 +159,7 @@
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard Name="ZoomItDemoTypeShortcutReset">
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock Config="{StaticResource ZoomItMarkdownConfig}" Text="{x:Bind ViewModel.DemoTypeToggleKeyReset, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_DemoTypeFAQ}" />
+                                    <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.DemoTypeToggleKeyReset, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_DemoTypeFAQ}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -252,7 +242,7 @@
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_BreakFAQ" Config="{StaticResource ZoomItMarkdownConfig}" />
+                                    <tkcontrols:MarkdownTextBlock x:Uid="ZoomIt_BreakFAQ" Config="{StaticResource DescriptionTextMarkdownConfig}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -305,9 +295,9 @@
                             <tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard.Description>
                                     <StackPanel Orientation="Vertical" Spacing="4">
-                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource ZoomItMarkdownConfig}" Text="{x:Bind ViewModel.RecordToggleKey, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Record_Shortcut_FullScreen}" />
-                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource ZoomItMarkdownConfig}" Text="{x:Bind ViewModel.RecordToggleKeyCrop, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Record_Shortcut_Crop}" />
-                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource ZoomItMarkdownConfig}" Text="{x:Bind ViewModel.RecordToggleKeyWindow, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Record_Shortcut_Window}" />
+                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.RecordToggleKey, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Record_Shortcut_FullScreen}" />
+                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.RecordToggleKeyCrop, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Record_Shortcut_Crop}" />
+                                        <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.RecordToggleKeyWindow, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Record_Shortcut_Window}" />
                                     </StackPanel>
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
@@ -324,7 +314,7 @@
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard Name="ZoomItSnipShortcutSave">
                                 <tkcontrols:SettingsCard.Description>
-                                    <tkcontrols:MarkdownTextBlock Config="{StaticResource ZoomItMarkdownConfig}" Text="{x:Bind ViewModel.SnipToggleKeySave, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Snip_Shortcut_Save}" />
+                                    <tkcontrols:MarkdownTextBlock Config="{StaticResource DescriptionTextMarkdownConfig}" Text="{x:Bind ViewModel.SnipToggleKeySave, Mode=OneWay, Converter={StaticResource HotkeySettingsToLocalizedStringConverter}, ConverterParameter=ZoomIt_Snip_Shortcut_Save}" />
                                 </tkcontrols:SettingsCard.Description>
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>

src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs

@@ -134,9 +134,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     Settings.Properties.Hotkey.Value = _hotkey;
                     NotifyPropertyChanged();
 
-                    // Also notify that transparency keys have changed
-                    OnPropertyChanged(nameof(IncreaseOpacityKeysList));
-                    OnPropertyChanged(nameof(DecreaseOpacityKeysList));
+                    // Also notify that transparency shortcut strings have changed
+                    OnPropertyChanged(nameof(IncreaseOpacityShortcut));
+                    OnPropertyChanged(nameof(DecreaseOpacityShortcut));
 
                     // Using InvariantCulture as this is an IPC message
                     SendConfigMSG(
@@ -295,61 +295,31 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         }
 
         /// <summary>
-        /// Gets the keys list for increasing window opacity (modifier keys + "+").
+        /// Gets the formatted shortcut string for increasing window opacity (modifier keys + "+").
         /// </summary>
-        public List<object> IncreaseOpacityKeysList
+        public string IncreaseOpacityShortcut
         {
             get
             {
-                var keys = GetModifierKeysList();
-                keys.Add("+");
-                return keys;
+                var modifiers = new HotkeySettings(_hotkey.Win, _hotkey.Ctrl, _hotkey.Alt, _hotkey.Shift, 0).ToString();
+                var shortcut = string.IsNullOrEmpty(modifiers) ? "+" : modifiers + " + +";
+                return string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("AlwaysOnTop_IncreaseOpacity"), shortcut);
             }
         }
 
         /// <summary>
-        /// Gets the keys list for decreasing window opacity (modifier keys + "-").
+        /// Gets the formatted shortcut string for decreasing window opacity (modifier keys + "-").
         /// </summary>
-        public List<object> DecreaseOpacityKeysList
+        public string DecreaseOpacityShortcut
         {
             get
             {
-                var keys = GetModifierKeysList();
-                keys.Add("-");
-                return keys;
+                var modifiers = new HotkeySettings(_hotkey.Win, _hotkey.Ctrl, _hotkey.Alt, _hotkey.Shift, 0).ToString();
+                var shortcut = string.IsNullOrEmpty(modifiers) ? "-" : modifiers + " + -";
+                return string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("AlwaysOnTop_DecreaseOpacity"), shortcut);
             }
         }
 
-        /// <summary>
-        /// Gets only the modifier keys from the current hotkey setting.
-        /// </summary>
-        private List<object> GetModifierKeysList()
-        {
-            var modifierKeys = new List<object>();
-
-            if (_hotkey.Win)
-            {
-                modifierKeys.Add(92); // The Windows key
-            }
-
-            if (_hotkey.Ctrl)
-            {
-                modifierKeys.Add("Ctrl");
-            }
-
-            if (_hotkey.Alt)
-            {
-                modifierKeys.Add("Alt");
-            }
-
-            if (_hotkey.Shift)
-            {
-                modifierKeys.Add(16); // The Shift key
-            }
-
-            return modifierKeys;
-        }
-
         public void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
         {
             OnPropertyChanged(propertyName);