diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index a6cf8fa7c9..b60b0e3840 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -73,7 +73,7 @@
                        AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_Typography_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Appearance_Section_Typography_Title_AccTitle"
                                    x:Uid="Appearance_Section_Typography_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -513,7 +513,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_Cursor_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Appearance_Section_Cursor_Title_AccTitle"
                                    x:Uid="Appearance_Section_Cursor_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -581,7 +581,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_BackgroundImage_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Appearance_Section_BackgroundImage_Title_AccTitle"
                                    x:Uid="Appearance_Section_BackgroundImage_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
index 97b0f8b6d0..1cfa195735 100644
--- a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
+++ b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
@@ -176,8 +176,14 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     </Style>
 
+    <Style x:Key="SectionExpanderHeaderStackStyle"
+           TargetType="StackPanel">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Padding" Value="0,12,0,12" />
+    </Style>
+
     <Style x:Key="SectionExpanderHeaderTextStyle"
-           BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+           BasedOn="{StaticResource BodyTextBlockStyle}"
            TargetType="TextBlock">
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index 159f74a1e4..a66ec7d01c 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -30,7 +30,7 @@
                        AutomationProperties.Name="{Binding Text, ElementName=Compatibility_Section_Compatibility_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Compatibility_Section_Compatibility_Title_AccTitle"
                                    x:Uid="Compatibility_Section_Compatibility_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -123,7 +123,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Compatibility_Section_Rendering_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Compatibility_Section_Rendering_Title_AccTitle"
                                    x:Uid="Compatibility_Section_Rendering_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp b/src/cascadia/TerminalSettingsEditor/Converters.cpp
similarity index 96%
rename from src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp
rename to src/cascadia/TerminalSettingsEditor/Converters.cpp
index 6358a4d178..0af0c63cfe 100644
--- a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Converters.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include "TerminalColorConverters.h"
+#include "Converters.h"
 #include "ColorToBrushConverter.g.cpp"
 #include "ColorToStringConverter.g.cpp"
 #include "EmptyStringToVisibilityConverter.g.cpp"
diff --git a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.h b/src/cascadia/TerminalSettingsEditor/Converters.h
similarity index 100%
rename from src/cascadia/TerminalSettingsEditor/TerminalColorConverters.h
rename to src/cascadia/TerminalSettingsEditor/Converters.h
diff --git a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.idl b/src/cascadia/TerminalSettingsEditor/Converters.idl
similarity index 100%
rename from src/cascadia/TerminalSettingsEditor/TerminalColorConverters.idl
rename to src/cascadia/TerminalSettingsEditor/Converters.idl
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 7f291d3d8d..c2430d0c8e 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -32,7 +32,7 @@
                        AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_VisualStyle_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Globals_Section_VisualStyle_Title_AccTitle"
                                    x:Uid="Globals_Section_VisualStyle_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -84,7 +84,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_TabsLayout_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Globals_Section_TabsLayout_Title_AccTitle"
                                    x:Uid="Globals_Section_TabsLayout_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -142,7 +142,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_WindowBehavior_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Globals_Section_WindowBehavior_Title_AccTitle"
                                    x:Uid="Globals_Section_WindowBehavior_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -171,7 +171,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_TitleBarIdentity_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Globals_Section_TitleBarIdentity_Title_AccTitle"
                                    x:Uid="Globals_Section_TitleBarIdentity_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -200,7 +200,7 @@
         <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_SystemIntegration_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
             <muxc:Expander.Header>
-                <StackPanel>
+                <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                     <TextBlock x:Name="Globals_Section_SystemIntegration_Title_AccTitle"
                                    x:Uid="Globals_Section_SystemIntegration_Title"
                                Style="{StaticResource SectionExpanderHeaderTextStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 03add079d7..e98138b79e 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -31,7 +31,7 @@
                            AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_Clipboard_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Interaction_Section_Clipboard_Title_AccTitle"
                                    x:Uid="Interaction_Section_Clipboard_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -77,7 +77,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_TextSelection_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Interaction_Section_TextSelection_Title_AccTitle"
                                    x:Uid="Interaction_Section_TextSelection_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -109,7 +109,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_WindowLayout_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Interaction_Section_WindowLayout_Title_AccTitle"
                                    x:Uid="Interaction_Section_WindowLayout_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -148,7 +148,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_MouseScrolling_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Interaction_Section_MouseScrolling_Title_AccTitle"
                                    x:Uid="Interaction_Section_MouseScrolling_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -177,7 +177,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_UrlsExternal_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Interaction_Section_UrlsExternal_Title_AccTitle"
                                    x:Uid="Interaction_Section_UrlsExternal_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -209,7 +209,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_Warnings_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Interaction_Section_Warnings_Title_AccTitle"
                                    x:Uid="Interaction_Section_Warnings_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index a9150c94e4..5f79f9bc9f 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -48,7 +48,7 @@
                            AutomationProperties.Name="{Binding Text, ElementName=Launch_Section_LaunchBehavior_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Launch_Section_LaunchBehavior_Title_AccTitle"
                                    x:Uid="Launch_Section_LaunchBehavior_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
@@ -248,7 +248,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Launch_Section_SystemInputDefaults_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Launch_Section_SystemInputDefaults_Title_AccTitle"
                                    x:Uid="Launch_Section_SystemInputDefaults_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index 9c14dffc3b..2b046fdec1 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -107,8 +107,8 @@
       <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="SegoeFluentIconList.h" />
-    <ClInclude Include="TerminalColorConverters.h">
-      <DependentUpon>TerminalColorConverters.idl</DependentUpon>
+    <ClInclude Include="Converters.h">
+      <DependentUpon>Converters.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="ColorSchemeViewModel.h">
@@ -309,8 +309,8 @@
       <DependentUpon>ActionsViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="TerminalColorConverters.cpp">
-      <DependentUpon>TerminalColorConverters.idl</DependentUpon>
+    <ClCompile Include="Converters.cpp">
+      <DependentUpon>Converters.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="ColorSchemeViewModel.cpp">
@@ -432,7 +432,7 @@
     </Midl>
     <Midl Include="ProfileViewModel.idl" />
     <Midl Include="ActionsViewModel.idl" />
-    <Midl Include="TerminalColorConverters.idl" />
+    <Midl Include="Converters.idl" />
     <Midl Include="ColorSchemeViewModel.idl" />
     <Midl Include="ColorSchemesPageViewModel.idl" />
     <Midl Include="InteractionViewModel.idl" />
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index ca9a61dfd4..812f7148bc 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -29,7 +29,7 @@
     <Midl Include="LaunchViewModel.idl" />
     <Midl Include="EnumEntry.idl" />
     <Midl Include="SettingContainer.idl" />
-    <Midl Include="TerminalColorConverters.idl" />
+    <Midl Include="Converters.idl" />
     <Midl Include="NewTabMenuViewModel.idl" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
index 2d0e00816e..61573fa983 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
@@ -367,7 +367,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             return RS_(L"Profile_DefaultsSectionHeader");
         }
-        return hstring{ fmt::format(fmt::runtime(std::wstring_view{ RS_(L"Profile_NameSectionHeaderFormat") }), Name()) };
+        return hstring{ RS_fmt(L"Profile_NameSectionHeaderFormat", Name()) };
     }
 
     hstring ProfileViewModel::AnswerbackMessagePreview() const
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 3ed51c124b..1c6d283f92 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -39,7 +39,7 @@
                            AutomationProperties.Name="{x:Bind Profile.SectionHeaderText, Mode=OneWay}"
                            Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock Style="{StaticResource SectionExpanderHeaderTextStyle}"
                                    Text="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" />
                     </StackPanel>
@@ -126,7 +126,7 @@
             <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Profile_Section_VisualUI_Title_AccTitle}"
                        Style="{StaticResource SectionExpanderStyle}">
                 <muxc:Expander.Header>
-                    <StackPanel>
+                    <StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
                         <TextBlock x:Name="Profile_Section_VisualUI_Title_AccTitle"
                                    x:Uid="Profile_Section_VisualUI_Title"
                                    Style="{StaticResource SectionExpanderHeaderTextStyle}" />