diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml
index edcce03e..b7f2e1bb 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml
@@ -104,13 +104,20 @@
                     </ComboBox>
 
                     <!--  Advanced section  -->
-                    <StackPanel IsVisible="{Binding IsAdvancedSectionDisplayed}" Orientation="Vertical">
+                    <StackPanel
+                        Margin="16,8"
+                        IsVisible="{Binding IsAdvancedSectionDisplayed}"
+                        Orientation="Vertical"
+                        Spacing="16">
                         <!--  Date limits  -->
-                        <Grid ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        <Grid
+                            ColumnDefinitions="*,*"
+                            ColumnSpacing="16"
+                            RowDefinitions="*,*"
+                            RowSpacing="16">
                             <DatePicker
                                 Grid.Row="0"
                                 Grid.Column="0"
-                                Margin="16,8,8,8"
                                 materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AfterDateLabel}"
                                 SelectedDate="{Binding AfterDate}"
                                 ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}">
@@ -125,7 +132,6 @@
                             <DatePicker
                                 Grid.Row="0"
                                 Grid.Column="1"
-                                Margin="8,8,16,8"
                                 materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.BeforeDateLabel}"
                                 SelectedDate="{Binding BeforeDate}"
                                 ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}">
@@ -142,7 +148,6 @@
                             <TimePicker
                                 Grid.Row="1"
                                 Grid.Column="0"
-                                Margin="16,8,8,8"
                                 materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AfterTimeLabel}"
                                 ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
                                 IsEnabled="{Binding IsAfterDateSet}"
@@ -159,7 +164,6 @@
                             <TimePicker
                                 Grid.Row="1"
                                 Grid.Column="1"
-                                Margin="8,8,16,8"
                                 materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.BeforeTimeLabel}"
                                 ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
                                 IsEnabled="{Binding IsBeforeDateSet}"
@@ -177,7 +181,6 @@
 
                         <!--  Partitioning  -->
                         <TextBox
-                            Margin="16,8"
                             materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.PartitionLimitLabel}"
                             Text="{Binding PartitionLimitValue}"
                             Theme="{DynamicResource FilledTextBox}"
@@ -185,42 +188,31 @@
 
                         <!--  Filtering  -->
                         <TextBox
-                            Margin="16,8"
                             materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.MessageFilterLabel}"
                             Text="{Binding MessageFilterValue}"
                             Theme="{DynamicResource FilledTextBox}"
                             ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}" />
 
                         <!--  Reverse message order  -->
-                        <DockPanel
-                            Margin="16,8"
-                            LastChildFill="False"
-                            ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}">
+                        <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}">
                             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReverseMessageOrderLabel}" />
                             <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsReverseMessageOrder}" />
                         </DockPanel>
 
                         <!--  Markdown formatting  -->
-                        <DockPanel
-                            Margin="16,8"
-                            LastChildFill="False"
-                            ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}">
+                        <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}">
                             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.FormatMarkdownLabel}" />
                             <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldFormatMarkdown}" />
                         </DockPanel>
 
                         <!--  Download assets  -->
-                        <DockPanel
-                            Margin="16,8"
-                            LastChildFill="False"
-                            ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}">
+                        <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}">
                             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.DownloadAssetsLabel}" />
                             <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldDownloadAssets}" />
                         </DockPanel>
 
                         <!--  Reuse assets  -->
                         <DockPanel
-                            Margin="16,8"
                             IsEnabled="{Binding ShouldDownloadAssets}"
                             LastChildFill="False"
                             ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}">
@@ -230,7 +222,6 @@
 
                         <!--  Assets path  -->
                         <TextBox
-                            Margin="16,8"
                             materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AssetsDirPathLabel}"
                             IsEnabled="{Binding ShouldDownloadAssets}"
                             Text="{Binding AssetsDirPath}"
@@ -259,7 +250,8 @@
         <Grid
             Grid.Row="2"
             Margin="16"
-            ColumnDefinitions="Auto,*,Auto,Auto">
+            ColumnDefinitions="Auto,*,Auto,Auto"
+            ColumnSpacing="8">
             <ToggleButton
                 Grid.Column="0"
                 IsChecked="{Binding IsAdvancedSectionDisplayed}"
@@ -284,7 +276,6 @@
                 Theme="{DynamicResource MaterialOutlineButton}" />
             <Button
                 Grid.Column="3"
-                Margin="16,0,0,0"
                 Command="{Binding CloseCommand}"
                 Content="{Binding LocalizationManager.CancelButton}"
                 IsCancel="True"
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml
index 201a96f2..c5f254e3 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml
@@ -20,12 +20,12 @@
             BorderBrush="{DynamicResource MaterialDividerBrush}"
             BorderThickness="0,1">
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel Orientation="Vertical">
+                <StackPanel
+                    Margin="16,8"
+                    Orientation="Vertical"
+                    Spacing="16">
                     <!--  Theme  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.ThemeTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ThemeTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ThemeLabel}" />
                         <ComboBox
                             Width="150"
@@ -35,10 +35,7 @@
                     </DockPanel>
 
                     <!--  Language  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LanguageLabel}" />
                         <ComboBox
                             Width="150"
@@ -49,7 +46,6 @@
 
                     <!--  Auto-updates  -->
                     <DockPanel
-                        Margin="16,8"
                         IsVisible="{Binding IsAutoUpdateAvailable}"
                         LastChildFill="False"
                         ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}">
@@ -58,7 +54,7 @@
                     </DockPanel>
 
                     <!--  Persist token  -->
-                    <DockPanel Margin="16,8" LastChildFill="False">
+                    <DockPanel LastChildFill="False">
                         <ToolTip.Tip>
                             <TextBlock
                                 MaxWidth="400"
@@ -70,10 +66,7 @@
                     </DockPanel>
 
                     <!--  Rate limit preference  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.RateLimitPreferenceLabel}" />
                         <ComboBox
                             Width="150"
@@ -89,10 +82,7 @@
                     </DockPanel>
 
                     <!--  Thread inclusion mode  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ShowThreadsLabel}" />
                         <ComboBox
                             Width="150"
@@ -102,10 +92,7 @@
                     </DockPanel>
 
                     <!--  Locale  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LocaleLabel}" />
                         <ComboBox
                             Width="150"
@@ -121,22 +108,19 @@
                     </DockPanel>
 
                     <!--  UTC normalization  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.NormalizeToUtcLabel}" />
                         <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsUtcNormalizationEnabled}" />
                     </DockPanel>
 
                     <!--  Parallel limit  -->
-                    <DockPanel
-                        Margin="16,8"
-                        LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}">
+                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ParallelLimitLabel}" />
-                        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
-                            <TextBlock Margin="10,0" Text="{Binding ParallelLimit}" />
+                        <StackPanel
+                            DockPanel.Dock="Right"
+                            Orientation="Horizontal"
+                            Spacing="10">
+                            <TextBlock Text="{Binding ParallelLimit}" />
                             <Slider
                                 Width="150"
                                 IsSnapToTickEnabled="True"
@@ -161,4 +145,4 @@
             IsDefault="True"
             Theme="{DynamicResource MaterialOutlineButton}" />
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>