From 5a45c8d7e4b506bde347b8430f8cd54801dbe7e4 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Tue, 12 May 2026 14:37:26 -0700
Subject: [PATCH] improve "view all" UI; consistently use "shortcut"

---
 .../TerminalSettingsEditor/Actions.cpp        |  63 +++++++++
 src/cascadia/TerminalSettingsEditor/Actions.h |   2 +
 .../TerminalSettingsEditor/Actions.xaml       | 103 ++++++++++-----
 .../TerminalSettingsEditor/EditAction.xaml    |   8 +-
 .../Resources/en-US/Resources.resw            | 124 +++++++++---------
 .../SettingContainerStyle.xaml                |   9 +-
 6 files changed, 205 insertions(+), 104 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp
index 82c9288945..4ae66b6a10 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp
@@ -7,7 +7,9 @@
 #include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
+using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Navigation;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
@@ -42,4 +44,65 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
+
+    // Builds the "view all" flyout lazily on the first click of a
+    // row's "..." button, then caches it on the button so subsequent clicks
+    // just re-show it.
+    void Actions::ViewAllKeyChordsButton_Click(const IInspectable& sender, const RoutedEventArgs& /*e*/)
+    {
+        const auto button = sender.try_as<Button>();
+        if (!button)
+        {
+            return;
+        }
+
+        // Retrieve cached flyout, if possible
+        if (auto existing = button.Flyout())
+        {
+            existing.ShowAt(button);
+            return;
+        }
+
+        const auto cmdVM = button.DataContext().try_as<Editor::CommandViewModel>();
+        if (!cmdVM)
+        {
+            return;
+        }
+
+        Flyout flyout;
+        flyout.Placement(Primitives::FlyoutPlacementMode::Bottom);
+        flyout.FlyoutPresenterStyle(Resources().Lookup(box_value(L"EdgeToEdgeFlyoutPresenterStyle")).as<winrt::Windows::UI::Xaml::Style>());
+
+        StackPanel content;
+        content.Orientation(Orientation::Vertical);
+        content.MinWidth(120.0);
+
+        if (cmdVM.HasNoKeyChords())
+        {
+            const auto emptyTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutEmptyStateTemplate")).as<DataTemplate>();
+            content.Children().Append(emptyTemplate.LoadContent().as<UIElement>());
+        }
+        else
+        {
+            const auto separatorTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutSeparatorTemplate")).as<DataTemplate>();
+            const auto itemTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutItemTemplate")).as<DataTemplate>();
+            const auto chords = cmdVM.KeyChordList();
+            const auto count = chords.Size();
+            for (uint32_t i = 0; i < count; ++i)
+            {
+                if (i > 0)
+                {
+                    content.Children().Append(separatorTemplate.LoadContent().as<UIElement>());
+                }
+
+                auto chordVisual = itemTemplate.LoadContent().as<Editor::KeyChordVisual>();
+                chordVisual.KeyChord(chords.GetAt(i).CurrentKeys());
+                content.Children().Append(chordVisual);
+            }
+        }
+
+        flyout.Content(content);
+        button.Flyout(flyout);
+        flyout.ShowAt(button);
+    }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.h b/src/cascadia/TerminalSettingsEditor/Actions.h
index c88ef0a67b..72ebcbd788 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.h
+++ b/src/cascadia/TerminalSettingsEditor/Actions.h
@@ -17,6 +17,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
 
+        void ViewAllKeyChordsButton_Click(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
+
         til::property_changed_event PropertyChanged;
         WINRT_OBSERVABLE_PROPERTY(Editor::ActionsViewModel, ViewModel, PropertyChanged.raise, nullptr);
 
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.xaml b/src/cascadia/TerminalSettingsEditor/Actions.xaml
index 9e0d242d5a..07b30e0ccb 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -8,7 +8,6 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:Microsoft.Terminal.Settings.Editor"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:mtu="using:Microsoft.Terminal.UI"
       mc:Ignorable="d">
 
     <Page.Resources>
@@ -21,10 +20,14 @@
             <Style x:Key="ActionRowItemContainerStyle"
                    BasedOn="{StaticResource DefaultListViewItemStyle}"
                    TargetType="ListViewItem">
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="Margin" Value="0,4,0,0" />
+                <Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
+                <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
+                <Setter Property="Margin" Value="{StaticResource SettingsCardItemMargin}" />
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                 <Setter Property="XYFocusKeyboardNavigation" Value="Enabled" />
+                <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
+                <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
+                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
             </Style>
 
             <Style x:Key="ActionRowNameTextStyle"
@@ -47,19 +50,42 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
 
+            <!--
+                FlyoutPresenter style with no internal padding so a full-width Border
+                separator inside the flyout can reach the flyout's left/right edges.
+            -->
+            <Style x:Key="EdgeToEdgeFlyoutPresenterStyle"
+                   BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+                   TargetType="FlyoutPresenter">
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+            </Style>
+
             <!--  Templates  -->
-            <DataTemplate x:Key="AllKeyChordsFlyoutItemTemplate"
-                          x:DataType="local:KeyChordViewModel">
-                <local:KeyChordVisual Margin="0,2,0,2"
-                                      HorizontalAlignment="Right"
-                                      KeyChord="{x:Bind CurrentKeys, Mode=OneWay}" />
+            <DataTemplate x:Key="ViewAllKeyChordsFlyoutSeparatorTemplate">
+                <Border Height="1"
+                        Margin="0,4,0,4"
+                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+            </DataTemplate>
+
+            <DataTemplate x:Key="ViewAllKeyChordsFlyoutEmptyStateTemplate">
+                <TextBlock x:Uid="Actions_NoKeyBindings"
+                           Margin="12,8,12,8"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           Style="{StaticResource SecondaryTextBlockStyle}" />
+            </DataTemplate>
+
+            <DataTemplate x:Key="ViewAllKeyChordsFlyoutItemTemplate">
+                <local:KeyChordVisual Margin="{ThemeResource MenuFlyoutItemThemePaddingNarrow}"
+                                      HorizontalAlignment="Right" />
             </DataTemplate>
 
             <DataTemplate x:Key="CommandTemplate"
                           x:DataType="local:CommandViewModel">
                 <Grid AutomationProperties.Name="{x:Bind DisplayNameAndKeyChordAutomationPropName, Mode=OneWay}"
-                      ColumnSpacing="8"
-                      Style="{StaticResource SettingsCardStyle}">
+                      ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <!--  command name  -->
                         <ColumnDefinition Width="*" />
@@ -94,33 +120,10 @@
                     <!--  "..." button + flyout  -->
                     <Button x:Uid="Actions_ViewAllKeyChordsButton"
                             Grid.Column="3"
+                            Click="ViewAllKeyChordsButton_Click"
                             Style="{StaticResource ActionRowSubtleButtonStyle}">
                         <FontIcon FontSize="14"
                                   Glyph="&#xE712;" />
-                        <Button.Flyout>
-                            <Flyout Placement="Bottom">
-                                <Grid MinWidth="120">
-                                    <!--  Empty state: shown only when the action has no chords  -->
-                                    <TextBlock x:Uid="Actions_NoKeyBindings"
-                                               HorizontalAlignment="Center"
-                                               VerticalAlignment="Center"
-                                               Style="{StaticResource SecondaryTextBlockStyle}"
-                                               Visibility="{x:Bind HasNoKeyChords, Mode=OneWay}" />
-                                    
-                                    <!--  Chord list: shown only when the action has at least one chord  -->
-                                    <ItemsControl ItemTemplate="{StaticResource AllKeyChordsFlyoutItemTemplate}"
-                                                  ItemsSource="{x:Bind KeyChordList, Mode=OneWay}"
-                                                  Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(HasNoKeyChords), Mode=OneWay}">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel Orientation="Vertical"
-                                                            Spacing="4" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
-                                </Grid>
-                            </Flyout>
-                        </Button.Flyout>
                     </Button>
                 </Grid>
             </DataTemplate>
@@ -157,7 +160,37 @@
                       ItemContainerStyle="{StaticResource ActionRowItemContainerStyle}"
                       ItemTemplate="{StaticResource CommandTemplate}"
                       ItemsSource="{x:Bind ViewModel.CommandList, Mode=OneWay}"
-                      SelectionMode="None" />
+                      SelectionMode="None">
+                <!--
+                    The framework ListViewItemPresenter reads its per-state backgrounds
+                    from these theme resources (not from ListViewItem.Background), so we
+                    override them here to match the card chrome on ActionRowItemContainerStyle.
+                -->
+                <ListView.Resources>
+                    <ResourceDictionary>
+                        <ResourceDictionary.ThemeDictionaries>
+                            <ResourceDictionary x:Key="Default">
+                                <StaticResource x:Key="ListViewItemBackground"
+                                                ResourceKey="ExpanderHeaderBackground" />
+                                <StaticResource x:Key="ListViewItemBackgroundPointerOver"
+                                                ResourceKey="ControlFillColorSecondaryBrush" />
+                                <StaticResource x:Key="ListViewItemBackgroundPressed"
+                                                ResourceKey="ControlFillColorTertiaryBrush" />
+                                <StaticResource x:Key="ListViewItemBackgroundSelected"
+                                                ResourceKey="ExpanderHeaderBackground" />
+                                <StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver"
+                                                ResourceKey="ControlFillColorSecondaryBrush" />
+                                <StaticResource x:Key="ListViewItemBackgroundSelectedPressed"
+                                                ResourceKey="ControlFillColorTertiaryBrush" />
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="HighContrast">
+                                <StaticResource x:Key="ListViewItemBackground"
+                                                ResourceKey="SystemColorButtonFaceColorBrush" />
+                            </ResourceDictionary>
+                        </ResourceDictionary.ThemeDictionaries>
+                    </ResourceDictionary>
+                </ListView.Resources>
+            </ListView>
         </StackPanel>
     </Border>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/EditAction.xaml b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
index 08d676bfa3..faa8bbeadc 100644
--- a/src/cascadia/TerminalSettingsEditor/EditAction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
@@ -47,9 +47,11 @@
                 <Setter Property="MinWidth" Value="160" />
             </Style>
 
-            <!--  Item container for the per-chord ListView. We're hosting a SettingContainer
-                  inside each item, so strip the default ListViewItem visuals (padding, border,
-                  hover/selection background) so they don't double up.  -->
+            <!--
+                Item container for the per-chord ListView. We're hosting a SettingContainer
+                inside each item, so strip the default ListViewItem visuals (padding, border,
+                hover/selection background) so they don't double up.
+            -->
             <Style x:Key="KeyChordListViewItemStyle"
                    BasedOn="{StaticResource DefaultListViewItemStyle}"
                    TargetType="ListViewItem">
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index 8677a04b25..162e5be21c 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -289,8 +289,8 @@
     <comment>Header for a control to toggle whether the terminal should automatically detect URLs and make them clickable, or not.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.Header" xml:space="preserve">
-    <value>Default URL to use for the "Search web" action</value>
-    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
+    <value>Default URL to use for the "Search web" shortcut</value>
+    <comment>Header for a control to set the query URL when using the "search web" shortcut.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
     <value>The placeholder "%s" will be replaced with the search query.</value>
@@ -590,7 +590,7 @@
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
   <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
-    <value>This allows actions such as Global Summon and Quake Mode actions to work even when no windows are open.</value>
+    <value>This allows shortcuts such as Global Summon and Quake Mode shortcuts to work even when no windows are open.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
   <data name="Globals_TabWidthMode.Header" xml:space="preserve">
@@ -682,12 +682,12 @@
     <comment>Header for the "rendering" menu item. This navigates to a page that lets you see and modify settings related to the app's rendering of text in the terminal.</comment>
   </data>
   <data name="Nav_Actions.Content" xml:space="preserve">
-    <value>Actions</value>
-    <comment>Header for the "actions" menu item. This navigates to a page that lets you see the available commands in the app.</comment>
+    <value>Shortcuts</value>
+    <comment>Header for the "shortcuts" menu item. This navigates to a page that lets you see the available keyboard shortcuts in the app. (Resource key kept as "Nav_Actions" for stability.)</comment>
   </data>
   <data name="Nav_EditAction.Content" xml:space="preserve">
-    <value>Edit Action...</value>
-    <comment>Header for the "edit action" page. This is the page that lets you modify a specific command and its key bindings.</comment>
+    <value>Edit Shortcut...</value>
+    <comment>Header for the "edit shortcut" page. This is the page that lets you modify a specific command and its key bindings. (Resource key kept as "Nav_EditAction" for stability.)</comment>
   </data>
   <data name="Nav_Extensions.Content" xml:space="preserve">
     <value>Extensions</value>
@@ -1766,28 +1766,28 @@
     <comment>A description for what the delete unfocused appearance button does.</comment>
   </data>
   <data name="Actions_Disclaimer.Content" xml:space="preserve">
-    <value>Learn more about actions</value>
-    <comment>Disclaimer presented at the top of the actions page to redirect the user to documentation regarding actions.</comment>
+    <value>Learn more about shortcuts</value>
+    <comment>Disclaimer presented at the top of the shortcuts page to redirect the user to documentation regarding keyboard shortcuts.</comment>
   </data>
   <data name="Actions_DeleteButton2.Text" xml:space="preserve">
-    <value>Delete action</value>
-    <comment>Button label that deletes the selected action.</comment>
+    <value>Delete shortcut</value>
+    <comment>Button label that deletes the selected shortcut.</comment>
   </data>
   <data name="Actions_Name.Text" xml:space="preserve">
-    <value>Action name</value>
-    <comment>Label for the text box that edits the action name.</comment>
+    <value>Shortcut name</value>
+    <comment>Label for the text box that edits the shortcut name.</comment>
   </data>
   <data name="Actions_NameEntryBox.PlaceholderText" xml:space="preserve">
-    <value>Action name</value>
-    <comment>Placeholder text for the text box where the user can edit the action name.</comment>
+    <value>Shortcut name</value>
+    <comment>Placeholder text for the text box where the user can edit the shortcut name.</comment>
   </data>
   <data name="Actions_ShortcutAction.Text" xml:space="preserve">
-    <value>Action type</value>
-    <comment>Label for the combo box that edits the action type.</comment>
+    <value>Shortcut type</value>
+    <comment>Label for the combo box that edits the shortcut type (which action runs when this shortcut is invoked).</comment>
   </data>
   <data name="Actions_KeyBindingsListView.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Keybindings</value>
-    <comment>Name for a control which contains the list of keybindings for the current command.</comment>
+    <value>Shortcuts</value>
+    <comment>Name for a control which contains the list of keyboard shortcuts for the current command.</comment>
   </data>
   <data name="Actions_CommandDetails.Text" xml:space="preserve">
     <value>Command details</value>
@@ -1798,44 +1798,44 @@
     <comment>Label for the list of editable arguments for the currently selected action.</comment>
   </data>
   <data name="Actions_Keybindings.Text" xml:space="preserve">
-    <value>Keybindings</value>
-    <comment>Label for the list of editable keybindings for the current command.</comment>
+    <value>Shortcuts</value>
+    <comment>Label for the list of editable keyboard shortcuts for the current command.</comment>
   </data>
   <data name="Actions_AddKeyChord.Text" xml:space="preserve">
-    <value>Add keybinding</value>
-    <comment>Button label that adds a keybinding to the current action.</comment>
+    <value>Add shortcut</value>
+    <comment>Button label that adds a keyboard shortcut to the current action.</comment>
   </data>
   <data name="Actions_AdditionalKeyChords" xml:space="preserve">
     <value>and {} more</value>
     <comment>Text that will be read out by a screen reader indicating that additional keybindings exist for this command. {} will be replaced by the number of additional keybindings.</comment>
   </data>
   <data name="Actions_DeleteConfirmationButton.Content" xml:space="preserve">
-    <value>Yes, delete key binding</value>
-    <comment>Button label that confirms deletion of a key binding entry.</comment>
+    <value>Yes, delete shortcut</value>
+    <comment>Button label that confirms deletion of a keyboard shortcut entry.</comment>
   </data>
   <data name="Actions_DeleteConfirmationMessage.Text" xml:space="preserve">
-    <value>Are you sure you want to delete this key binding?</value>
-    <comment>Confirmation message displayed when the user attempts to delete a key binding entry.</comment>
+    <value>Are you sure you want to delete this shortcut?</value>
+    <comment>Confirmation message displayed when the user attempts to delete a keyboard shortcut entry.</comment>
   </data>
   <data name="Actions_CommandDeleteConfirmationButton.Content" xml:space="preserve">
-    <value>Yes, delete action</value>
-    <comment>Button label that confirms deletion of an action.</comment>
+    <value>Yes, delete shortcut</value>
+    <comment>Button label that confirms deletion of a shortcut entry.</comment>
   </data>
   <data name="Actions_CommandDeleteConfirmationMessage.Text" xml:space="preserve">
-    <value>Are you sure you want to delete this action?</value>
-    <comment>Confirmation message displayed when the user attempts to delete an action.</comment>
+    <value>Are you sure you want to delete this shortcut?</value>
+    <comment>Confirmation message displayed when the user attempts to delete a shortcut entry.</comment>
   </data>
   <data name="Actions_InvalidKeyChordMessage" xml:space="preserve">
-    <value>Invalid key chord. Please enter a valid key chord.</value>
-    <comment>Error message displayed when an invalid key chord is input by the user.</comment>
+    <value>Invalid shortcut. Please enter a valid keyboard shortcut.</value>
+    <comment>Error message displayed when an invalid keyboard shortcut is input by the user.</comment>
   </data>
   <data name="Actions_RenameConflictConfirmationAcceptButton" xml:space="preserve">
     <value>Yes</value>
     <comment>Button label that confirms the deletion of a conflicting key binding to allow the current key binding to be registered.</comment>
   </data>
   <data name="Actions_RenameConflictConfirmationMessage" xml:space="preserve">
-    <value>The provided key chord is already being used by the following action:</value>
-    <comment>Error message displayed when a key chord that is already in use is input by the user. The name of the conflicting key chord is displayed after this message.</comment>
+    <value>The provided shortcut is already being used by the following action:</value>
+    <comment>Error message displayed when a keyboard shortcut that is already in use is input by the user. The name of the conflicting shortcut is displayed after this message.</comment>
   </data>
   <data name="Actions_RenameConflictConfirmationQuestion" xml:space="preserve">
     <value>Would you like to overwrite it?</value>
@@ -1862,64 +1862,60 @@
     <comment>Text label for a button that can be used to begin making changes to a key binding entry.</comment>
   </data>
   <data name="Actions_AddNewTextBlock.Text" xml:space="preserve">
-    <value>Add new key binding</value>
-    <comment>Button label that creates a new key binding on the actions page.</comment>
+    <value>Add new shortcut</value>
+    <comment>Button label that creates a new keyboard shortcut on the shortcuts page.</comment>
   </data>
   <data name="Actions_ViewAllKeyChordsButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>View all key bindings</value>
-    <comment>Tooltip for a button on each row of the Actions page that opens a flyout listing every key binding registered for that action.</comment>
+    <value>View all shortcuts</value>
+    <comment>Tooltip for a button on each row of the Shortcuts page that opens a flyout listing every keyboard shortcut registered for that action.</comment>
   </data>
   <data name="Actions_NoKeyBindings.Text" xml:space="preserve">
-    <value>No key bindings</value>
-    <comment>Empty-state message shown inside the "view all key bindings" flyout (opened from each row's "..." button on the Actions page) when the action has no key bindings registered.</comment>
+    <value>No shortcuts</value>
+    <comment>Empty-state message shown inside the "view all shortcuts" flyout (opened from each row's "..." button on the Shortcuts page) when the action has no keyboard shortcuts registered.</comment>
   </data>
   <data name="EditAction_ActionType.Header" xml:space="preserve">
-    <value>Action type</value>
-    <comment>Header for the action-type setting on the Edit Action page (lets the user pick which action runs when this command is invoked).</comment>
+    <value>Shortcut type</value>
+    <comment>Header for the shortcut-type setting on the Edit Shortcut page (lets the user pick which action runs when this shortcut is invoked).</comment>
   </data>
   <data name="EditAction_ActionName.Header" xml:space="preserve">
-    <value>Action name</value>
-    <comment>Header for the action-name setting on the Edit Action page (lets the user provide a friendly name for this command).</comment>
+    <value>Shortcut name</value>
+    <comment>Header for the shortcut-name setting on the Edit Shortcut page (lets the user provide a friendly name for this shortcut).</comment>
   </data>
   <data name="EditAction_KeyBindings.Header" xml:space="preserve">
-    <value>Key bindings</value>
-    <comment>Header for the key bindings expander on the Edit Action page.</comment>
+    <value>Shortcuts</value>
+    <comment>Header for the shortcuts expander on the Edit Shortcut page.</comment>
   </data>
   <data name="EditAction_KeyBindings.HelpText" xml:space="preserve">
     <value>Customize keyboard shortcuts to speed up common actions and workflows.</value>
-    <comment>Help text shown under the "Key bindings" header on the Edit Action page.</comment>
+    <comment>Help text shown under the "Shortcuts" header on the Edit Shortcut page.</comment>
   </data>
   <data name="EditAction_NewKeyBinding.Header" xml:space="preserve">
-    <value>New key binding</value>
-    <comment>Header for the "add a new key binding" row on the Edit Action page.</comment>
+    <value>New shortcut</value>
+    <comment>Header for the "add a new shortcut" row on the Edit Shortcut page.</comment>
   </data>
   <data name="EditAction_AddKeyBinding.Content" xml:space="preserve">
-    <value>Add key binding</value>
-    <comment>Label for the accent button that appends a new key binding to the current action.</comment>
+    <value>Add shortcut</value>
+    <comment>Label for the accent button that appends a new keyboard shortcut to the current action.</comment>
   </data>
   <data name="EditAction_AdditionalCustomizations.Header" xml:space="preserve">
     <value>Additional customizations</value>
     <comment>Header for the additional customizations expander on the Edit Action page (contains action name and per-action argument settings).</comment>
   </data>
   <data name="EditAction_AdditionalCustomizations.HelpText" xml:space="preserve">
-    <value>Fine tune how Actions behave.</value>
-    <comment>Help text shown under the "Additional customizations" header on the Edit Action page.</comment>
+    <value>Fine tune how shortcuts behave.</value>
+    <comment>Help text shown under the "Additional customizations" header on the Edit Shortcut page.</comment>
   </data>
   <data name="EditAction_KeyBindingNumberFormat" xml:space="preserve">
-    <value>Key Binding #{}</value>
-    <comment>{Locked="#{}"} Header label for an individual key binding inside the "Key bindings" expander on the Edit Action page. {} is replaced with the 1-based index of the binding (e.g. "Key Binding #1").</comment>
+    <value>Shortcut #{}</value>
+    <comment>{Locked="#{}"} Header label for an individual keyboard shortcut inside the "Shortcuts" expander on the Edit Shortcut page. {} is replaced with the 1-based index of the shortcut (e.g. "Shortcut #1").</comment>
   </data>
   <data name="EditAction_DeleteCommand.Header" xml:space="preserve">
-    <value>Delete this command</value>
-    <comment>Header for the setting container that holds the "Delete action" button at the bottom of the Edit Action page.</comment>
+    <value>Delete this shortcut</value>
+    <comment>Header for the setting container that holds the "Delete shortcut" button at the bottom of the Edit Shortcut page.</comment>
   </data>
   <data name="EditAction_DeleteCommand.HelpText" xml:space="preserve">
-    <value>This action will be removed and any key bindings associated with it will no longer work.</value>
-    <comment>Help text shown under the "Delete this command" setting container on the Edit Action page.</comment>
-  </data>
-  <data name="Actions_ActionComboBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Action</value>
-    <comment>Label for a control that sets the action of a key binding.</comment>
+    <value>This shortcut will be removed and any shortcuts associated with it will no longer work.</value>
+    <comment>Help text shown under the "Delete this shortcut" setting container on the Edit Shortcut page.</comment>
   </data>
   <data name="Actions_NullEnumValue" xml:space="preserve">
     <value>Use global setting</value>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index 81de09b305..dd4fd60256 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -121,6 +121,11 @@
     <Thickness x:Key="SettingContainerIconMargin">0,4,8,4</Thickness>
     <x:Double x:Key="SettingContainerIconFontSize">16</x:Double>
 
+    <!--  Shared sizing for SettingContainer-style "card" rows (used by SettingsCardStyle and Actions page rows).  -->
+    <Thickness x:Key="SettingsCardPadding">16,8,8,8</Thickness>
+    <x:Double x:Key="SettingsCardMinHeight">64</x:Double>
+    <Thickness x:Key="SettingsCardItemMargin">0,4,0,0</Thickness>
+
     <Style x:Key="StackPanelInExpanderStyle"
            TargetType="StackPanel">
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -163,8 +168,8 @@
     -->
     <Style x:Key="SettingsCardStyle"
            TargetType="Grid">
-        <Setter Property="MinHeight" Value="64" />
-        <Setter Property="Padding" Value="16,8,8,8" />
+        <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
+        <Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
         <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
         <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />