diff --git a/Wino.Core.Domain/Interfaces/IPreferencesService.cs b/Wino.Core.Domain/Interfaces/IPreferencesService.cs
index 14eef740..11575f8f 100644
--- a/Wino.Core.Domain/Interfaces/IPreferencesService.cs
+++ b/Wino.Core.Domain/Interfaces/IPreferencesService.cs
@@ -188,6 +188,11 @@ public interface IPreferencesService
     /// </summary>
     bool IsMailListActionBarEnabled { get; set; }
 
+    /// <summary>
+    /// Setting: Whether the mail rendering page will show the action labels
+    /// </summary>
+    bool IsShowActionLabelsEnabled { get; set; }
+
     #endregion
 
     #region Calendar
diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json
index 2edde941..211e8043 100644
--- a/Wino.Core.Domain/Translations/en_US/resources.json
+++ b/Wino.Core.Domain/Translations/en_US/resources.json
@@ -644,6 +644,8 @@
     "SettingsThreads_Title": "Conversation Threading",
     "SettingsUnlinkAccounts_Description": "Remove the link between accounts. his will not delete your accounts.",
     "SettingsUnlinkAccounts_Title": "Unlink Accounts",
+    "SettingsMailRendering_ActionLabels_Title": "Action labels",
+    "SettingsMailRendering_ActionLabels_Description": "Show action labels.",
     "SignatureDeleteDialog_Message": "Are you sure you want to delete \"{0}\" signature?",
     "SignatureDeleteDialog_Title": "Delete signature",
     "SignatureEditorDialog_SignatureName_Placeholder": "Name your signature",
diff --git a/Wino.Core.UWP/CoreGeneric.xaml b/Wino.Core.UWP/CoreGeneric.xaml
index fda84506..30e4a928 100644
--- a/Wino.Core.UWP/CoreGeneric.xaml
+++ b/Wino.Core.UWP/CoreGeneric.xaml
@@ -97,6 +97,19 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+
+            <!--  Spacing between cards  -->
+            <x:Double x:Key="SettingsCardSpacing">4</x:Double>
+
+            <!--  Style (inc. the correct spacing) of a section header  -->
+            <Style
+                x:Key="SettingsSectionHeaderTextBlockStyle"
+                BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+                TargetType="TextBlock">
+                <Style.Setters>
+                    <Setter Property="Margin" Value="1,30,0,6" />
+                </Style.Setters>
+            </Style>
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/Wino.Core.UWP/Services/PreferencesService.cs b/Wino.Core.UWP/Services/PreferencesService.cs
index c7508402..bdeffed2 100644
--- a/Wino.Core.UWP/Services/PreferencesService.cs
+++ b/Wino.Core.UWP/Services/PreferencesService.cs
@@ -79,6 +79,12 @@ public class PreferencesService : ObservableObject, IPreferencesService
         set => SetPropertyAndSave(nameof(IsMailListActionBarEnabled), value);
     }
 
+    public bool IsShowActionLabelsEnabled
+    {
+        get => _configurationService.Get(nameof(IsShowActionLabelsEnabled), true);
+        set => SetPropertyAndSave(nameof(IsShowActionLabelsEnabled), value);
+    }
+
     public bool IsShowSenderPicturesEnabled
     {
         get => _configurationService.Get(nameof(IsShowSenderPicturesEnabled), true);
diff --git a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
index 40a5c320..d2deb5cf 100644
--- a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
+++ b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
@@ -1,30 +1,28 @@
 using System.Collections;
 using System.Collections.Specialized;
 using System.Windows.Input;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Xaml.Interactivity;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
-using Wino.Controls;
+using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Core.UWP.Controls;
 using Wino.Helpers;
 
 namespace Wino.Behaviors;
 
-public class BindableCommandBarBehavior : Behavior<CommandBar>
+public partial class BindableCommandBarBehavior : Behavior<CommandBar>
 {
+    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
     public static readonly DependencyProperty PrimaryCommandsProperty = DependencyProperty.Register(
         "PrimaryCommands", typeof(object), typeof(BindableCommandBarBehavior),
         new PropertyMetadata(null, UpdateCommands));
 
-    public ICommand ItemClickedCommand
-    {
-        get { return (ICommand)GetValue(ItemClickedCommandProperty); }
-        set { SetValue(ItemClickedCommandProperty, value); }
-    }
-
-    public static readonly DependencyProperty ItemClickedCommandProperty = DependencyProperty.Register(nameof(ItemClickedCommand), typeof(ICommand), typeof(BindableCommandBarBehavior), new PropertyMetadata(null));
+    [GeneratedDependencyProperty]
+    public partial ICommand ItemClickedCommand { get; set; }
 
     public object PrimaryCommands
     {
@@ -83,7 +81,7 @@ public class BindableCommandBarBehavior : Behavior<CommandBar>
         AssociatedObject.PrimaryCommands.Clear();
         AssociatedObject.SecondaryCommands.Clear();
 
-        if (!(PrimaryCommands is IEnumerable enumerable)) return;
+        if (PrimaryCommands is not IEnumerable enumerable) return;
 
         foreach (var command in enumerable)
         {
@@ -98,19 +96,26 @@ public class BindableCommandBarBehavior : Behavior<CommandBar>
                 else
                 {
                     var label = XamlHelpers.GetOperationString(mailOperationMenuItem.Operation);
+                    var labelPosition = string.IsNullOrWhiteSpace(label) || !_preferencesService.IsShowActionLabelsEnabled ?
+                        CommandBarLabelPosition.Collapsed : CommandBarLabelPosition.Default;
                     menuItem = new AppBarButton
                     {
+                        Width = double.NaN,
+                        MinWidth = 40,
                         Icon = new WinoFontIcon() { Glyph = ControlConstants.WinoIconFontDictionary[XamlHelpers.GetWinoIconGlyph(mailOperationMenuItem.Operation)] },
                         Label = label,
-                        LabelPosition = string.IsNullOrWhiteSpace(label) ? CommandBarLabelPosition.Collapsed : CommandBarLabelPosition.Default,
+                        LabelPosition = labelPosition,
                         DataContext = mailOperationMenuItem,
                     };
 
-                    ToolTip toolTip = new ToolTip
+                    if (!string.IsNullOrWhiteSpace(label))
                     {
-                        Content = label
-                    };
-                    ToolTipService.SetToolTip((DependencyObject)menuItem, toolTip);
+                        var toolTip = new ToolTip
+                        {
+                            Content = label
+                        };
+                        ToolTipService.SetToolTip((DependencyObject)menuItem, toolTip);
+                    }
 
                     ((AppBarButton)menuItem).Click -= Button_Click;
                     ((AppBarButton)menuItem).Click += Button_Click;
@@ -164,7 +169,7 @@ public class BindableCommandBarBehavior : Behavior<CommandBar>
     private static void UpdateCommands(DependencyObject dependencyObject,
         DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
     {
-        if (!(dependencyObject is BindableCommandBarBehavior behavior)) return;
+        if (dependencyObject is not BindableCommandBarBehavior behavior) return;
 
         if (dependencyPropertyChangedEventArgs.OldValue is INotifyCollectionChanged oldList)
         {
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
index 1e0893fa..774c0e72 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
@@ -55,7 +55,8 @@
                 DefaultLabelPosition="Collapsed"
                 IsOpen="False">
                 <AppBarButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
                     LabelPosition="Collapsed"
                     ToolTipService.ToolTip="Light Theme"
@@ -66,7 +67,8 @@
                 </AppBarButton>
 
                 <AppBarButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
                     LabelPosition="Collapsed"
                     ToolTipService.ToolTip="Dark Theme"
@@ -79,7 +81,8 @@
                 <AppBarSeparator />
 
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}"
                     Label="Bold"
                     ToolTipService.ToolTip="Bold">
@@ -88,7 +91,8 @@
                     </AppBarToggleButton.Icon>
                 </AppBarToggleButton>
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}"
                     Label="Italic"
                     ToolTipService.ToolTip="Italic">
@@ -97,7 +101,8 @@
                     </AppBarToggleButton.Icon>
                 </AppBarToggleButton>
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}"
                     Label="Underline"
                     ToolTipService.ToolTip="Underline">
@@ -106,7 +111,8 @@
                     </AppBarToggleButton.Icon>
                 </AppBarToggleButton>
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}"
                     Label="Stroke"
                     ToolTipService.ToolTip="Stroke">
@@ -116,7 +122,8 @@
                 </AppBarToggleButton>
                 <AppBarSeparator />
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}"
                     Label="Bullet List"
                     ToolTipService.ToolTip="Bullet List">
@@ -125,7 +132,8 @@
                     </AppBarToggleButton.Icon>
                 </AppBarToggleButton>
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}"
                     Label="Ordered List"
                     ToolTipService.ToolTip="Ordered List">
@@ -137,7 +145,8 @@
                 <AppBarSeparator />
 
                 <AppBarButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     Click="{x:Bind WebViewEditor.EditorOutdentAsync}"
                     IsEnabled="{x:Bind WebViewEditor.IsEditorOutdentEnabled, Mode=OneWay}"
                     Label="Decrease Indent"
@@ -147,7 +156,8 @@
                     </AppBarButton.Icon>
                 </AppBarButton>
                 <AppBarButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     Click="{x:Bind WebViewEditor.EditorIndentAsync}"
                     IsEnabled="{x:Bind WebViewEditor.IsEditorIndentEnabled, Mode=OneWay}"
                     Label="Increase Indent"
@@ -157,7 +167,10 @@
                     </AppBarButton.Icon>
                 </AppBarButton>
 
-                <AppBarElementContainer VerticalAlignment="Center">
+                <AppBarElementContainer
+                    Width="Auto"
+                    MinWidth="40"
+                    VerticalAlignment="Center">
                     <ComboBox
                         Background="Transparent"
                         BorderBrush="Transparent"
@@ -201,7 +214,8 @@
                 </AppBarElementContainer>
                 <AppBarSeparator />
                 <AppBarButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     Click="{x:Bind WebViewEditor.ShowImagePicker}"
                     Label="Add Image"
                     ToolTipService.ToolTip="{x:Bind domain:Translator.Photos}">
@@ -218,7 +232,8 @@
                     </AppBarButton.Content>
                 </AppBarButton>
                 <AppBarButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     Click="{x:Bind WebViewEditor.ShowEmojiPicker}"
                     Label="Add Emoji"
                     ToolTipService.ToolTip="{x:Bind domain:Translator.Emoji}">
@@ -228,7 +243,8 @@
                 </AppBarButton>
 
                 <AppBarToggleButton
-                    Width="48"
+                    Width="Auto"
+                    MinWidth="40"
                     IsChecked="{x:Bind WebViewEditor.IsEditorWebViewEditor, Mode=TwoWay}"
                     Label="Webview ToolBar"
                     ToolTipService.ToolTip="Webview ToolBar">
diff --git a/Wino.Mail/Views/ComposePage.xaml b/Wino.Mail/Views/ComposePage.xaml
index 43a419e8..a0f0a02f 100644
--- a/Wino.Mail/Views/ComposePage.xaml
+++ b/Wino.Mail/Views/ComposePage.xaml
@@ -190,6 +190,8 @@
                             IsDynamicOverflowEnabled="True"
                             OverflowButtonAlignment="Left">
                             <AppBarButton
+                                Width="Auto"
+                                MinWidth="40"
                                 Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
                                 LabelPosition="Collapsed"
                                 ToolTipService.ToolTip="Light Theme"
@@ -200,6 +202,8 @@
                             </AppBarButton>
 
                             <AppBarButton
+                                Width="Auto"
+                                MinWidth="40"
                                 Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
                                 LabelPosition="Collapsed"
                                 ToolTipService.ToolTip="Dark Theme"
@@ -223,22 +227,38 @@
                     </toolkit:TabbedCommandBar.PaneCustomContent>
                     <toolkit:TabbedCommandBar.MenuItems>
                         <toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="{x:Bind domain:Translator.EditorToolbarOption_Format}">
-                            <AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}" Label="Bold">
+                            <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
+                                IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}"
+                                Label="Bold">
                                 <AppBarToggleButton.Icon>
                                     <PathIcon Data="{StaticResource BoldPathIcon}" />
                                 </AppBarToggleButton.Icon>
                             </AppBarToggleButton>
-                            <AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}" Label="Italic">
+                            <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
+                                IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}"
+                                Label="Italic">
                                 <AppBarToggleButton.Icon>
                                     <PathIcon Data="{StaticResource ItalicPathIcon}" />
                                 </AppBarToggleButton.Icon>
                             </AppBarToggleButton>
-                            <AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}" Label="Underline">
+                            <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
+                                IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}"
+                                Label="Underline">
                                 <AppBarToggleButton.Icon>
                                     <PathIcon Data="{StaticResource UnderlinePathIcon}" />
                                 </AppBarToggleButton.Icon>
                             </AppBarToggleButton>
-                            <AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}" Label="Stroke">
+                            <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
+                                IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}"
+                                Label="Stroke">
                                 <AppBarToggleButton.Icon>
                                     <PathIcon Data="{StaticResource StrikePathIcon}" />
                                 </AppBarToggleButton.Icon>
@@ -246,13 +266,21 @@
 
                             <AppBarSeparator />
 
-                            <AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}" Label="Bullet List">
+                            <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
+                                IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}"
+                                Label="Bullet List">
                                 <AppBarToggleButton.Icon>
                                     <PathIcon Data="{StaticResource BulletedListPathIcon}" />
                                 </AppBarToggleButton.Icon>
                             </AppBarToggleButton>
 
-                            <AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}" Label="Ordered List">
+                            <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
+                                IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}"
+                                Label="Ordered List">
                                 <AppBarToggleButton.Icon>
                                     <PathIcon Data="{StaticResource OrderedListPathIcon}" />
                                 </AppBarToggleButton.Icon>
@@ -261,6 +289,8 @@
                             <AppBarSeparator />
 
                             <AppBarButton
+                                Width="Auto"
+                                MinWidth="40"
                                 Click="{x:Bind WebViewEditor.EditorOutdentAsync}"
                                 IsEnabled="{x:Bind WebViewEditor.IsEditorOutdentEnabled, Mode=OneWay}"
                                 Label="Outdent">
@@ -272,6 +302,8 @@
                             </AppBarButton>
 
                             <AppBarButton
+                                Width="Auto"
+                                MinWidth="40"
                                 Click="{x:Bind WebViewEditor.EditorIndentAsync}"
                                 IsEnabled="{x:Bind WebViewEditor.IsEditorIndentEnabled, Mode=OneWay}"
                                 Label="Indent">
@@ -282,7 +314,11 @@
                                 </AppBarButton.Content>
                             </AppBarButton>
 
-                            <AppBarElementContainer HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <AppBarElementContainer
+                                Width="Auto"
+                                MinWidth="40"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center">
                                 <ComboBox
                                     x:Name="AlignmentListView"
                                     VerticalAlignment="Center"
@@ -330,6 +366,8 @@
                             <AppBarSeparator />
 
                             <AppBarToggleButton
+                                Width="Auto"
+                                MinWidth="40"
                                 IsChecked="{x:Bind WebViewEditor.IsEditorWebViewEditor, Mode=TwoWay}"
                                 Label="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}"
                                 ToolTipService.ToolTip="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}">
diff --git a/Wino.Mail/Views/Settings/AboutPage.xaml b/Wino.Mail/Views/Settings/AboutPage.xaml
index 09743b01..e4ceb635 100644
--- a/Wino.Mail/Views/Settings/AboutPage.xaml
+++ b/Wino.Mail/Views/Settings/AboutPage.xaml
@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <StackPanel Spacing="3">
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
             <Image
                 Width="50"
                 Height="50"
diff --git a/Wino.Mail/Views/Settings/AppPreferencesPage.xaml b/Wino.Mail/Views/Settings/AppPreferencesPage.xaml
index d181e57f..0499a2d6 100644
--- a/Wino.Mail/Views/Settings/AppPreferencesPage.xaml
+++ b/Wino.Mail/Views/Settings/AppPreferencesPage.xaml
@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <StackPanel>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
             <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_StartupBehavior_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_StartupBehavior_Title}">
                 <ToggleButton
                     x:Name="StartupEnabledToggleButton"
diff --git a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml b/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
index 81689a58..6eb22871 100644
--- a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
+++ b/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
@@ -15,7 +15,7 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <StackPanel Spacing="3">
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
             <controls:SettingsExpander Description="{x:Bind domain:Translator.AccountDetailsPage_Description}" Header="{x:Bind domain:Translator.AccountDetailsPage_Title}">
                 <controls:SettingsExpander.HeaderIcon>
                     <SymbolIcon Symbol="Contact" />
diff --git a/Wino.Mail/Views/Settings/LanguageTimePage.xaml b/Wino.Mail/Views/Settings/LanguageTimePage.xaml
index 2c243904..5a501b07 100644
--- a/Wino.Mail/Views/Settings/LanguageTimePage.xaml
+++ b/Wino.Mail/Views/Settings/LanguageTimePage.xaml
@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <StackPanel>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
             <controls:SettingsCard
                 CommandParameter="Language"
                 Description="{x:Bind domain:Translator.SettingsLanguage_Description}"
diff --git a/Wino.Mail/Views/Settings/MessageListPage.xaml b/Wino.Mail/Views/Settings/MessageListPage.xaml
index 42c4b830..91a492d6 100644
--- a/Wino.Mail/Views/Settings/MessageListPage.xaml
+++ b/Wino.Mail/Views/Settings/MessageListPage.xaml
@@ -11,7 +11,7 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <StackPanel>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
             <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsHoverActions_Description}" Header="{x:Bind domain:Translator.SettingsHoverActions_Title}">
                 <controls:SettingsExpander.HeaderIcon>
                     <PathIcon Data="F1 M 19.980469 12.802734 C 19.980469 13.206381 19.895832 13.59375 19.726562 13.964844 L 18.466797 16.777344 C 18.304035 17.141928 18.066406 17.447916 17.753906 17.695312 C 17.441406 17.942709 17.089844 18.108725 16.699219 18.193359 L 14.335938 18.691406 C 14.153645 18.723959 13.987629 18.740234 13.837891 18.740234 C 13.447266 18.740234 13.082682 18.658854 12.744141 18.496094 C 12.405599 18.333334 12.106119 18.108725 11.845703 17.822266 C 11.539713 17.490234 11.223958 17.163086 10.898438 16.84082 C 10.572916 16.518555 10.231119 16.21582 9.873047 15.932617 C 9.514974 15.649414 9.140625 15.393881 8.75 15.166016 C 8.359375 14.938151 7.949219 14.746094 7.519531 14.589844 C 7.591146 14.752604 7.661133 14.916992 7.729492 15.083008 C 7.797852 15.249023 7.832031 15.423178 7.832031 15.605469 C 7.832031 15.846354 7.768555 16.069336 7.641602 16.274414 C 7.514648 16.479492 7.340495 16.634115 7.119141 16.738281 L 5.878906 17.324219 C 5.709635 17.402344 5.530599 17.441406 5.341797 17.441406 C 5.08138 17.441406 4.845377 17.369791 4.633789 17.226562 C 4.4222 17.083334 4.270833 16.891275 4.179688 16.650391 L 3.222656 14.189453 L 1.650391 16.015625 C 1.461589 16.236979 1.227214 16.347656 0.947266 16.347656 C 0.680339 16.347656 0.455729 16.25651 0.273438 16.074219 C 0.091146 15.891928 0 15.667318 0 15.400391 L 0 3.847656 C 0 3.58073 0.091146 3.356121 0.273438 3.173828 C 0.455729 2.991537 0.680339 2.900391 0.947266 2.900391 C 1.181641 2.900391 1.393229 2.985027 1.582031 3.154297 L 9.658203 10.703125 C 9.847005 10.878906 9.954427 11.08724 9.980469 11.328125 C 10.195312 11.354167 10.408528 11.381836 10.620117 11.411133 C 10.831705 11.44043 11.041666 11.474609 11.25 11.513672 L 11.25 6.875 C 11.25 6.621095 11.298828 6.380209 11.396484 6.152344 C 11.494141 5.924479 11.629231 5.724284 11.801758 5.551758 C 11.974283 5.379232 12.174479 5.244142 12.402344 5.146484 C 12.630207 5.048829 12.871093 5.000001 13.125 5 C 13.378905 5.000001 13.619791 5.048829 13.847656 5.146484 C 14.075521 5.244142 14.275716 5.379232 14.448242 5.551758 C 14.620768 5.724284 14.755858 5.924479 14.853516 6.152344 C 14.951171 6.380209 14.999999 6.621095 15 6.875 L 15 9.492188 L 17.734375 10.058594 C 18.144531 10.143229 18.522135 10.315756 18.867188 10.576172 C 19.212238 10.836589 19.479166 11.1556 19.667969 11.533203 C 19.765625 11.728516 19.842121 11.933594 19.897461 12.148438 C 19.952799 12.363281 19.980469 12.581381 19.980469 12.802734 Z M 5.341797 16.191406 L 6.582031 15.605469 L 5.351562 12.539062 C 5.305989 12.428386 5.283203 12.311198 5.283203 12.1875 C 5.283203 11.927084 5.374349 11.705729 5.556641 11.523438 C 5.738932 11.341146 5.960286 11.25 6.220703 11.25 L 8.417969 11.25 L 1.25 4.560547 L 1.25 14.560547 L 2.607422 12.978516 C 2.698568 12.87435 2.80599 12.792969 2.929688 12.734375 C 3.053385 12.675781 3.183594 12.646484 3.320312 12.646484 C 3.509114 12.646484 3.683268 12.701823 3.842773 12.8125 C 4.002278 12.923178 4.117838 13.066406 4.189453 13.242188 Z M 18.730469 12.8125 C 18.730469 12.630209 18.699543 12.454428 18.637695 12.285156 C 18.575846 12.115886 18.489582 11.962891 18.378906 11.826172 C 18.268229 11.689453 18.136393 11.573894 17.983398 11.479492 C 17.830402 11.385092 17.66276 11.318359 17.480469 11.279297 L 14.248047 10.615234 C 14.104816 10.582683 13.986002 10.50944 13.891602 10.395508 C 13.7972 10.281576 13.75 10.14974 13.75 10 L 13.75 6.875 C 13.75 6.705729 13.68815 6.559245 13.564453 6.435547 C 13.440755 6.31185 13.294271 6.25 13.125 6.25 C 12.955729 6.25 12.809244 6.31185 12.685547 6.435547 C 12.561849 6.559245 12.5 6.705729 12.5 6.875 L 12.5 12.294922 C 12.5 12.464193 12.439778 12.610678 12.319336 12.734375 C 12.198893 12.858073 12.054036 12.919922 11.884766 12.919922 C 11.767578 12.919922 11.652018 12.903646 11.538086 12.871094 C 11.424153 12.838542 11.311849 12.809245 11.201172 12.783203 C 10.810547 12.698568 10.416666 12.630209 10.019531 12.578125 C 9.622396 12.526042 9.222005 12.5 8.818359 12.5 C 8.68815 12.5 8.55957 12.503256 8.432617 12.509766 C 8.305664 12.516276 8.185221 12.53418 8.071289 12.563477 C 7.957356 12.592773 7.849935 12.643229 7.749023 12.714844 C 7.648112 12.786459 7.558594 12.884115 7.480469 13.007812 C 7.5 13.11849 7.558594 13.204753 7.65625 13.266602 C 7.753906 13.328451 7.848307 13.375651 7.939453 13.408203 C 8.447266 13.610026 8.916016 13.836264 9.345703 14.086914 C 9.775391 14.337565 10.183919 14.611003 10.571289 14.907227 C 10.958658 15.203451 11.333008 15.525717 11.694336 15.874023 C 12.055664 16.222332 12.418619 16.595053 12.783203 16.992188 C 12.919922 17.141928 13.079427 17.262369 13.261719 17.353516 C 13.44401 17.444662 13.639322 17.490234 13.847656 17.490234 C 13.886719 17.490234 13.925781 17.490234 13.964844 17.490234 C 14.003906 17.490234 14.042969 17.483725 14.082031 17.470703 L 16.445312 16.972656 C 16.640625 16.927084 16.814777 16.842447 16.967773 16.71875 C 17.120768 16.595053 17.239582 16.442057 17.324219 16.259766 L 18.59375 13.447266 C 18.684895 13.245443 18.730469 13.033854 18.730469 12.8125 Z " />
diff --git a/Wino.Mail/Views/Settings/PersonalizationPage.xaml b/Wino.Mail/Views/Settings/PersonalizationPage.xaml
index a7a95238..1625f4a4 100644
--- a/Wino.Mail/Views/Settings/PersonalizationPage.xaml
+++ b/Wino.Mail/Views/Settings/PersonalizationPage.xaml
@@ -51,7 +51,7 @@
     </Page.Resources>
 
     <ScrollViewer>
-        <StackPanel Spacing="3">
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
             <!--  Accent Color  -->
             <controls:SettingsExpander
                 Description="{x:Bind domain:Translator.SettingsAccentColor_Description}"
diff --git a/Wino.Mail/Views/Settings/ReadComposePanePage.xaml b/Wino.Mail/Views/Settings/ReadComposePanePage.xaml
index f3158576..acea58b9 100644
--- a/Wino.Mail/Views/Settings/ReadComposePanePage.xaml
+++ b/Wino.Mail/Views/Settings/ReadComposePanePage.xaml
@@ -11,8 +11,8 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <StackPanel Spacing="4">
-            <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.SettingsReader_Title}" />
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsReader_Title}" />
             <controls:SettingsExpander
                 Description="{x:Bind domain:Translator.SettingsReaderFontFamily_Description}"
                 Header="{x:Bind domain:Translator.SettingsReaderFont_Title}"
@@ -52,6 +52,13 @@
                 </controls:SettingsExpander.Items>
             </controls:SettingsExpander>
 
+            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsMailRendering_ActionLabels_Description}" Header="{x:Bind domain:Translator.SettingsMailRendering_ActionLabels_Title}">
+                <controls:SettingsCard.HeaderIcon>
+                    <PathIcon Data="F1 M 0 7.5 C 0 6.822917 0.169271 6.191406 0.507812 5.605469 C 0.839844 5.039062 1.289062 4.589844 1.855469 4.257812 C 2.441406 3.919271 3.072917 3.75 3.75 3.75 L 16.25 3.75 C 16.927082 3.75 17.558594 3.919271 18.144531 4.257812 C 18.710938 4.589844 19.160156 5.039062 19.492188 5.605469 C 19.830729 6.191406 20 6.822917 20 7.5 L 20 11.25 C 20 11.927084 19.830729 12.558594 19.492188 13.144531 C 19.160156 13.710938 18.710938 14.160156 18.144531 14.492188 C 17.558594 14.830729 16.927082 15 16.25 15 L 3.75 15 C 3.072917 15 2.441406 14.830729 1.855469 14.492188 C 1.289062 14.160156 0.839844 13.710938 0.507812 13.144531 C 0.169271 12.558594 0 11.927084 0 11.25 Z M 3.75 5 C 3.294271 5.000001 2.875977 5.112306 2.495117 5.336914 C 2.114258 5.561524 1.811523 5.864259 1.586914 6.245117 C 1.362305 6.625978 1.25 7.044271 1.25 7.5 L 1.25 11.25 C 1.25 11.705729 1.362305 12.124023 1.586914 12.504883 C 1.811523 12.885742 2.114258 13.188477 2.495117 13.413086 C 2.875977 13.637695 3.294271 13.75 3.75 13.75 L 16.25 13.75 C 16.705729 13.75 17.124023 13.637695 17.504883 13.413086 C 17.885742 13.188477 18.188477 12.885742 18.413086 12.504883 C 18.637695 12.124023 18.75 11.705729 18.75 11.25 L 18.75 7.5 C 18.75 7.044271 18.637695 6.625978 18.413086 6.245117 C 18.188477 5.864259 17.885742 5.561524 17.504883 5.336914 C 17.124023 5.112306 16.705729 5.000001 16.25 5 Z M 8.75 9.375 C 8.75 9.199219 8.810221 9.051107 8.930664 8.930664 C 9.051106 8.810222 9.199219 8.75 9.375 8.75 L 15 8.75 C 15.17578 8.75 15.323893 8.810222 15.444336 8.930664 C 15.564778 9.051107 15.625 9.199219 15.625 9.375 C 15.625 9.550781 15.564778 9.698894 15.444336 9.819336 C 15.323893 9.939779 15.17578 10 15 10 L 9.375 10 C 9.199219 10 9.051106 9.939779 8.930664 9.819336 C 8.810221 9.698894 8.75 9.550781 8.75 9.375 Z M 7.5 9.375 C 7.5 9.713542 7.415364 10.026042 7.246094 10.3125 C 7.076823 10.598959 6.848958 10.826823 6.5625 10.996094 C 6.276042 11.165365 5.963542 11.25 5.625 11.25 C 5.286458 11.25 4.973958 11.165365 4.6875 10.996094 C 4.401042 10.826823 4.173177 10.598959 4.003906 10.3125 C 3.834635 10.026042 3.75 9.713542 3.75 9.375 C 3.75 9.036459 3.834635 8.723959 4.003906 8.4375 C 4.173177 8.151042 4.401042 7.923178 4.6875 7.753906 C 4.973958 7.584636 5.286458 7.5 5.625 7.5 C 5.963542 7.5 6.276042 7.584636 6.5625 7.753906 C 6.848958 7.923178 7.076823 8.151042 7.246094 8.4375 C 7.415364 8.723959 7.5 9.036459 7.5 9.375 Z " />
+                </controls:SettingsCard.HeaderIcon>
+                <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsShowActionLabelsEnabled, Mode=TwoWay}" />
+            </controls:SettingsCard>
+
             <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsExternalContent_Description}" Header="{x:Bind domain:Translator.SettingsExternalContent_Title}">
                 <controls:SettingsExpander.HeaderIcon>
                     <PathIcon Data="F1 M 4.023438 13.75 C 3.476562 13.75 2.958984 13.636068 2.470703 13.408203 C 1.982422 13.180339 1.554362 12.875977 1.186523 12.495117 C 0.818685 12.114258 0.528971 11.674805 0.317383 11.176758 C 0.105794 10.678711 0 10.159506 0 9.619141 C 0 9.065756 0.094401 8.535156 0.283203 8.027344 C 0.472005 7.519531 0.737305 7.068686 1.079102 6.674805 C 1.420898 6.280926 1.829427 5.961915 2.304688 5.717773 C 2.779948 5.473634 3.304036 5.338543 3.876953 5.3125 L 4.189453 5.302734 C 4.261067 4.501953 4.453125 3.776043 4.765625 3.125 C 5.078125 2.473959 5.488281 1.915691 5.996094 1.450195 C 6.503906 0.984701 7.097981 0.626629 7.77832 0.375977 C 8.458658 0.125326 9.199219 0 10 0 C 10.800781 0 11.541341 0.126953 12.22168 0.380859 C 12.902018 0.634766 13.496093 0.99284 14.003906 1.455078 C 14.511718 1.917318 14.921874 2.473959 15.234375 3.125 C 15.546874 3.776043 15.738932 4.501953 15.810547 5.302734 L 15.966797 5.302734 C 16.513672 5.302734 17.032877 5.416667 17.524414 5.644531 C 18.015949 5.872396 18.44401 6.176758 18.808594 6.557617 C 19.173176 6.938477 19.462891 7.379558 19.677734 7.880859 C 19.892578 8.382162 20 8.902995 20 9.443359 L 20 9.667969 C 20 9.700521 20 9.736328 20 9.775391 C 20 9.814453 19.996744 9.850261 19.990234 9.882812 C 19.573566 9.375 19.108072 8.932292 18.59375 8.554688 C 18.489582 8.248698 18.346354 7.972006 18.164062 7.724609 C 17.98177 7.477214 17.770182 7.267253 17.529297 7.094727 C 17.28841 6.922201 17.021484 6.788737 16.728516 6.694336 C 16.435547 6.599936 16.129557 6.552735 15.810547 6.552734 C 15.472005 6.552735 15.192057 6.446941 14.970703 6.235352 C 14.749349 6.023764 14.61263 5.755209 14.560547 5.429688 C 14.527994 5.195312 14.49056 4.967448 14.448242 4.746094 C 14.405924 4.52474 14.342447 4.300131 14.257812 4.072266 C 14.088541 3.603516 13.862304 3.193359 13.579102 2.841797 C 13.295897 2.490234 12.970377 2.195639 12.602539 1.958008 C 12.2347 1.720379 11.831055 1.542969 11.391602 1.425781 C 10.952148 1.308594 10.488281 1.25 10 1.25 C 9.511719 1.25 9.047852 1.308594 8.608398 1.425781 C 8.168945 1.542969 7.765299 1.71875 7.397461 1.953125 C 7.029622 2.1875 6.704102 2.480469 6.420898 2.832031 C 6.137695 3.183594 5.911458 3.59375 5.742188 4.0625 C 5.657552 4.290365 5.594075 4.514975 5.551758 4.736328 C 5.50944 4.957683 5.472005 5.188803 5.439453 5.429688 C 5.38737 5.813803 5.236002 6.097006 4.985352 6.279297 C 4.7347 6.46159 4.423828 6.552735 4.052734 6.552734 C 3.655599 6.552735 3.286133 6.635743 2.944336 6.801758 C 2.602539 6.967774 2.306315 7.189129 2.055664 7.46582 C 1.805013 7.742514 1.608073 8.059896 1.464844 8.417969 C 1.321615 8.776042 1.25 9.147136 1.25 9.53125 C 1.25 9.928386 1.321615 10.30599 1.464844 10.664062 C 1.608073 11.022136 1.806641 11.337891 2.060547 11.611328 C 2.314453 11.884766 2.61556 12.101237 2.963867 12.260742 C 3.312174 12.420248 3.691406 12.5 4.101562 12.5 L 7.431641 12.5 C 7.373047 12.708334 7.327474 12.916667 7.294922 13.125 C 7.26237 13.333334 7.236328 13.541667 7.216797 13.75 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 14.375 17.578125 C 14.570312 17.578125 14.736328 17.509766 14.873047 17.373047 L 17.373047 14.873047 C 17.509766 14.736328 17.578125 14.570312 17.578125 14.375 C 17.578125 14.179688 17.509766 14.013672 17.373047 13.876953 C 17.236328 13.740234 17.070312 13.671875 16.875 13.671875 C 16.679688 13.671875 16.513672 13.740234 16.376953 13.876953 L 15 15.253906 L 15 11.875 C 14.999999 11.705729 14.93815 11.559245 14.814453 11.435547 C 14.690755 11.31185 14.544271 11.25 14.375 11.25 C 14.205729 11.25 14.059244 11.31185 13.935547 11.435547 C 13.811849 11.559245 13.75 11.705729 13.75 11.875 L 13.75 15.253906 L 12.373047 13.876953 C 12.236328 13.740234 12.070312 13.671875 11.875 13.671875 C 11.679688 13.671875 11.513672 13.740234 11.376953 13.876953 C 11.240234 14.013672 11.171875 14.179688 11.171875 14.375 C 11.171875 14.570312 11.240234 14.736328 11.376953 14.873047 L 13.876953 17.373047 C 14.013672 17.509766 14.179688 17.578125 14.375 17.578125 Z " />
@@ -78,10 +85,7 @@
                 </controls:SettingsExpander.Items>
             </controls:SettingsExpander>
 
-            <TextBlock
-                Margin="0,20,0,0"
-                FontWeight="SemiBold"
-                Text="{x:Bind domain:Translator.SettingsComposer_Title}" />
+            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsComposer_Title}" />
             <controls:SettingsExpander
                 Description="{x:Bind domain:Translator.SettingsComposerFontFamily_Description}"
                 Header="{x:Bind domain:Translator.SettingsComposerFont_Title}"
diff --git a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
index 7462f312..743bf037 100644
--- a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
+++ b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
@@ -53,7 +53,7 @@
     </Page.Resources>
 
     <ScrollViewer>
-        <Grid RowSpacing="41">
+        <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -69,8 +69,8 @@
                 <ToggleSwitch IsOn="{x:Bind ViewModel.IsSignatureEnabled, Mode=TwoWay}" />
             </controls1:SettingsCard>
 
-            <StackPanel Grid.Row="1" Spacing="4">
-                <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.SettingsSignature_SignatureDefaults}" />
+            <StackPanel Grid.Row="1" Spacing="{StaticResource SettingsCardSpacing}">
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsSignature_SignatureDefaults}" />
                 <controls1:SettingsCard
                     Header="{x:Bind domain:Translator.SettingsSignature_ForNewMessages_Title}"
                     IsActionIconVisible="False"
@@ -100,8 +100,8 @@
                 </controls1:SettingsCard>
             </StackPanel>
 
-            <StackPanel Grid.Row="2" Spacing="3">
-                <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.SettingsSignature_Signatures}" />
+            <StackPanel Grid.Row="2" Spacing="{StaticResource SettingsCardSpacing}">
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsSignature_Signatures}" />
                 <controls1:SettingsCard
                     Header="{x:Bind domain:Translator.SettingsSignature_AddCustomSignature_Title}"
                     IsActionIconVisible="False"