[Settings] Change icons and text (#19592)

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

@@ -50,7 +50,7 @@
                 <controls:SettingsGroup x:Uid="AlwaysOnTop_Behavior_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting Icon="&#xE790;" Style="{StaticResource ExpanderHeaderSettingStyle}" x:Uid="AlwaysOnTop_FrameEnabled">
+                            <controls:Setting Icon="&#xEB3C;" Style="{StaticResource ExpanderHeaderSettingStyle}" x:Uid="AlwaysOnTop_FrameEnabled">
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.FrameEnabled}" x:Uid="ToggleSwitch"/>
                                 </controls:Setting.ActionContent>

src/settings-ui/Settings.UI/Views/AwakePage.xaml

@@ -30,7 +30,7 @@
 
                 <controls:SettingsGroup x:Uid="Awake_Behavior_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                  
-                    <controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" >
+                    <controls:Setting x:Uid="Awake_Mode" Icon="&#xE945;" >
                         <controls:Setting.ActionContent>
                             <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
                                       SelectedIndex="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToIntConverter}}">

src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml

@@ -17,133 +17,137 @@
         <StackPanel Orientation="Vertical"
                     x:Name="ColorPickerView">
 
-                <controls:Setting x:Uid="ColorPicker_EnableColorPicker">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
+            <controls:Setting x:Uid="ColorPicker_EnableColorPicker">
+                <controls:Setting.Icon>
+                    <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" ShowAsMonochrome="False" />
+                </controls:Setting.Icon>
+                <controls:Setting.ActionContent>
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch" />
+                </controls:Setting.ActionContent>
+            </controls:Setting>
+
+            <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;">
                     <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch" />
+                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                                    HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}"/>
                     </controls:Setting.ActionContent>
                 </controls:Setting>
 
-                <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                      HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                        <controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" >
+                            <controls:Setting.ActionContent>
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    SelectedIndex="{x:Bind Path=ViewModel.ActivationBehavior, Mode=TwoWay}" >
+                                    <ComboBoxItem x:Uid="EditorFirst"/>
+                                    <ComboBoxItem x:Uid="ColorPickerFirst"/>
+                                    <ComboBoxItem x:Uid="ColorPickerOnly"/>
+                                </ComboBox>
+                            </controls:Setting.ActionContent>
+                        </controls:Setting>
+            </controls:SettingsGroup>
 
-                            <controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" >
-                                <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{x:Bind Path=ViewModel.ActivationBehavior, Mode=TwoWay}" >
-                                        <ComboBoxItem x:Uid="EditorFirst"/>
-                                        <ComboBoxItem x:Uid="ColorPickerFirst"/>
-                                        <ComboBoxItem x:Uid="ColorPickerOnly"/>
-                                    </ComboBox>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                </controls:SettingsGroup>
-
-                <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xF0E3;">
-                                <controls:Setting.ActionContent>
-                                    <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                              x:Name="ColorPicker_ComboBox"
-                                              HorizontalAlignment="Left"
-                                              DisplayMemberPath="Value"
-                                              ItemsSource="{Binding SelectableColorRepresentations}"
-                                              Loaded="ColorPicker_ComboBox_Loaded"
-                                              SelectedValue="{Binding SelectedColorRepresentationValue, Mode=TwoWay}"
-                                              SelectedValuePath="Key" />    
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
+            <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xF0E3;">
+                    <controls:Setting.ActionContent>
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    x:Name="ColorPicker_ComboBox"
+                                    HorizontalAlignment="Left"
+                                    DisplayMemberPath="Value"
+                                    ItemsSource="{Binding SelectableColorRepresentations}"
+                                    Loaded="ColorPicker_ComboBox_Loaded"
+                                    SelectedValue="{Binding SelectedColorRepresentationValue, Mode=TwoWay}"
+                                    SelectedValuePath="Key" />
+                    </controls:Setting.ActionContent>
+                </controls:Setting>
 
 
-                    <controls:Setting x:Uid="ColorPicker_ShowColorName">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{Binding ShowColorName, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <!--
-            Disabling this until we have a safer way to reset cursor as 
-            we can hit a state where the cursor doesn't reset
-           
-            <CheckBox x:Uid="ColorPicker_ChangeCursor" 
-                          IsChecked="{Binding ChangeCursor, Mode=TwoWay}"
-                          Margin="{StaticResource SmallTopMargin}"
-                          IsEnabled="{Binding IsEnabled}"/>
-                          -->
-                </controls:SettingsGroup>
+                <controls:Setting x:Uid="ColorPicker_ShowColorName">
+                    <controls:Setting.ActionContent>
+                        <ToggleSwitch IsOn="{Binding ShowColorName, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
+                    </controls:Setting.ActionContent>
+                </controls:Setting>
+                <!--
+                Disabling this until we have a safer way to reset cursor as 
+                we can hit a state where the cursor doesn't reset
+                
+                <CheckBox x:Uid="ColorPicker_ChangeCursor" 
+                        IsChecked="{Binding ChangeCursor, Mode=TwoWay}"
+                        Margin="{StaticResource SmallTopMargin}"
+                        IsEnabled="{Binding IsEnabled}"/>
+                        -->
+            </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="ColorPicker_Editor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Name="ColorFormatsSetting" x:Uid="ColorPicker_ColorFormats" Icon="&#xE8FD;"/>
+            <controls:SettingsGroup x:Uid="ColorPicker_Editor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                <controls:Setting x:Name="ColorFormatsSetting" x:Uid="ColorPicker_ColorFormats" Icon="&#xE762;"/>
 
-                    <!-- Disabled reordering by dragging -->
-                    <!-- CanReorderItems="True" AllowDrop="True" -->
-                    <ListView ItemsSource="{Binding ColorFormats, Mode=TwoWay}"
-                              AutomationProperties.Name="{Binding ElementName=ColorFormatsSetting, Path=Header}"
-                              SelectionMode="None"
-                              HorizontalAlignment="Stretch">
-                        <ListView.ItemTemplate>
-                            <DataTemplate x:DataType="models:ColorFormatModel">
-                                <Grid AutomationProperties.Name="{x:Bind Name}"
-                                      HorizontalAlignment="Stretch"
-                                      Background="{ThemeResource CardBackgroundBrush}"
-                                      BorderThickness="{ThemeResource CardBorderThickness}"
-                                      BorderBrush="{ThemeResource CardBorderBrush}"
-                                      CornerRadius="{ThemeResource ControlCornerRadius}"
-                                      Padding="0,0,16,0"
-                                      MinHeight="68">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition/>
-                                    </Grid.RowDefinitions>
-                                    <TextBlock FontWeight="SemiBold"
-                                       FontSize="16"
-                                       Margin="56,8,0,0"
-                                       Text="{x:Bind Name}"/>
-                                    <TextBlock Style="{StaticResource SecondaryTextStyle}"
-                                       Text="{x:Bind Example}"
-                                       Grid.Row="1"
-                                       Margin="56,0,0,8"/>
-                                    <ToggleSwitch IsOn="{x:Bind IsShown, Mode=TwoWay}"
-                                                  OnContent=""
-                                                  OffContent=""
-                                                  Grid.RowSpan="2"
-                                                  x:Uid="Enable_ColorFormat"
-                                                  AutomationProperties.HelpText="{x:Bind Name}"
-                                                  HorizontalAlignment="Right"
-                                                  Margin="0,0,56,0"/>
+                <!-- Disabled reordering by dragging -->
+                <!-- CanReorderItems="True" AllowDrop="True" -->
+                <ListView ItemsSource="{Binding ColorFormats, Mode=TwoWay}"
+                            AutomationProperties.Name="{Binding ElementName=ColorFormatsSetting, Path=Header}"
+                            SelectionMode="None"
+                            HorizontalAlignment="Stretch">
+                    <ListView.ItemTemplate>
+                        <DataTemplate x:DataType="models:ColorFormatModel">
+                            <Grid AutomationProperties.Name="{x:Bind Name}"
+                                    HorizontalAlignment="Stretch"
+                                    Background="{ThemeResource CardBackgroundBrush}"
+                                    BorderThickness="{ThemeResource CardBorderThickness}"
+                                    BorderBrush="{ThemeResource CardBorderBrush}"
+                                    CornerRadius="{ThemeResource ControlCornerRadius}"
+                                    Padding="0,0,16,0"
+                                    MinHeight="68">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <TextBlock FontWeight="SemiBold"
+                                    FontSize="16"
+                                    Margin="56,8,0,0"
+                                    Text="{x:Bind Name}"/>
+                                <TextBlock Style="{StaticResource SecondaryTextStyle}"
+                                    Text="{x:Bind Example}"
+                                    Grid.Row="1"
+                                    Margin="56,0,0,8"/>
+                                <ToggleSwitch IsOn="{x:Bind IsShown, Mode=TwoWay}"
+                                                OnContent=""
+                                                OffContent=""
+                                                Grid.RowSpan="2"
+                                                x:Uid="Enable_ColorFormat"
+                                                AutomationProperties.HelpText="{x:Bind Name}"
+                                                HorizontalAlignment="Right"
+                                                Margin="0,0,56,0"/>
 
-                                    <Button Background="Transparent"
-                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                            HorizontalAlignment="Right"
-                                            VerticalAlignment="Center"
-                                            Grid.RowSpan="2"
-                                            x:Uid="More_Options_Button"
-                                            Content="&#xEDE3;">
-                                        <Button.Flyout>
+                                <Button Background="Transparent"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Center"
+                                        Grid.RowSpan="2"
+                                        x:Uid="More_Options_Button"
+                                        Content="&#xE712;">
+                                    <Button.Flyout>
                                             <MenuFlyout>
-                                                <MenuFlyoutItem IsEnabled="{x:Bind CanMoveUp}" Icon="Up" x:Uid="MoveUp" Click="ReorderButtonUp_Click"/>
-                                                <MenuFlyoutItem IsEnabled="{x:Bind CanMoveDown}" x:Uid="MoveDown" Click="ReorderButtonDown_Click">
+                                                <MenuFlyoutItem x:Uid="MoveUp" IsEnabled="{x:Bind CanMoveUp}" Click="ReorderButtonUp_Click">
                                                     <MenuFlyoutItem.Icon>
-                                                        <FontIcon Glyph="&#xF0AE;" />
+                                                        <FontIcon Glyph="&#xE74A;" />
+                                                    </MenuFlyoutItem.Icon>
+                                                </MenuFlyoutItem>
+                                                <MenuFlyoutItem x:Uid="MoveDown" IsEnabled="{x:Bind CanMoveDown}" Click="ReorderButtonDown_Click">
+                                                    <MenuFlyoutItem.Icon>
+                                                        <FontIcon Glyph="&#xE74B;" />
                                                     </MenuFlyoutItem.Icon>
                                                 </MenuFlyoutItem>
                                             </MenuFlyout>
                                         </Button.Flyout>
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock x:Uid="More_Options_ButtonTooltip" />
-                                        </ToolTipService.ToolTip>
-                                    </Button>
-                                </Grid>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                </controls:SettingsGroup>
-            </StackPanel>
+                                    <ToolTipService.ToolTip>
+                                        <TextBlock x:Uid="More_Options_ButtonTooltip" />
+                                    </ToolTipService.ToolTip>
+                                </Button>
+                            </Grid>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </controls:SettingsGroup>
+        </StackPanel>
 
 </controls:SettingsPageControl.ModuleContent>
 

src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml

@@ -65,7 +65,7 @@
                 <controls:SettingsGroup x:Uid="FancyZones_Zones" x:Name="ZonesSettingsGroup" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_ZoneBehavior_GroupSettings" Icon="&#xE620;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
+                            <controls:Setting x:Uid="FancyZones_ZoneBehavior_GroupSettings" Style="{StaticResource ExpanderHeaderSettingStyle}" />
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <StackPanel>
@@ -98,7 +98,7 @@
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
 
-                            <controls:Setting x:Uid="FancyZones_Zone_Appearance" Icon="&#xE790;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
+                            <controls:Setting x:Uid="FancyZones_Zone_Appearance" Icon="&#xEB3C;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.SystemTheme, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
                                         <ComboBoxItem x:Uid="FancyZones_Radio_Custom_Colors"/>
@@ -169,7 +169,7 @@
 
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_WindowBehavior_GroupSettings" Icon="&#xE737;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
+                            <controls:Setting x:Uid="FancyZones_WindowBehavior_GroupSettings" Style="{StaticResource ExpanderHeaderSettingStyle}" />
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <StackPanel>
@@ -199,7 +199,7 @@
 
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_WindowSwitching_GroupSettings" Icon="&#xE140;" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                            <controls:Setting x:Uid="FancyZones_WindowSwitching_GroupSettings" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.WindowSwitching}" x:Uid="ToggleSwitch"/>
                                 </controls:Setting.ActionContent>
@@ -269,7 +269,7 @@
                 <controls:SettingsGroup x:Uid="FancyZones_Layouts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_QuickLayoutSwitch" Icon="&#xeda7;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
+                            <controls:Setting x:Uid="FancyZones_QuickLayoutSwitch" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.QuickLayoutSwitch}" x:Uid="ToggleSwitch"/>
                                 </controls:Setting.ActionContent>

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

@@ -154,8 +154,8 @@
                         </muxc:InfoBar.Content>
                         <muxc:InfoBar.ActionButton>
                             <HyperlinkButton x:Uid="SeeWhatsNew"
-                                                 NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
-                                                 HorizontalAlignment="Right"
+                                             NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                             HorizontalAlignment="Right"
                                              Style="{StaticResource TextButtonStyle}"/>
                         </muxc:InfoBar.ActionButton>
                     </muxc:InfoBar>
@@ -172,12 +172,13 @@
 
 
 
-
-
                 <controls:SettingsGroup x:Uid="Admin_Mode">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="Admin_Mode" Icon="&#xE7EF;" Description="{Binding Mode=OneWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                            <controls:Setting x:Uid="Admin_Mode_Running_As" Icon="&#xE7EF;" Header="{Binding Mode=OneWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                                <controls:Setting.Description>
+                                    <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp" x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
+                                </controls:Setting.Description>
                                 <controls:Setting.ActionContent>
                                     <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
                                             Command = "{Binding RestartElevatedButtonEventHandler}"
@@ -188,24 +189,15 @@
                         <controls:SettingExpander.Content>
                             <StackPanel Orientation="Vertical">
                                 <controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=OneWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.Description>
-                                        <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
-                                                         Visibility="{Binding Mode=OneWay, Path=IsElevated}"
-                                                         x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
-                                    </controls:Setting.Description>
                                     <controls:Setting.ActionContent>
                                         <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=RunElevated}" x:Uid="ToggleSwitch"/>
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                                 <muxc:InfoBar x:Uid="General_RunAsAdminRequired" 
-                                          Severity="Warning"
-                                          IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
-                                          IsClosable="False"
-                                          IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}">
-                                    <muxc:InfoBar.ActionButton>
-                                        <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
-                                                         x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
-                                    </muxc:InfoBar.ActionButton>
+                                              Severity="Warning"
+                                              IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
+                                              IsClosable="False"
+                                              IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}">
                                 </muxc:InfoBar>
                             </StackPanel>
                         </controls:SettingExpander.Content>

src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml

@@ -18,7 +18,6 @@
         <toolkitconverters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="0" FalseValue="1"/>
     </Page.Resources>
     <controls:SettingsPageControl x:Uid="ImageResizer"
-                                    
                                   ModuleImageSource="ms-appx:///Assets/Modules/ImageResizer.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel>
@@ -34,7 +33,7 @@
 
 
                 <controls:SettingsGroup x:Uid="ImageResizer_CustomSizes" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ImageResizer_Presets" Icon="&#xE2B2;">
+                    <controls:Setting x:Uid="ImageResizer_Presets" Icon="&#xE792;">
                         <controls:Setting.ActionContent>
                             <Button x:Uid="ImageResizer_AddSizeButton" Click="AddSizeButton_Click" Style="{ThemeResource AccentButtonStyle}" />
                         </controls:Setting.ActionContent>

src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml

@@ -182,13 +182,10 @@
                                                 Margin="16,0,0,0"
                                                 CornerRadius="12">
                                             <Border.Background>
-                                                <SolidColorBrush Color="{ThemeResource SystemAccentColorLight3}"
+                                                <SolidColorBrush Color="{ThemeResource SystemAccentColor}"
                                                                  Opacity="0.3"/>
                                             </Border.Background>
-                                            <TextBlock Text="{x:Bind TargetApp}"
-                                                       Foreground="{ThemeResource SystemAccentColorDark1}"
-                                                       FontWeight="SemiBold"
-                                                       FontSize="12" />
+                                            <TextBlock Text="{x:Bind TargetApp}"/>
                                         </Border>
                                     </StackPanel>
                                 </StackPanel>

src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml

@@ -61,7 +61,7 @@
                     </controls:SettingExpander>
                     <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}" IsExpanded="False" >
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xE790;" />
+                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xEB3C;" />
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <StackPanel>
@@ -158,20 +158,20 @@
 
                     <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}" IsExpanded="False" >
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xE790;" />
+                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xEB3C;" />
                         </controls:SettingExpander.Header>
                       
 
                         <controls:SettingExpander.Content>
 
                             <StackPanel>
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_LeftButtonClickColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
+                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
                                         <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                              
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_RightButtonClickColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
+                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
                                         <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
                                     </controls:Setting.ActionContent>
@@ -244,7 +244,7 @@
                     </controls:Setting>
                     <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}" IsExpanded="False" >
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xE790;" />
+                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xEB3C;" />
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <StackPanel>

src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml

@@ -136,7 +136,7 @@
                     </controls:SettingExpander>
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_MaximumNumberOfResults" Icon="&#xE721;" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                            <controls:Setting x:Uid="PowerLauncher_MaximumNumberOfResults" Icon="&#xec8f;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <muxc:NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
                                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -152,7 +152,7 @@
 
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_SearchQueryTuningEnabled" Icon="&#xE8FD;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
+                            <controls:Setting x:Uid="PowerLauncher_SearchQueryTuningEnabled" Icon="&#xE8CB;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryTuningEnabled}"/>
                                 </controls:Setting.ActionContent>

src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml

@@ -44,7 +44,7 @@
                     <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource FalseToVisibleConverter}}">
                         <controls:Setting.ActionContent>
                             <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.OpenShortcutGuide, Mode=TwoWay}"
-                                                            MinWidth="{StaticResource SettingActionControlMinWidth}"/>
+                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"/>
                         </controls:Setting.ActionContent>
                     </controls:Setting>
 
@@ -66,35 +66,34 @@
                         x:Uid="ShortcutGuide_PressWinKeyWarning"
                         Severity="Warning"
                         IsTabStop="True"
-                        IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior}"
                         IsClosable="False"
+                        IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                     />
-
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-
                     <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
-                                <controls:Setting.Description>
-                                    <HyperlinkButton Click="OpenColorsSettings_Click"
-                                                     x:Uid="Windows_Color_Settings"/>
-                                </controls:Setting.Description>
-                                <controls:Setting.ActionContent>
-                                    <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                        <ComboBoxItem x:Uid="Radio_Theme_Dark"/>
-                                        <ComboBoxItem x:Uid="Radio_Theme_Light"/>
-                                        <ComboBoxItem x:Uid="Radio_Theme_Default"/>
-                                    </ComboBox>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
+                        <controls:Setting.Description>
+                            <HyperlinkButton Click="OpenColorsSettings_Click"
+                                            x:Uid="Windows_Color_Settings"/>
+                        </controls:Setting.Description>
+                        <controls:Setting.ActionContent>
+                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
+                                <ComboBoxItem x:Uid="Radio_Theme_Dark"/>
+                                <ComboBoxItem x:Uid="Radio_Theme_Light"/>
+                                <ComboBoxItem x:Uid="Radio_Theme_Default"/>
+                            </ComboBox>
+                        </controls:Setting.ActionContent>
+                    </controls:Setting>
 
 
                     <controls:Setting x:Uid="ShortcutGuide_OverlayOpacity">
                         <controls:Setting.ActionContent>
                             <Slider Minimum="0"
-                                                Maximum="100"
-                                                MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}"/>
+                                    Maximum="100"
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}"/>
                         </controls:Setting.ActionContent>
                     </controls:Setting>
                 </controls:SettingsGroup>
@@ -106,15 +105,15 @@
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"
-                                     Margin="{StaticResource ExpanderSettingMargin}"
-                                         Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
-                                         ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                                         ScrollViewer.VerticalScrollMode="Enabled"
-                                         ScrollViewer.IsVerticalRailEnabled="True"
-                                         TextWrapping="Wrap"
-                                         AcceptsReturn="True"
-                                         MinWidth="240"
-                                         MinHeight="160" />
+                                    Margin="{StaticResource ExpanderSettingMargin}"
+                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
+                                    ScrollViewer.VerticalScrollBarVisibility ="Visible"
+                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    ScrollViewer.IsVerticalRailEnabled="True"
+                                    TextWrapping="Wrap"
+                                    AcceptsReturn="True"
+                                    MinWidth="240"
+                                    MinHeight="160" />
                         </controls:SettingExpander.Content>
                     </controls:SettingExpander>
                 </controls:SettingsGroup>

src/settings-ui/Settings.UI/Views/VideoConference.xaml

@@ -122,7 +122,7 @@
 
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="VideoConference_ToolbarPosition" Icon="&#xEC12;">
+                            <controls:Setting x:Uid="VideoConference_ToolbarPosition">
                                 <controls:Setting.ActionContent>
                                     <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{ Binding Mode=TwoWay, Path=ToolbarPositionIndex}">
                                         <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopLeftCorner"/>