From 3385d1d741326350f809d916e2ffb11376e97129 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 11 Feb 2026 23:00:11 +0100
Subject: [PATCH] [Settings] UX fixes (#45513)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 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>
---
 .../Settings.UI/SettingsXAML/App.xaml         |  11 +
 .../CheckBoxWithDescriptionControl.cs         |   9 +-
 .../Dashboard/ShortcutConflictWindow.xaml     |   2 +-
 .../Controls/IsEnabledTextBlock.xaml          |   3 +
 .../Controls/IsEnabledTextBlock.xaml.cs       |  16 +-
 .../ModelPicker/FoundryLocalModelPicker.xaml  |   8 +-
 .../OOBE/Views/OobeOverviewAlternate.xaml     |   1 -
 .../SettingsXAML/Views/AdvancedPastePage.xaml |   6 +-
 .../SettingsXAML/Views/AlwaysOnTopPage.xaml   |  37 +-
 .../SettingsXAML/Views/CmdPalPage.xaml        |   5 +-
 .../SettingsXAML/Views/GeneralPage.xaml       |   2 +-
 .../SettingsXAML/Views/HostsPage.xaml         |   7 +-
 .../Views/MouseWithoutBordersPage.xaml        | 235 +++---
 .../SettingsXAML/Views/ShellPage.xaml         |   3 +-
 .../SettingsXAML/Views/ZoomItPage.xaml        |  32 +-
 .../Settings.UI/Strings/en-us/Resources.resw  | 706 +++---------------
 .../ViewModels/AlwaysOnTopViewModel.cs        |  56 +-
 17 files changed, 316 insertions(+), 823 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
index 54b1e1a02f..57cc0fb1ec 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
+++ b/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  -->
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs
index d8b5b6e31a..854bf8cd72 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs
+++ b/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)));
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml
index 11d9b5f7b0..5673345cff 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml
+++ b/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>
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml
index 1c2366ffbe..a1f446917b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml
+++ b/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>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml.cs
index 82c6b3a986..e7f8a52f25 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock.xaml.cs
+++ b/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();
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml
index adc802eba9..0177295546 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml
+++ b/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
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
index 713a082d86..7373133878 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
+++ b/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"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
index 81f43d3420..bc2c9d2840 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
+++ b/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
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
index f36483ffb1..deab4915ef 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/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}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
index a5cea1ef2c..b34a516f58 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
+++ b/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}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index a68f93dad8..e4fcf03bb3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/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>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
index 29b4ac56cd..0e40606095 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
+++ b/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}"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
index 63afc29fbf..901c5634c4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/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"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
index 6a64fdea83..56bc838161 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/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">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
index 0177d1158f..88496afab6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
+++ b/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>
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 498f9b55d0..aa500a6b77 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -151,10 +151,6 @@
     <value>Customize the shortcut to bring up the command bar</value>
     <comment>"Screen Ruler" is the name of the utility</comment>
   </data>
-  <data name="Shell_DebugLabel.Text" xml:space="preserve">
-    <value>Debug</value>
-    <comment>Debug label visible in title bar when debugging</comment>
-  </data>
   <data name="Shell_SearchBox.PlaceholderText" xml:space="preserve">
     <value>Search for settings</value>
     <comment>Placeholder in settings search box</comment>
@@ -163,10 +159,6 @@
     <value>No results for</value>
     <comment>Prefix used in the no-results row; the query is appended in code, e.g., "No results for 'abc'"</comment>
   </data>
-  <data name="Shell_Search_ShowAll" xml:space="preserve">
-    <value>Show all results</value>
-    <comment>Tail item text to navigate to full results</comment>
-  </data>
   <data name="MeasureTool_DefaultMeasureStyle.Header" xml:space="preserve">
     <value>Default mode</value>
   </data>
@@ -250,7 +242,7 @@
     <value>Security key</value>
   </data>
   <data name="MouseWithoutBorders_SecurityKey.Description" xml:space="preserve">
-    <value>To set up, generate the key on one machine, and enter it manually on other machines.</value>
+    <value>To set up, generate the key on one machine, and enter it manually on other machines</value>
   </data>
   <data name="MouseWithoutBorders_NewKey.Content" xml:space="preserve">
     <value>New key</value>
@@ -262,7 +254,7 @@
     <value>Refresh connections</value>
   </data>
   <data name="MouseWithoutBorders_ReconnectTooltip.Text" xml:space="preserve">
-    <value>Reestablishes connections with other devices if you are experiencing issues.</value>
+    <value>Reestablishes connections with other devices if issues occur</value>
   </data>
   <data name="MouseWithoutBorders_ThisMachineNameLabel.Header" xml:space="preserve">
     <value>Host name of this device</value>
@@ -274,7 +266,7 @@
     <value>Uninstall service</value>
   </data>
   <data name="MouseWithoutBorders_UninstallService.Description" xml:space="preserve">
-    <value>Removes the service from the computer. Needs to run as administrator.</value>
+    <value>Removes the service from the computer; administrator access is required</value>
   </data>
   <data name="MouseWithoutBorders_Settings.Header" xml:space="preserve">
     <value>Behavior</value>
@@ -287,7 +279,7 @@
     <comment>"Mouse Without Borders" is a product name</comment>
   </data>
   <data name="MouseWithoutBorders_AddFirewallRuleButtonControl.Description" xml:space="preserve">
-    <value>Adding a firewall rule might help solve connection issues.</value>
+    <value>Adding a firewall rule might help solve connection issues</value>
   </data>
   <data name="MouseWithoutBorders_RunAsAdminText.Title" xml:space="preserve">
     <value>This setting can only be changed when running as administrator</value>
@@ -317,25 +309,22 @@
     <value>Use Service</value>
   </data>
   <data name="MouseWithoutBorders_UseService.Description" xml:space="preserve">
-    <value>Runs in service mode, that allows MWB to control remote machines when they're locked. Also allows control of system and administrator applications.</value>
+    <value>Runs in service mode, allowing MWB to control locked remote machines and system or administrator applications</value>
   </data>
   <data name="MouseWithoutBorders_MatrixOneRow.Header" xml:space="preserve">
     <value>Devices in a single row</value>
   </data>
   <data name="MouseWithoutBorders_MatrixOneRow.Description" xml:space="preserve">
-    <value>Sets whether the devices are aligned on a single row. A two by two matrix is considered otherwise.</value>
+    <value>Sets whether the devices are aligned on a single row. A two by two matrix is considered otherwise</value>
   </data>
-  <data name="MouseWithoutBorders_WrapMouse.Header" xml:space="preserve">
-    <value>Wrap mouse</value>
-  </data>
-  <data name="MouseWithoutBorders_WrapMouse.Description" xml:space="preserve">
-    <value>Move control back to the first machine when mouse moves past the last one.</value>
+  <data name="MouseWithoutBorders_WrapMouse.Content" xml:space="preserve">
+    <value>Move the mouse back to the first machine when it passes the last one</value>
   </data>
   <data name="MouseWithoutBorders_ShareClipboard.Header" xml:space="preserve">
     <value>Share clipboard</value>
   </data>
-  <data name="MouseWithoutBorders_TransferFile.Header" xml:space="preserve">
-    <value>Transfer file</value>
+  <data name="MouseWithoutBorders_TransferFile.Content" xml:space="preserve">
+    <value>Transfer copied files to the remote machine’s clipboard (up to 100 MB)</value>
   </data>
   <data name="MouseWithoutBorders_HideMouseAtScreenEdge.Header" xml:space="preserve">
     <value>Hide mouse at the screen edge</value>
@@ -343,6 +332,9 @@
   <data name="MouseWithoutBorders_DrawMouseCursor.Header" xml:space="preserve">
     <value>Draw mouse cursor</value>
   </data>
+  <data name="MouseWithoutBorders_MouseBehavior.Header" xml:space="preserve">
+    <value>Mouse behavior</value>
+  </data>
   <data name="MouseWithoutBorders_ValidateRemoteMachineIP.Header" xml:space="preserve">
     <value>Validate remote machine IP</value>
   </data>
@@ -355,8 +347,8 @@
   <data name="MouseWithoutBorders_MoveMouseRelatively.Header" xml:space="preserve">
     <value>Move mouse relatively</value>
   </data>
-  <data name="MouseWithoutBorders_BlockMouseAtScreenCorners.Header" xml:space="preserve">
-    <value>Block mouse at screen corners</value>
+  <data name="MouseWithoutBorders_BlockMouseAtScreenCorners.Content" xml:space="preserve">
+    <value>Block mouse at screen corners to avoid accident machine-switch at screen corners</value>
   </data>
   <data name="MouseWithoutBorders_ShowClipboardAndNetworkStatusMessages.Header" xml:space="preserve">
     <value>Show clipboard and network status messages</value>
@@ -365,22 +357,19 @@
     <value>Show the original Mouse Without Borders UI</value>
   </data>
   <data name="MouseWithoutBorders_ShowOriginalUI.Description" xml:space="preserve">
-    <value>This is accessible from the system tray and requires a restart.</value>
+    <value>This is accessible from the system tray and requires a restart</value>
   </data>
   <data name="MouseWithoutBorders_ShareClipboard.Description" xml:space="preserve">
-    <value>If share clipboard stops working, Ctrl+Alt+Del then Esc may solve the problem.</value>
-  </data>
-  <data name="MouseWithoutBorders_TransferFile.Description" xml:space="preserve">
-    <value>If a file (&lt;100MB) is copied, it will be transferred to the remote machine clipboard.</value>
+    <value>If share clipboard stops working, Ctrl+Alt+Del then Esc may solve the problem</value>
   </data>
   <data name="MouseWithoutBorders_HideMouseAtScreenEdge.Description" xml:space="preserve">
-    <value>Hide the mouse cursor at the top edge of the screen when switching to other machine. This option also steals the focus from any full-screen app to ensure the keyboard input is redirected.</value>
+    <value>Hide the cursor at the top edge when switching to another machine, and take focus from full-screen apps to ensure keyboard input is redirected</value>
   </data>
   <data name="MouseWithoutBorders_DrawMouseCursor.Description" xml:space="preserve">
-    <value>The mouse cursor may not appear on Windows 10 and later if no physical mouse is connected.</value>
+    <value>The mouse cursor may not appear on Windows 10 and later if no physical mouse is connected</value>
   </data>
   <data name="MouseWithoutBorders_ValidateRemoteMachineIP.Description" xml:space="preserve">
-    <value>Reverse DNS lookup to validate machine IP Address.</value>
+    <value>Reverse DNS lookup to validate machine IP address</value>
   </data>
   <data name="MouseWithoutBorders_SameSubnetOnly.Description" xml:space="preserve">
     <value>Only connect to machines in the same intranet NNN.NNN.*.* (only works when both machines have IPv4 enabled)</value>
@@ -393,16 +382,13 @@
     <value>IP address mapping</value>
   </data>
   <data name="MouseWithoutBorders_IPAddressMapping.Description" xml:space="preserve">
-    <value>Resolve machine's IP address using manually entered mappings below.</value>
+    <value>Resolve machine's IP address using manually entered mappings below</value>
   </data>
   <data name="MouseWithoutBorders_BlockScreenSaverOnOtherMachines.Description" xml:space="preserve">
-    <value>Prevent screen saver from starting on other machines when user is actively working on this machine.</value>
+    <value>Prevent screen saver from starting on other machines when user is actively working on this machine</value>
   </data>
   <data name="MouseWithoutBorders_MoveMouseRelatively.Description" xml:space="preserve">
-    <value>Use this option when remote machine's monitor settings are different, or remote machine has multiple monitors.</value>
-  </data>
-  <data name="MouseWithoutBorders_BlockMouseAtScreenCorners.Description" xml:space="preserve">
-    <value>To avoid accident machine-switch at screen corners.</value>
+    <value>Use this option when remote machine's monitor settings are different, or remote machine has multiple monitors</value>
   </data>
   <data name="MouseWithoutBorders_ShowClipboardAndNetworkStatusMessages.Description" xml:space="preserve">
     <value>Show clipboard activities and network status in system tray notifications</value>
@@ -412,16 +398,16 @@
     <comment>keyboard is the hardware peripheral</comment>
   </data>
   <data name="MouseWithoutBorders_AdvancedSettings_Group.Header" xml:space="preserve">
-    <value>Advanced Settings</value>
+    <value>Advanced settings</value>
   </data>
   <data name="MouseWithoutBorders_EasyMouseSettings_Group.Header" xml:space="preserve">
     <value>Easy Mouse</value>
   </data>
   <data name="MouseWithoutBorders_EasyMouseOption.Header" xml:space="preserve">
-    <value>Easy Mouse: move between machines by moving the mouse pointer to the screen edges.</value>
+    <value>Easy Mouse: move between machines by moving the mouse pointer to the screen edges</value>
   </data>
   <data name="MouseWithoutBorders_EasyMouseOption.Description" xml:space="preserve">
-    <value>Can also be set to move only when pressing Shift or Ctrl.</value>
+    <value>Can also be set to move only when pressing Shift or Ctrl</value>
     <comment>Shift and Ctrl are the keyboard keys</comment>
   </data>
   <data name="MouseWithoutBorders_EasyMouseOption_Disabled.Content" xml:space="preserve">
@@ -439,13 +425,13 @@
     <comment>This is the Shift keyboard key</comment>
   </data>
   <data name="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen.Header" xml:space="preserve">
-    <value>Disable Easy Mouse when an application is running in full screen.</value>
+    <value>Disable Easy Mouse when an application is running in full screen</value>
   </data>
   <data name="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen.Description" xml:space="preserve">
-    <value>Prevent Easy Mouse from moving to another machine when an application is in full-screen mode.</value>
+    <value>Prevent Easy Mouse from moving to another machine when an application is in full-screen mode</value>
   </data>
   <data name="MouseWithoutBorders_CanOnlyStopEasyMouseIfMovingFromHostMachine.Title" xml:space="preserve">
-    <value>Disabling Easy Mouse in full-screen mode only affects the host PC. It won’t stop the mouse from moving away from remote machines.</value>
+    <value>Disabling Easy Mouse in full-screen mode only affects the host PC and does not prevent the mouse from moving away from remote machines</value>
   </data>
   <data name="MouseWithoutBorders_DisableEasyMouseWhenForegroundWindowIsFullscreen_TextBoxControl.PlaceholderText" xml:space="preserve">
     <value>msedge.exe
@@ -460,27 +446,30 @@ opera.exe</value>
     <value>Allow Easy Mouse to move between machines even if one of these applications is running in full screen, separate each executable with a new line.</value>
   </data>
   <data name="MouseWithoutBorders_LockMachinesShortcut.Header" xml:space="preserve">
-    <value>Shortcut to lock all machines.</value>
+    <value>Lock all machines</value>
   </data>
   <data name="MouseWithoutBorders_LockMachinesShortcut.Description" xml:space="preserve">
-    <value>Hit this hotkey twice to lock all machines. Note: Only the machines which have the same shortcut configured will be locked.</value>
+    <value>Press this hotkey twice to lock all machines, noting that only machines with the same shortcut configured will be locked</value>
+  </data>
+  <data name="MouseWithoutBorders_Shortcuts.Header" xml:space="preserve">
+    <value>Shortcuts</value>
+  </data>
+  <data name="MouseWithoutBorders_Shortcuts.Description" xml:space="preserve">
+    <value>Configure shortcuts to quickly control features</value>
   </data>
   <data name="MouseWithoutBorders_ToggleEasyMouseShortcut.Header" xml:space="preserve">
-    <value>Shortcut to toggle Easy Mouse.</value>
+    <value>Turn Easy Mouse on or off</value>
     <comment>Ctrl and Alt are the keyboard keys</comment>
   </data>
   <data name="MouseWithoutBorders_ToggleEasyMouseShortcut.Description" xml:space="preserve">
-    <value>Only works if EasyMouse is set to Enabled or Disabled.</value>
-  </data>
-  <data name="MouseWithoutBorders_ToggleEasyMouseShortcut_Disabled.Content" xml:space="preserve">
-    <value>Disabled</value>
+    <value>Only works if EasyMouse is set to Enabled or Disabled</value>
   </data>
   <data name="MouseWithoutBorders_SwitchBetweenMachineShortcut.Header" xml:space="preserve">
-    <value>Shortcut to switch between machines. Ctrl+Alt+:</value>
+    <value>Switching between machines</value>
     <comment>Ctrl and Alt are the keyboard keys</comment>
   </data>
   <data name="MouseWithoutBorders_SwitchBetweenMachineShortcut.Description" xml:space="preserve">
-    <value>Click on Ctrl+Alt+ the chosen option to switch between machines.</value>
+    <value> Ctrl+Alt+:</value>
     <comment>Ctrl and Alt are the keyboard keys</comment>
   </data>
   <data name="MouseWithoutBorders_SwitchBetweenMachineShortcut_F1.Content" xml:space="preserve">
@@ -491,33 +480,11 @@ opera.exe</value>
     <value>1, 2, 3, 4</value>
     <comment>Don't localize. These are keyboard keys</comment>
   </data>
-  <data name="MouseWithoutBorders_SwitchBetweenMachineShortcut_Disabled.Content" xml:space="preserve">
-    <value>Disabled</value>
-  </data>
-  <data name="MouseWithoutBorders_LockMachinesShortcut_Disabled.Content" xml:space="preserve">
-    <value>Disabled</value>
-  </data>
   <data name="MouseWithoutBorders_ReconnectShortcut.Header" xml:space="preserve">
-    <value>Shortcut to try reconnecting</value>
-  </data>
-  <data name="MouseWithoutBorders_ReconnectShortcut.Description" xml:space="preserve">
-    <value>Just in case the connection is lost for any reason.</value>
-  </data>
-  <data name="MouseWithoutBorders_ReconnectShortcut_Disabled.Content" xml:space="preserve">
-    <value>Disabled</value>
+    <value>Try reconnecting when connection is lost</value>
   </data>
   <data name="MouseWithoutBorders_Switch2AllPcShortcut.Header" xml:space="preserve">
-    <value>Shortcut to switch to multiple machine mode.</value>
-  </data>
-  <data name="MouseWithoutBorders_Switch2AllPcShortcut.Description" xml:space="preserve">
-    <value>Allows controlling all computers at once.</value>
-  </data>
-  <data name="MouseWithoutBorders_Switch2AllPcShortcut_Disabled.Content" xml:space="preserve">
-    <value>Disabled</value>
-  </data>
-  <data name="MouseWithoutBorders_Switch2AllPcShortcut_Ctrl3.Content" xml:space="preserve">
-    <value>Ctrl three times</value>
-    <comment>This is the Ctrl keyboard key</comment>
+    <value>Control all computes are once</value>
   </data>
   <data name="Shell_General.Content" xml:space="preserve">
     <value>General</value>
@@ -579,10 +546,6 @@ opera.exe</value>
     <value>Navigation opened</value>
     <comment>Accessibility announcement when the navigation pane opens</comment>
   </data>
-  <data name="KeyboardManager_ConfigHeader.Text" xml:space="preserve">
-    <value>Current configuration</value>
-    <comment>Keyboard Manager current configuration header</comment>
-  </data>
   <data name="KeyboardManager.ModuleDescription" xml:space="preserve">
     <value>Reconfigure your keyboard by remapping keys and shortcuts</value>
     <comment>Keyboard Manager page description</comment>
@@ -591,10 +554,6 @@ opera.exe</value>
     <value>Keyboard Manager</value>
     <comment>Keyboard Manager enable toggle header. Do not loc the Product name. Do you want this feature on / off</comment>
   </data>
-  <data name="KeyboardManager_ProfileDescription.Text" xml:space="preserve">
-    <value>Select the profile to display the active key remap and shortcuts</value>
-    <comment>Keyboard Manager configuration dropdown description</comment>
-  </data>
   <data name="KeyboardManager_RemapKeyboardButton.Header" xml:space="preserve">
     <value>Remap a key</value>
     <comment>Keyboard Manager remap keyboard button content</comment>
@@ -615,33 +574,12 @@ opera.exe</value>
     <value>All Apps</value>
     <comment>Should be the same as EditShortcuts_AllApps from keyboard manager editor</comment>
   </data>
-  <data name="Shortcuts.Header" xml:space="preserve">
-    <value>Shortcuts</value>
-  </data>
   <data name="Shortcut.Header" xml:space="preserve">
     <value>Shortcut</value>
   </data>
-  <data name="AdvancedPaste_EnableAIButton.Content" xml:space="preserve">
-    <value>Enable</value>
-  </data>
-  <data name="AdvancedPaste_DisableAIButton.Content" xml:space="preserve">
-    <value>Disable</value>
-  </data>
   <data name="AdvancedPaste_EnableAISettingsCard.Header" xml:space="preserve">
     <value>Paste with AI</value>
   </data>
-  <data name="AdvancedPaste_EnableAIDialogMarkdown.Text" xml:space="preserve">
-    <value>## Preview Terms
-
-Please review the placeholder content that represents the final terms and usage guidance for Advanced Paste.
-
-1. This is sample information.
-2. Real policy content will be provided later.
-3. Continue only if you are comfortable with the above.</value>
-  </data>
-  <data name="AdvancedPaste_EnableAIDialogAcceptanceCheckBox.Content" xml:space="preserve">
-    <value>I have read and accept the information above.</value>
-  </data>
   <data name="AdvancedPaste_EnablePasteAIModerationToggle.Header" xml:space="preserve">
     <value>OpenAI content moderation</value>
   </data>
@@ -737,17 +675,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="KeyboardManager_RemappedTo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Remapped to</value>
   </data>
-  <data name="KeyboardManager_ShortcutRemappedTo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Remapped to</value>
-  </data>
-  <data name="KeyboardManager_TargetApp.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>For target application</value>
-    <comment>What computer application would this be for</comment>
-  </data>
-  <data name="KeyboardManager_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Keyboard Manager</value>
-    <comment>do not loc, product name</comment>
-  </data>
   <data name="ColorPicker.ModuleDescription" xml:space="preserve">
     <value>Quick and simple system-wide color picker.</value>
   </data>
@@ -863,21 +790,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="PowerLauncher_SlowSearchInputDelayMs.Description" xml:space="preserve">
     <value>Affects the plugins that execute in the background by this amount. Recommended: 100-150 ms.</value>
   </data>
-  <data name="PowerLauncher_SearchInputDelayMs.Header" xml:space="preserve">
-    <value>Fast plugin throttle (ms)</value>
-    <comment>ms = milliseconds</comment>
-  </data>
-  <data name="KeyboardManager_KeysMappingLayoutRightHeader.Text" xml:space="preserve">
-    <value>To:</value>
-    <comment>Keyboard Manager mapping keys view right header</comment>
-  </data>
-  <data name="Appearance_GroupSettings.Text" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
-  <data name="Fancyzones_ImageHyperlinkToDocs.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>FancyZones windows</value>
-    <comment>{Locked="FancyZones"}</comment>
-  </data>
   <data name="FancyZones.ModuleDescription" xml:space="preserve">
     <value>Create window layouts to help make multi-tasking easy.</value>
     <comment>windows refers to application windows</comment>
@@ -899,10 +811,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="FancyZones_HighlightOpacity.Header" xml:space="preserve">
     <value>Opacity (%)</value>
   </data>
-  <data name="FancyZones_HotkeyEditorControl.Header" xml:space="preserve">
-    <value>Open layout editor</value>
-    <comment>Shortcut to launch the FancyZones layout editor application</comment>
-  </data>
   <data name="FancyZones_WindowSwitching_GroupSettings.Header" xml:space="preserve">
     <value>Switch between windows in the current zone</value>
   </data>
@@ -912,12 +820,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="FancyZones_HotkeyPrevTabControl.Header" xml:space="preserve">
     <value>Previous window</value>
   </data>
-  <data name="SettingsPage_SetShortcut.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Shortcut setting</value>
-  </data>
-  <data name="SettingsPage_SetShortcut_Glyph.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Information Symbol</value>
-  </data>
   <data name="FancyZones_LaunchEditorButtonControl.Header" xml:space="preserve">
     <value>Open layout editor</value>
     <comment>launches the FancyZones layout editor application</comment>
@@ -991,10 +893,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="FancyZones_ZoneSetChangeMoveWindows.Content" xml:space="preserve">
     <value>During zone layout changes, windows assigned to a zone will match new size/positions</value>
   </data>
-  <data name="AttributionTitle.Text" xml:space="preserve">
-    <value>Attribution</value>
-    <comment>giving credit to the projects this utility was based on</comment>
-  </data>
   <data name="General.ModuleTitle" xml:space="preserve">
     <value>General</value>
   </data>
@@ -1022,9 +920,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="General_SettingsBackupAndRestore_ButtonSelectLocation.Text" xml:space="preserve">
     <value>Select folder</value>
   </data>
-  <data name="GeneralPage_UpdateNow.Content" xml:space="preserve">
-    <value>Update now</value>
-  </data>
   <data name="GeneralPage_PrivacyStatement_URL.Text" xml:space="preserve">
     <value>Privacy statement</value>
   </data>
@@ -1060,9 +955,6 @@ Please review the placeholder content that represents the final terms and usage
     <value>PowerRename</value>
     <comment>do not loc the Product name.  Do you want this feature on / off</comment>
   </data>
-  <data name="RadioButtons_Name_Theme.Text" xml:space="preserve">
-    <value>Settings theme</value>
-  </data>
   <data name="PowerRename_Toggle_HideIcon.Content" xml:space="preserve">
     <value>Hide icon in context menu</value>
   </data>
@@ -1277,9 +1169,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="ImagesSizesListView.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Image Size</value>
   </data>
-  <data name="ImageResizer_Configurations.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Configurations</value>
-  </data>
   <data name="ImageResizer_Name.Header" xml:space="preserve">
     <value>Name</value>
   </data>
@@ -1298,15 +1187,9 @@ Please review the placeholder content that represents the final terms and usage
   <data name="RemoveItem.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
-  <data name="ImageResizer_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Image Resizer</value>
-  </data>
   <data name="ImageResizer_AddSizeButton.Content" xml:space="preserve">
     <value>Add new size</value>
   </data>
-  <data name="ImageResizer_SaveSizeButton.Label" xml:space="preserve">
-    <value>Save sizes</value>
-  </data>
   <data name="ImageResizer_Encoding.Header" xml:space="preserve">
     <value>JPEG quality level (%)</value>
     <comment>{Locked="JPEG"}</comment>
@@ -1384,10 +1267,6 @@ Please review the placeholder content that represents the final terms and usage
     <value>Fill</value>
     <comment>Refers to filling an image into a certain size. It could overflow</comment>
   </data>
-  <data name="ImageResizer_Sizes_Fit_Fill_ThirdPersonSingular.Text" xml:space="preserve">
-    <value>Fill</value>
-    <comment>Refers to filling an image into a certain size. It could overflow</comment>
-  </data>
   <data name="ImageResizer_Sizes_Fit_Fit.Content" xml:space="preserve">
     <value>Fit</value>
     <comment>Refers to fitting an image into a certain size. It won't overflow</comment>
@@ -1423,9 +1302,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="GeneralPage_AutoDownloadAndInstallUpdates.Description" xml:space="preserve">
     <value>Except on metered connections</value>
   </data>
-  <data name="GeneralPage_ToggleSwitch_RunningAsAdminNote.Text" xml:space="preserve">
-    <value>Currently running as administrator</value>
-  </data>
   <data name="GeneralSettings_AlwaysRunAsAdminText.Header" xml:space="preserve">
     <value>Always run as administrator</value>
   </data>
@@ -1445,10 +1321,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="FileExplorerPreview.ModuleTitle" xml:space="preserve">
     <value>File Explorer</value>
   </data>
-  <data name="FileExplorerPreview_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>File Explorer</value>
-    <comment>Use same translation as Windows does for File Explorer</comment>
-  </data>
   <data name="ImageResizer.ModuleTitle" xml:space="preserve">
     <value>Image Resizer</value>
   </data>
@@ -1461,23 +1333,13 @@ Please review the placeholder content that represents the final terms and usage
   <data name="PowerLauncher.ModuleTitle" xml:space="preserve">
     <value>PowerToys Run</value>
   </data>
-  <data name="PowerToys_Run_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>PowerToys Run</value>
-  </data>
   <data name="PowerRename.ModuleTitle" xml:space="preserve">
     <value>PowerRename</value>
     <comment>do not loc the product name</comment>
   </data>
-  <data name="PowerRename_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>PowerRename</value>
-    <comment>do not loc</comment>
-  </data>
   <data name="ShortcutGuide.ModuleTitle" xml:space="preserve">
     <value>Shortcut Guide</value>
   </data>
-  <data name="Shortcut_Guide_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Shortcut Guide</value>
-  </data>
   <data name="General_Repository.Text" xml:space="preserve">
     <value>GitHub repository</value>
   </data>
@@ -1502,9 +1364,6 @@ Please review the placeholder content that represents the final terms and usage
   <data name="General_VersionAndUpdate.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Version and updates</value>
   </data>
-  <data name="Admin_mode.Header" xml:space="preserve">
-    <value>Administrator mode</value>
-  </data>
   <data name="FancyZones_RestoreSize.Content" xml:space="preserve">
     <value>Restore the original size of windows when unsnapping</value>
   </data>
@@ -1567,16 +1426,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="ImageResizer_Formatting_Sizename.Text" xml:space="preserve">
     <value>Size name</value>
   </data>
-  <data name="FancyZones_MoveWindowsBasedOnPositionCheckBoxControl.Content" xml:space="preserve">
-    <value>Move windows based on their position</value>
-    <comment>Windows refers to application windows</comment>
-  </data>
-  <data name="GeneralSettings_NewVersionIsAvailable" xml:space="preserve">
-    <value>New update available</value>
-  </data>
-  <data name="GeneralSettings_VersionIsLatest" xml:space="preserve">
-    <value>PowerToys is up to date.</value>
-  </data>
   <data name="FileExplorerPreview_IconThumbnail_GroupSettings.Header" xml:space="preserve">
     <value>Thumbnail icon Preview</value>
   </data>
@@ -1590,9 +1439,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Select the file types which must be rendered in the Preview Pane. Ensure that Preview Pane is open by toggling the view with Alt + P in File Explorer.</value>
     <comment>Preview Pane and File Explorer are app/feature names in Windows. 'Alt + P' is a shortcut</comment>
   </data>
-  <data name="FileExplorerPreview_RunAsAdminRequired.Title" xml:space="preserve">
-    <value>This setting can only be changed when running as administrator</value>
-  </data>
   <data name="FileExplorerPreview_RebootRequired.Title" xml:space="preserve">
     <value>A reboot may be required for changes to these settings to take effect</value>
   </data>
@@ -1731,9 +1577,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="PowerRename_AvifExtension_Installed.Text" xml:space="preserve">
     <value>Installed</value>
   </data>
-  <data name="MadeWithOssLove.Text" xml:space="preserve">
-    <value>Made with 💗 by Microsoft and the PowerToys community.</value>
-  </data>
   <data name="ColorPicker_ColorFormats.Header" xml:space="preserve">
     <value>Color formats</value>
   </data>
@@ -1977,9 +1820,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="PowerLauncher_EnablePluginToggle.OffContent" xml:space="preserve">
     <value>Off</value>
   </data>
-  <data name="Run_AdditionalOptions.Text" xml:space="preserve">
-    <value>Additional options</value>
-  </data>
   <data name="Run_NotAccessibleWarning.Title" xml:space="preserve">
     <value>Please define an activation command or allow this plugin to be used in the global results.</value>
   </data>
@@ -2018,12 +1858,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="Run_PluginsLoading.Text" xml:space="preserve">
     <value>Plugins are loading...</value>
   </data>
-  <data name="ColorPicker_ButtonDown.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Move the color down</value>
-  </data>
-  <data name="ColorPicker_ButtonUp.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Move the color up</value>
-  </data>
   <data name="FancyZones_FlashZonesOnQuickSwitch.Content" xml:space="preserve">
     <value>Flash zones when switching layout</value>
   </data>
@@ -2036,9 +1870,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="FancyZones_QuickLayoutSwitch.Description" xml:space="preserve">
     <value>Layout-specific shortcuts can be configured in the editor</value>
   </data>
-  <data name="FancyZones_QuickLayoutSwitch_GroupSettings.Text" xml:space="preserve">
-    <value>Quick layout switch</value>
-  </data>
   <data name="Activation_Shortcut.Header" xml:space="preserve">
     <value>Activation shortcut</value>
   </data>
@@ -2095,9 +1926,6 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="PasteAsJson_Shortcut.Header" xml:space="preserve">
     <value>Paste as JSON directly</value>
   </data>
-  <data name="PasteAsCustom_Shortcut.Header" xml:space="preserve">
-    <value>Paste as Custom with AI directly</value>
-  </data>
   <data name="ImageToText.Header" xml:space="preserve">
     <value>Image to text</value>
   </data>
@@ -2122,30 +1950,9 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="TranscodeToMp4.Header" xml:space="preserve">
     <value>Transcode to .mp4 (H.264/AAC)</value>
   </data>
-  <data name="EnableAIDialog_SaveBtnText" xml:space="preserve">
-    <value>Save</value>
-  </data>
-  <data name="EnableAIDialog_CancelBtnText" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <data name="Oobe_GetStarted.Text" xml:space="preserve">
-    <value>Let's get started!</value>
-  </data>
-  <data name="Oobe_PowerToysDescription.Text" xml:space="preserve">
-    <value>Welcome to PowerToys! These overviews will help you quickly learn the basics of all our utilities.</value>
-  </data>
-  <data name="Oobe_GettingStarted.Text" xml:space="preserve">
-    <value>Getting started</value>
-  </data>
-  <data name="Oobe_Launch.Text" xml:space="preserve">
-    <value>Launch</value>
-  </data>
   <data name="Launch_ColorPicker.Content" xml:space="preserve">
     <value>Open Color Picker</value>
   </data>
-  <data name="Oobe_LearnMore.Text" xml:space="preserve">
-    <value>Learn more about</value>
-  </data>
   <data name="Oobe_ColorPicker.Description" xml:space="preserve">
     <value>Color Picker is a system-wide color selection tool for Windows that enables you to pick colors from any currently running application and automatically copies it in a configurable format to your clipboard.</value>
   </data>
@@ -2204,51 +2011,12 @@ Take a moment to preview the various utilities listed or view our comprehensive
   <data name="Oobe_Overview_Hotkey_Conflict_Title.Text" xml:space="preserve">
     <value>Shortcut conflict detection</value>
   </data>
-  <data name="Oobe_Overview_Hotkey_Conflict_Card.Text" xml:space="preserve">
-    <value>Shortcuts configured by PowerToys are conflicting.</value>
-  </data>
   <data name="Oobe_Overview_Hotkey_Conflict_Card_Description.Header" xml:space="preserve">
     <value>Shortcuts configured by PowerToys are conflicting</value>
   </data>
-  <data name="Oobe_Overview_Hotkey_NoConflict_Card_Header" xml:space="preserve">
-    <value>No conflicts found</value>
-  </data>
-  <data name="Oobe_Overview_Hotkey_NoConflict_Card_Description" xml:space="preserve">
-    <value>All shortcuts function correctly</value>
-  </data>
   <data name="Oobe_Overview_DiagnosticsAndFeedback_Settings_Link.Content" xml:space="preserve">
     <value>View more diagnostic data settings</value>
   </data>
-  <data name="Oobe_Overview_DiagnosticsAndFeedback_Link.Content" xml:space="preserve">
-    <value>Learn more about the information PowerToys logs &amp; how it gets used</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_InfoBar.Header" xml:space="preserve">
-    <value>Turn on diagnostic data to help us improve PowerToys?</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_InfoBar_Desc.Text" xml:space="preserve">
-    <value>PowerToys diagnostic data is completely optional.</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_InfoBar_Button_Enable.Content" xml:space="preserve">
-    <value>Enable</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_Yes_Click_InfoBar_Title" xml:space="preserve">
-    <value>Thank you for helping to make PowerToys better!</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_No_Click_InfoBar_Title" xml:space="preserve">
-    <value>Preference updated.</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_Yes_Click_InfoBar_Desc.Text" xml:space="preserve">
-    <value>You can change this at any time from</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_Yes_Click_OpenSettings_Text.Text" xml:space="preserve">
-    <value>settings.</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_Button_Yes.Content" xml:space="preserve">
-    <value>Yes</value>
-  </data>
-  <data name="Oobe_WhatsNew_DataDiagnostics_Button_No.Content" xml:space="preserve">
-    <value>No</value>
-  </data>
   <data name="ReleaseNotes.Content" xml:space="preserve">
     <value>Release notes</value>
   </data>
@@ -2388,32 +2156,15 @@ From there, simply click on one of the supported files in the File Explorer and
   <data name="Oobe_Overview.Title" xml:space="preserve">
     <value>Welcome</value>
   </data>
-  <data name="Oobe_WhatsNew.Text" xml:space="preserve">
-    <value>What's new</value>
-  </data>
   <data name="Oobe_WhatsNew_LoadingError.Title" xml:space="preserve">
     <value>Couldn't load the release notes.</value>
   </data>
   <data name="Oobe_WhatsNew_LoadingError.Message" xml:space="preserve">
     <value>Please check your internet connection.</value>
   </data>
-  <data name="Oobe_WhatsNew_ProxyAuthenticationWarning.Title" xml:space="preserve">
-    <value>Couldn't load the release notes.</value>
-  </data>
-  <data name="Oobe_WhatsNew_ProxyAuthenticationWarning.Message" xml:space="preserve">
-    <value>Your proxy server requires authentication.</value>
-  </data>
-  <data name="Oobe_WhatsNew_DetailedReleaseNotesLink.Text" xml:space="preserve">
-    <value>See more detailed release notes on GitHub</value>
-    <comment>Don't loc "GitHub", it's the name of a product</comment>
-  </data>
   <data name="OOBE_Settings.Content" xml:space="preserve">
     <value>Open Settings</value>
   </data>
-  <data name="Oobe_NavViewItem.Content" xml:space="preserve">
-    <value>Welcome to PowerToys</value>
-    <comment>Don't loc "PowerToys"</comment>
-  </data>
   <data name="WhatIsNew_NavViewItem.Content" xml:space="preserve">
     <value>What's new</value>
   </data>
@@ -2508,9 +2259,6 @@ From there, simply click on one of the supported files in the File Explorer and
   <data name="General_InstallNow.Content" xml:space="preserve">
     <value>Install now</value>
   </data>
-  <data name="General_ReadMore.Text" xml:space="preserve">
-    <value>Read more</value>
-  </data>
   <data name="General_NewVersionAvailable.Title" xml:space="preserve">
     <value>An update is available:</value>
   </data>
@@ -2720,20 +2468,11 @@ From there, simply click on one of the supported files in the File Explorer and
   <data name="MouseUtils_CursorWrap_ActivationShortcut.Header" xml:space="preserve">
     <value>Activation and behavior</value>
   </data>
-  <data name="MouseUtils_CursorWrap_ActivationShortcut_Button.Content" xml:space="preserve">
-    <value>Set shortcut</value>
-  </data>
   <data name="MouseUtils_CursorWrap_DisableWrapDuringDrag.Content" xml:space="preserve">
     <value>Disable wrapping while dragging</value>
   </data>
   <data name="MouseUtils_CursorWrap_DisableOnSingleMonitor.Content" xml:space="preserve">
     <value>Disable wrapping when using a single monitor</value>
-  </data>	
-  <data name="MouseUtils_CursorWrap_AutoActivate.Header" xml:space="preserve">
-    <value>Auto-activate on startup</value>
-  </data>
-  <data name="MouseUtils_CursorWrap_AutoActivate.Content" xml:space="preserve">
-    <value>Automatically activate on utility startup</value>
   </data>
   <data name="MouseUtils_CursorWrap_WrapMode.Header" xml:space="preserve">
     <value>Wrap mode</value>
@@ -2769,9 +2508,6 @@ From there, simply click on one of the supported files in the File Explorer and
   <data name="Launch_ShortcutGuide.Content" xml:space="preserve">
     <value>Open Shortcut Guide</value>
   </data>
-  <data name="ColorPicker_ColorFormat_ToggleSwitch.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Show format in editor</value>
-  </data>
   <data name="GeneralPage_Documentation.Text" xml:space="preserve">
     <value>Documentation</value>
   </data>
@@ -2848,9 +2584,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="WarningPotentialShortcutConflict.Message" xml:space="preserve">
     <value>This shortcut has a potential conflict, but the warning is ignored.</value>
   </data>
-  <data name="WarningShortcutConflict.ToolTipService.ToolTip" xml:space="preserve">
-    <value>A conflict has been detected for this shortcut.</value>
-  </data>
   <data name="FancyZones_SpanZonesAcrossMonitors.Description" xml:space="preserve">
     <value>All monitors must have the same DPI scaling and will be treated as one large combined rectangle which contains all monitors</value>
   </data>
@@ -2916,9 +2649,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MouseUtils_FindMyMouse_SpotlightColor.Header" xml:space="preserve">
     <value>Spotlight color</value>
   </data>
-  <data name="MouseUtils_FindMyMouse_OverlayOpacity.Header" xml:space="preserve">
-    <value>Overlay opacity (%)</value>
-  </data>
   <data name="MouseUtils_FindMyMouse_SpotlightRadius.Header" xml:space="preserve">
     <value>Spotlight radius (px)</value>
     <comment>px = pixels</comment>
@@ -2975,7 +2705,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Activation shortcut</value>
   </data>
   <data name="MouseUtils_MouseHighlighter_ActivationShortcut.Description" xml:space="preserve">
-    <value>Customize the shortcut to turn on or off this mode</value>
+    <value>Customize the shortcut used to turn this mode on or off</value>
     <comment>"Mouse Highlighter" is the name of the utility. Mouse is the hardware mouse.</comment>
   </data>
   <data name="MouseUtils_MouseHighlighter_PrimaryButtonClickColor.Header" xml:space="preserve">
@@ -3095,9 +2825,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="FancyZones_Zone_Appearance.Header" xml:space="preserve">
     <value>Zone appearance</value>
   </data>
-  <data name="LearnMore.Text" xml:space="preserve">
-    <value>Learn more</value>
-  </data>
   <data name="FileExplorerPreview_ToggleSwitch_Thumbnail_GCODE.Header" xml:space="preserve">
     <value>Geometric Code</value>
     <comment>File type, do not translate</comment>
@@ -3190,11 +2917,9 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   </data>
   <data name="AlwaysOnTop.ModuleDescription" xml:space="preserve">
     <value>Always On Top is a quick and easy way to pin windows on top.</value>
-    <comment>{Locked="Always On Top"}</comment>
   </data>
   <data name="AlwaysOnTop.ModuleTitle" xml:space="preserve">
     <value>Always On Top</value>
-    <comment>{Locked}</comment>
   </data>
   <data name="AlwaysOnTop_Activation_GroupSettings.Header" xml:space="preserve">
     <value>Activation</value>
@@ -3204,7 +2929,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   </data>
   <data name="AlwaysOnTop_EnableToggleControl_HeaderText.Header" xml:space="preserve">
     <value>Always On Top</value>
-    <comment>{Locked="Always On Top"}</comment>
   </data>
   <data name="AlwaysOnTop_ExcludedApps.Description" xml:space="preserve">
     <value>Excludes an application from pinning on top</value>
@@ -3236,9 +2960,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Do not activate when Game Mode is on</value>
     <comment>Game Mode is a Windows feature</comment>
   </data>
-  <data name="AlwaysOnTop_Behavior.Header" xml:space="preserve">
-    <value>Behavior</value>
-  </data>
   <data name="LearnMore_AlwaysOnTop.Text" xml:space="preserve">
     <value>Learn more about Always On Top</value>
     <comment>{Locked="Always On Top"}</comment>
@@ -3247,19 +2968,19 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Activation shortcut</value>
   </data>
   <data name="AlwaysOnTop_ActivationShortcut.Description" xml:space="preserve">
-    <value>Customize the shortcut to pin or unpin an app window. Use the same modifier keys with + or - to adjust window transparency.</value>
+    <value>Customize the shortcut to pin or unpin an app window and use the same modifier keys with + or − to adjust its transparency</value>
   </data>
   <data name="AlwaysOnTop_TransparencyInfo.Header" xml:space="preserve">
-    <value>Transparency adjustment</value>
+    <value>Window transparency</value>
   </data>
-  <data name="AlwaysOnTop_IncreaseOpacity.Text" xml:space="preserve">
-    <value>Increase opacity</value>
+  <data name="AlwaysOnTop_TransparencyInfo.Description" xml:space="preserve">
+    <value>Adjust the transparency of the focused window on top</value>
   </data>
-  <data name="AlwaysOnTop_DecreaseOpacity.Text" xml:space="preserve">
-    <value>Decrease opacity</value>
+  <data name="AlwaysOnTop_IncreaseOpacity" xml:space="preserve">
+    <value>Press **{0}** to increase the window opacity</value>
   </data>
-  <data name="AlwaysOnTop_TransparencyRange.Text" xml:space="preserve">
-    <value>Range: 20%-100%</value>
+  <data name="AlwaysOnTop_DecreaseOpacity" xml:space="preserve">
+    <value>Press **{0}** to decrease the window opacity</value>
   </data>
   <data name="Oobe_AlwaysOnTop.Title" xml:space="preserve">
     <value>Always On Top</value>
@@ -3267,7 +2988,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   </data>
   <data name="Oobe_AlwaysOnTop.Description" xml:space="preserve">
     <value>Always On Top improves your multitasking workflow by pinning an application window so it's always in front - even when focus changes to another window after that.</value>
-    <comment>{Locked="Always On Top"}</comment>
   </data>
   <data name="Oobe_AlwaysOnTop_HowToUse.Text" xml:space="preserve">
     <value>to pin or unpin the selected window so it's always on top of all other windows.</value>
@@ -3293,12 +3013,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Wrap text</value>
     <comment>Feature on or off</comment>
   </data>
-  <data name="FancyZones_AllowPopupWindowSnap.Description" xml:space="preserve">
-    <value>This setting can affect all popup windows including notifications</value>
-  </data>
-  <data name="FancyZones_AllowPopupWindowSnap.Header" xml:space="preserve">
-    <value>Allow popup windows snapping</value>
-  </data>
   <data name="FancyZones_AllowChildWindowSnap.Content" xml:space="preserve">
     <value>Allow child windows snapping</value>
   </data>
@@ -3463,9 +3177,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="FancyZones_OpenEditor" xml:space="preserve">
     <value>Open editor</value>
   </data>
-  <data name="FileLocksmith_ShortDescription" xml:space="preserve">
-    <value>Right-click on files or directories to show running processes</value>
-  </data>
   <data name="FindMyMouse_ShortDescription" xml:space="preserve">
     <value>Find the mouse</value>
   </data>
@@ -3478,9 +3189,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="MouseCrosshairs_ShortDescription" xml:space="preserve">
     <value>Draw crosshairs centered on the mouse pointer</value>
   </data>
-  <data name="AdvancedPaste_ShortDescription" xml:space="preserve">
-    <value>An AI powered tool to put your clipboard content into any format you need, focused towards developer workflows.</value>
-  </data>
   <data name="AdvancedPaste_EnableAISettingsCardDescription.Text" xml:space="preserve">
     <value>Transform your clipboard content with the power of AI. A cloud or local endpoint is required.</value>
   </data>
@@ -3493,13 +3201,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Run_ShortDescription" xml:space="preserve">
     <value>Open Run</value>
   </data>
-  <data name="PowerAccent_ShortDescription" xml:space="preserve">
-    <value>An alternative way to type accented characters</value>
-  </data>
-  <data name="RegistryPreview_ShortDescription" xml:space="preserve">
-    <value>Visualize and edit Windows Registry files</value>
-    <comment>{Locked="Windows"}</comment>
-  </data>
   <data name="ScreenRuler_ShortDescription" xml:space="preserve">
     <value>Start measurement</value>
   </data>
@@ -3516,9 +3217,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Activate_Zones" xml:space="preserve">
     <value>Activate zones</value>
   </data>
-  <data name="DashboardKBMShowMappingsButton.Content" xml:space="preserve">
-    <value>Show remappings</value>
-  </data>
   <data name="Oobe_QuickAccent.Description" xml:space="preserve">
     <value>Quick Accent is an easy way to write letters with accents, like on a smartphone.</value>
   </data>
@@ -3608,9 +3306,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="LearnMore_TextExtractor.Text" xml:space="preserve">
     <value>Learn more about Text Extractor</value>
   </data>
-  <data name="TextExtractor_Cancel" xml:space="preserve">
-    <value>cancel</value>
-  </data>
   <data name="General_SettingsBackupAndRestore_NothingToBackup" xml:space="preserve">
     <value>A new backup was not created because no settings have been changed since last backup.</value>
   </data>
@@ -3645,9 +3340,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="General_SettingsBackupAndRestore_CurrentSettingsUnknown" xml:space="preserve">
     <value>Unknown</value>
   </data>
-  <data name="General_SettingsBackupAndRestore_NeverRestored" xml:space="preserve">
-    <value>Never restored</value>
-  </data>
   <data name="General_SettingsBackupAndRestore_NothingToRestore" xml:space="preserve">
     <value>Nothing to restore.</value>
   </data>
@@ -3693,9 +3385,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Shell_TextExtractor.Content" xml:space="preserve">
     <value>Text Extractor</value>
   </data>
-  <data name="Launch_TextExtractor.Content" xml:space="preserve">
-    <value>Open Text Extractor</value>
-  </data>
   <data name="Oobe_TextExtractor.Title" xml:space="preserve">
     <value>Text Extractor</value>
   </data>
@@ -3742,9 +3431,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccent_StartSelectionFromTheLeft_Indicator.Description" xml:space="preserve">
     <value>Start selection from the leftmost character for all activation keys, including left and right arrows</value>
   </data>
-  <data name="QuickAccent_DisableFullscreen.Header" xml:space="preserve">
-    <value>Disable when Game Mode is On</value>
-  </data>
   <data name="QuickAccent_Language.Header" xml:space="preserve">
     <value>Characters</value>
   </data>
@@ -3925,10 +3611,6 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Open Hosts File Editor</value>
     <comment>"Hosts File Editor" is a product name</comment>
   </data>
-  <data name="Hosts_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Open Hosts File Editor</value>
-    <comment>"Hosts File Editor" is a product name</comment>
-  </data>
   <data name="Hosts_AdditionalLinesPosition.Header" xml:space="preserve">
     <value>Placement of additional content</value>
   </data>
@@ -3984,9 +3666,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="EnvironmentVariables_LaunchButtonControl.Header" xml:space="preserve">
     <value>Open Environment Variables</value>
   </data>
-  <data name="EnvironmentVariables_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Open Environment Variables</value>
-  </data>
   <data name="Launch_EnvironmentVariables.Content" xml:space="preserve">
     <value>Open Environment Variables</value>
   </data>
@@ -4051,7 +3730,6 @@ Activate by holding the key for the character you want to add an accent to, then
   </data>
   <data name="Alternate_OOBE_AlwaysOnTop_Title.Text" xml:space="preserve">
     <value>Always On Top</value>
-    <comment>{Locked}</comment>
   </data>
   <data name="Alternate_OOBE_ColorPicker_Description.Text" xml:space="preserve">
     <value>To pick a color:</value>
@@ -4106,9 +3784,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="AdvancedPaste.ModuleTitle" xml:space="preserve">
     <value>Advanced Paste</value>
   </data>
-  <data name="AdvancedPaste_Cancel" xml:space="preserve">
-    <value>cancel</value>
-  </data>
   <data name="AdvancedPaste_EnableToggleControl_HeaderText.Header" xml:space="preserve">
     <value>Advanced Paste</value>
   </data>
@@ -4145,9 +3820,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Oobe_AdvancedPasteJson_HowToUse.Text" xml:space="preserve">
     <value>to paste your clipboard data as JSON. Note: Clipboard content data has to contain XML or CSV text.</value>
   </data>
-  <data name="Oobe_AdvancedPasteCustom_HowToUse.Text" xml:space="preserve">
-    <value>to open AI-powered dialog to enter query and convert your data to any format you need.</value>
-  </data>
   <data name="Shell_CmdNotFound.Content" xml:space="preserve">
     <value>Command Not Found</value>
     <comment>Product name: Navigation view item name for Command Not Found</comment>
@@ -4188,9 +3860,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="CmdNotFound_ModuleInstallationLogs.Text" xml:space="preserve">
     <value>Installation logs</value>
   </data>
-  <data name="CmdNotFound_CheckPowerShellVersionButtonControl.Description" xml:space="preserve">
-    <value>PowerShell 7 is required to use this module</value>
-  </data>
   <data name="CmdNotFound_CheckCompatibility.Content" xml:space="preserve">
     <value>Refresh</value>
   </data>
@@ -4235,10 +3904,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="DocsTooltip.Text" xml:space="preserve">
     <value>Documentation</value>
   </data>
-  <data name="FZEditorString" xml:space="preserve">
-    <value>FancyZones Editor</value>
-    <comment>Do not localize this string</comment>
-  </data>
   <data name="MoreBtn.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More</value>
   </data>
@@ -4254,9 +3919,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccessTxt.Text" xml:space="preserve">
     <value>Quick access</value>
   </data>
-  <data name="UpdateAvailable.Text" xml:space="preserve">
-    <value>Update available</value>
-  </data>
   <data name="FileExplorerPreview_Toggle_Monaco_Max_File_Size.Header" xml:space="preserve">
     <value>Maximum file size to preview</value>
     <comment>Size refers to the disk space used by a file</comment>
@@ -4315,7 +3977,7 @@ Activate by holding the key for the character you want to add an accent to, then
     <comment>"Mouse Jump" is the name of the utility.</comment>
   </data>
   <data name="MouseUtils_MouseJump_ActivationShortcut.Description" xml:space="preserve">
-    <value>Customize the shortcut to turn on or off this mode</value>
+    <value>Customize the shortcut used to turn this mode on or off</value>
   </data>
   <data name="MouseUtils_MouseJump_ActivationShortcut.Header" xml:space="preserve">
     <value>Activation shortcut</value>
@@ -4433,9 +4095,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="MouseUtils_MouseJump_CopyToCustomStyle_MessageBox_Title" xml:space="preserve">
     <value>Copy to Custom preview style</value>
   </data>
-  <data name="MouseUtils_MouseJump_CopyToCustomStyle_MessageBox_Text" xml:space="preserve">
-    <value>This will replace the current settings in the Custom preview style.</value>
-  </data>
   <data name="MouseUtils_MouseJump_CopyToCustomStyle_MessageBox_PrimaryButtonText" xml:space="preserve">
     <value>Copy</value>
   </data>
@@ -4449,9 +4108,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="RegistryPreview_Launch_GroupSettings.Header" xml:space="preserve">
     <value>Open</value>
   </data>
-  <data name="RegistryPreview_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Open Registry Preview</value>
-  </data>
   <data name="RegistryPreview_LaunchButtonControl.Header" xml:space="preserve">
     <value>Open Registry Preview</value>
   </data>
@@ -4519,7 +4175,7 @@ Activate by holding the key for the character you want to add an accent to, then
     <comment>Right control is the physical key on the keyboard.</comment>
   </data>
   <data name="MouseUtils_FindMyMouse_ActivationShortcut.Description" xml:space="preserve">
-    <value>Customize the shortcut to turn on or off this mode</value>
+    <value>Customize the shortcut used to turn this mode on or off</value>
   </data>
   <data name="MouseUtils_FindMyMouse_ActivationShortcut.Header" xml:space="preserve">
     <value>Activation shortcut</value>
@@ -4607,9 +4263,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="GPO_AdvancedPasteAi_SettingIsManaged.Title" xml:space="preserve">
     <value>AI features are managed by your organization.</value>
   </data>
-  <data name="GPO_SettingIsManaged_ToolTip.Text" xml:space="preserve">
-    <value>This setting is managed by your organization.</value>
-  </data>
   <data name="GPO_SomePreviewPanesAreManaged.Title" xml:space="preserve">
     <value>The enabled state of some preview handlers is managed by your organization.</value>
   </data>
@@ -4625,18 +4278,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="FileExplorerPreview_ToggleSwitch_Monaco_Minimap.Content" xml:space="preserve">
     <value>Show minimap</value>
   </data>
-  <data name="PrivacyLink.Text" xml:space="preserve">
-    <value>OpenAI privacy</value>
-  </data>
-  <data name="TermsLink.Text" xml:space="preserve">
-    <value>OpenAI Terms</value>
-  </data>
-  <data name="AdvancedPaste_EnableAIDialog_LoginIntoText.Text" xml:space="preserve">
-    <value>• Login into your</value>
-  </data>
-  <data name="AdvancedPaste_EnableAIDialog_CreateNewKeyText.Text" xml:space="preserve">
-    <value>• Create a new secret key and paste it in the field below</value>
-  </data>
   <data name="FileExplorerPreview_Toggle_Monaco_Font_Size.Description" xml:space="preserve">
     <value>Font size of the editor in pt. Recommended: 14pt</value>
     <comment>{Locked="pt"}</comment>
@@ -4651,9 +4292,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Peek_SourceCode_FontSize.Header" xml:space="preserve">
     <value>Font size</value>
   </data>
-  <data name="AdvancedPaste_EnableAIDialog_NoteAICreditsErrorText.Text" xml:space="preserve">
-    <value>If you do not have credits you will see an 'API key quota exceeded' error</value>
-  </data>
   <data name="AdvancedPaste_CloseAfterLosingFocus.Content" xml:space="preserve">
     <value>Automatically close the window after it loses focus</value>
     <comment>Advanced Paste is a product name, do not loc</comment>
@@ -4708,10 +4346,6 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Location</value>
     <comment>Templates Location label</comment>
   </data>
-  <data name="NewPlus_Templates_Location_Path.Text" xml:space="preserve">
-    <value>...</value>
-    <comment>Do not localize</comment>
-  </data>
   <data name="NewPlus_Templates_Location_Learn_More.Content" xml:space="preserve">
     <value>Learn more about template location</value>
     <comment>Read more about templates location</comment>
@@ -4748,10 +4382,6 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Learn more about supported variables and see examples</value>
     <comment>New+ help link to learn more about supported variables and see examples</comment>
   </data>
-  <data name="NewPlus_Behaviour_Replace_Variables_Info_Card_Title.Text" xml:space="preserve">
-    <value>Commonly used variables</value>
-    <comment>New+ commonly used variables header in the flyout info card</comment>
-  </data>
   <data name="NewPlus_Year_YYYY_Variable_Description.Text" xml:space="preserve">
     <value>Year, represented by a full four or five digits, depending on the calendar used.</value>
     <comment>New+ description of the year $YYYY variable - casing of $YYYY is important</comment>
@@ -4814,9 +4444,6 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>ZoomIt is a screen zoom, annotation, and recording tool for technical presentations and demos. You can also use ZoomIt to snip screenshots to the clipboard or to a file.</value>
     <comment>{Locked="ZoomIt"}</comment>
   </data>
-  <data name="ZoomIt_ShortDescription" xml:space="preserve">
-    <value>A screen zoom, annotation, and recording tool for technical presentations and demos.</value>
-  </data>
   <data name="ZoomIt.ModuleTitle" xml:space="preserve">
     <value>ZoomIt</value>
     <comment>{Locked="ZoomIt"}</comment>
@@ -4998,36 +4625,6 @@ The break timer font matches the text font.</value>
   <data name="ZoomIt_Break_TimerOpacity.Header" xml:space="preserve">
     <value>Timer opacity</value>
   </data>
-  <data name="ZoomIt_Break_TimerOpacity_10Percent.Content" xml:space="preserve">
-    <value>10%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_20Percent.Content" xml:space="preserve">
-    <value>20%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_30Percent.Content" xml:space="preserve">
-    <value>30%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_40Percent.Content" xml:space="preserve">
-    <value>40%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_50Percent.Content" xml:space="preserve">
-    <value>50%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_60Percent.Content" xml:space="preserve">
-    <value>60%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_70Percent.Content" xml:space="preserve">
-    <value>70%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_80Percent.Content" xml:space="preserve">
-    <value>80%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_90Percent.Content" xml:space="preserve">
-    <value>90%</value>
-  </data>
-  <data name="ZoomIt_Break_TimerOpacity_100Percent.Content" xml:space="preserve">
-    <value>100%</value>
-  </data>
   <data name="ZoomIt_Break_TimerPosition.Header" xml:space="preserve">
     <value>Timer position</value>
   </data>
@@ -5151,9 +4748,6 @@ The break timer font matches the text font.</value>
   <data name="MouseWithoutBorders_PolicyIPAddressMappingInfo_TextBoxControl.Description" xml:space="preserve">
     <value>You cannot change, remove or disable these enforced rules.</value>
   </data>
-  <data name="OpenSettings.Content" xml:space="preserve">
-    <value>Open settings</value>
-  </data>
   <data name="OpenAnimationsSettings.Content" xml:space="preserve">
     <value>Open animation settings</value>
   </data>
@@ -5169,9 +4763,6 @@ The break timer font matches the text font.</value>
   <data name="LanguageRestartInfoButton.Content" xml:space="preserve">
     <value>Restart</value>
   </data>
-  <data name="Default_Language" xml:space="preserve">
-    <value>Windows default</value>
-  </data>
   <data name="Arabic_Saudi_Arabia_Language" xml:space="preserve">
     <value>Arabic (Saudi Arabia)</value>
   </data>
@@ -5253,9 +4844,6 @@ The break timer font matches the text font.</value>
   <data name="Shell_TopLevelInputOutput.Content" xml:space="preserve">
     <value>Input &amp; Output</value>
   </data>
-  <data name="Shell_TopLevelWindowsAndLayouts.Content" xml:space="preserve">
-    <value>Windowing &amp; Layouts</value>
-  </data>
   <data name="Shell_TopLevelSystemTools.Content" xml:space="preserve">
     <value>System Tools</value>
   </data>
@@ -5290,9 +4878,6 @@ The break timer font matches the text font.</value>
   <data name="Run_NavigateCmdPalSettings.Content" xml:space="preserve">
     <value>Learn more</value>
   </data>
-  <data name="Enable_Module.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Enable module</value>
-  </data>
   <data name="PowerLauncher_PluginVersion.Text" xml:space="preserve">
     <value>Version</value>
   </data>
@@ -5312,12 +4897,6 @@ The break timer font matches the text font.</value>
   <data name="CmdPal_Settings.Header" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="Help_chromaCIE" xml:space="preserve">
-    <value>chroma (CIE LCh)</value>
-  </data>
-  <data name="Help_hueCIE" xml:space="preserve">
-    <value>hue (CIE LCh)</value>
-  </data>
   <data name="Help_lightnessOklab" xml:space="preserve">
     <value>lightness (Oklab/Oklch)</value>
   </data>
@@ -5333,12 +4912,6 @@ The break timer font matches the text font.</value>
   <data name="Help_hueOklch" xml:space="preserve">
     <value>hue (Oklch)</value>
   </data>
-  <data name="ExitPT_NavViewItem.Content" xml:space="preserve">
-    <value>Exit PowerToys</value>
-  </data>
-  <data name="General_System.Header" xml:space="preserve">
-    <value>System</value>
-  </data>
   <data name="GeneralPage_ReportBugPackage.Header" xml:space="preserve">
     <value>Generate bug report package</value>
   </data>
@@ -5348,9 +4921,6 @@ The break timer font matches the text font.</value>
   <data name="GeneralPageReportBugPackage.Content" xml:space="preserve">
     <value>Generate package</value>
   </data>
-  <data name="BugReportUnderConstruction" xml:space="preserve">
-    <value>Bug report package is being created</value>
-  </data>
   <data name="FileExplorerPreview_ToggleSwitch_Preview_BGCODE.Header" xml:space="preserve">
     <value>Binary Geometric Code</value>
   </data>
@@ -5405,37 +4975,9 @@ The break timer font matches the text font.</value>
   <data name="HighlightMode_Spotlight_Mode.Content" xml:space="preserve">
     <value>Spotlight</value>
   </data>
-  <data name="LearnMore.Content" xml:space="preserve">
-    <value>Learn more</value>
-  </data>
-  <data name="Awake_ShortDescription" xml:space="preserve">
-    <value>Keep your PC awake</value>
-  </data>
-  <data name="ImageResizer_ShortDescription" xml:space="preserve">
-    <value>Resize images from right-click context menu</value>
-  </data>
-  <data name="MouseWithoutBorders_ShortDescription" xml:space="preserve">
-    <value>Move your cursor across multiple devices</value>
-  </data>
-  <data name="PowerRename_ShortDescription" xml:space="preserve">
-    <value>Rename files and folders from right-click context menu</value>
-  </data>
   <data name="GeneralPage_EnableDataDiagnosticsText.Text" xml:space="preserve">
     <value>Helps us make PowerToys faster, more stable, and better over time</value>
   </data>
-  <data name="UpdateAvailable.Title" xml:space="preserve">
-    <value>Update available</value>
-  </data>
-  <data name="DisabledModules.Text" xml:space="preserve">
-    <value>Disabled modules</value>
-  </data>
-  <data name="EnabledModules.Text" xml:space="preserve">
-    <value>Enabled modules</value>
-  </data>
-  <data name="NewPlus_Product_Description.Description" xml:space="preserve">
-    <value>Create files and folders from a personalized set of templates</value>
-    <comment>New+ product description</comment>
-  </data>
   <data name="AlwaysOnTop_Sound.Header" xml:space="preserve">
     <value>Play a sound when pinning a window</value>
   </data>
@@ -5457,9 +4999,6 @@ The break timer font matches the text font.</value>
   <data name="LightSwitch_BehaviorSettingsGroup.Header" xml:space="preserve">
     <value>Behavior</value>
   </data>
-  <data name="LightSwitch_MonitorSettingsGroup.Header" xml:space="preserve">
-    <value>Monitor settings</value>
-  </data>
   <data name="LightSwitch_EnableSettingsCard.Header" xml:space="preserve">
     <value>Light Switch</value>
   </data>
@@ -5535,36 +5074,18 @@ The break timer font matches the text font.</value>
   <data name="LightSwitch_PowerDisplayDisabledWarningBar.Message" xml:space="preserve">
     <value />
   </data>
-  <data name="LightSwitch_PowerDisplayDisabledWarning.Text" xml:space="preserve">
-    <value>Enable PowerDisplay module to use automatic monitor profile switching</value>
-  </data>
   <data name="LightSwitch_ApplyMonitorSettingsExpander.Header" xml:space="preserve">
     <value>Apply monitor settings to</value>
   </data>
   <data name="LightSwitch_ApplyMonitorSettingsExpander.Description" xml:space="preserve">
     <value>Automatically switch PowerDisplay profiles when theme changes</value>
   </data>
-  <data name="LightSwitch_EnableMonitorSettings.Content" xml:space="preserve">
-    <value>Enable monitor settings integration</value>
-  </data>
   <data name="LightSwitch_DarkModeProfileCheckbox.Content" xml:space="preserve">
     <value>Dark mode profile</value>
   </data>
   <data name="LightSwitch_LightModeProfileCheckbox.Content" xml:space="preserve">
     <value>Light mode profile</value>
   </data>
-  <data name="LightSwitch_DarkModeProfileCard.Header" xml:space="preserve">
-    <value>Dark mode profile</value>
-  </data>
-  <data name="LightSwitch_DarkModeProfileCard.Description" xml:space="preserve">
-    <value>Profile to apply when switching to dark mode</value>
-  </data>
-  <data name="LightSwitch_LightModeProfileCard.Header" xml:space="preserve">
-    <value>Light mode profile</value>
-  </data>
-  <data name="LightSwitch_LightModeProfileCard.Description" xml:space="preserve">
-    <value>Profile to apply when switching to light mode</value>
-  </data>
   <data name="LightSwitch_NavigatePowerDisplaySettings.Content" xml:space="preserve">
     <value>Open PowerDisplay settings</value>
   </data>
@@ -5621,9 +5142,6 @@ The break timer font matches the text font.</value>
   <data name="CloseDialog.SecondaryButtonText" xml:space="preserve">
     <value>No</value>
   </data>
-  <data name="KeyBack" xml:space="preserve">
-    <value>Back key</value>
-  </data>
   <data name="SearchResults_Title.ModuleTitle" xml:space="preserve">
     <value>Search results</value>
   </data>
@@ -5663,9 +5181,6 @@ The break timer font matches the text font.</value>
   <data name="ShortcutConflictWindow_SystemShortcutLink.Content" xml:space="preserve">
     <value>See all Windows shortcuts</value>
   </data>
-  <data name="ShortcutConflictWindow_SystemShortcutTooltip.Content" xml:space="preserve">
-    <value>This shortcut is used by Windows and can't be changed.</value>
-  </data>
   <data name="ShortcutConflictWindow_NoConflictsTitle.Text" xml:space="preserve">
     <value>No conflicts detected</value>
   </data>
@@ -5720,12 +5235,6 @@ The break timer font matches the text font.</value>
     <value>Use the **keyboard shortcut** to instantly toggle between light and dark modes, or set up **sunrise/sunset automation** for natural theme transitions.</value>
     <comment>Light Switch is a product name, do not localize</comment>
   </data>
-  <data name="DismissConflictBtn.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Dismiss</value>
-  </data>
-  <data name="DismissText.Text" xml:space="preserve">
-    <value>Dismiss</value>
-  </data>
   <data name="Shortcut_ResetBtn.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Reset shortcut</value>
   </data>
@@ -5773,18 +5282,6 @@ The break timer font matches the text font.</value>
   <data name="PowerDisplay_LaunchButtonControl.Description" xml:space="preserve">
     <value>Launch the Power Display utility</value>
   </data>
-  <data name="PowerDisplay_LaunchAtStartup.Header" xml:space="preserve">
-    <value>Launch at startup</value>
-  </data>
-  <data name="PowerDisplay_LaunchAtStartup.Description" xml:space="preserve">
-    <value>Automatically start Power Display when Windows starts</value>
-  </data>
-  <data name="PowerDisplay_LaunchAtStartup_ToggleSwitch.OnContent" xml:space="preserve">
-    <value>On</value>
-  </data>
-  <data name="PowerDisplay_LaunchAtStartup_ToggleSwitch.OffContent" xml:space="preserve">
-    <value>Off</value>
-  </data>
   <data name="PowerDisplay_RestoreSettingsOnStartup.Header" xml:space="preserve">
     <value>Restore settings on startup</value>
   </data>
@@ -5943,9 +5440,6 @@ The break timer font matches the text font.</value>
   <data name="PowerDisplay_Profile_DeleteMenuItem.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Delete profile</value>
   </data>
-  <data name="PowerDisplay_Profile_AddButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Add new profile</value>
-  </data>
   <data name="PowerDisplay_Profile_ApplyButton.Content" xml:space="preserve">
     <value>Apply</value>
   </data>
@@ -6209,9 +5703,6 @@ The break timer font matches the text font.</value>
     <value>Open Command Palette</value>
     <comment>Command Palette is a product name, do not loc</comment>
   </data>
-  <data name="CmdPal_ShortDescription" xml:space="preserve">
-    <value>A better quick launcher</value>
-  </data>
   <data name="CmdPal_Description.Text" xml:space="preserve">
     <value>Find files, launch apps, and do so much more with the most extensible quick launcher.</value>
   </data>
@@ -6281,4 +5772,35 @@ Text uses the current drawing color.</value>
   <data name="LightSwitch_FollowNightLightCardMessage.Text" xml:space="preserve">
     <value>Following Night Light settings.</value>
   </data>
-</root>
+  <data name="Shell_TopLevelWindowsAndLayouts.Content" xml:space="preserve">
+    <value>Windowing &amp; Layouts</value>
+  </data>
+  <data name="OOBE_NavViewItem.Content" xml:space="preserve">
+    <value>Welcome to PowerToys</value>
+  </data>
+  <data name="ShortcutConflictWindow_IgnoreShortcut.Content" xml:space="preserve">
+    <value>Ignore shortcut</value>
+  </data>
+  <data name="AdvancedPaste_AddModelButton.Content" xml:space="preserve">
+    <value>Add model</value>
+  </data>
+  <data name="AdvancedPaste_EndpointDialog.Title" xml:space="preserve">
+    <value>Paste with AI provider configuration</value>
+  </data>
+  <data name="AdvancedPaste_ModelPath.Header" xml:space="preserve">
+    <value>Model path</value>
+  </data>
+  <data name="CmdPal_HeroTitle.Text" xml:space="preserve">
+    <value>Command Palette</value>
+    <comment>Command Palette is a product name and should not be localized</comment>
+  </data>
+  <data name="GeneralPage_ViewDiagnosticDataButton.Content" xml:space="preserve">
+    <value>View diagnostic data</value>
+  </data>
+  <data name="Shell_Search_ShowAll.Text" xml:space="preserve">
+    <value>Show all results</value>
+  </data>
+  <data name="ZoomIt_Type_DemoSample.Text" xml:space="preserve">
+    <value>Sample</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs
index 65842cf942..a62c617589 100644
--- a/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs
+++ b/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);