diff --git a/DiscordChatExporter.Gui/App.xaml b/DiscordChatExporter.Gui/App.xaml
index b571f865..3c6a890c 100644
--- a/DiscordChatExporter.Gui/App.xaml
+++ b/DiscordChatExporter.Gui/App.xaml
@@ -98,6 +98,10 @@
                 <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
             </Style>
 
+            <Style BasedOn="{StaticResource MaterialDesignDatePicker}" TargetType="{x:Type DatePicker}">
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+            </Style>
+
             <Style
                 x:Key="MaterialDesignFlatActionToggleButton"
                 BasedOn="{StaticResource MaterialDesignActionToggleButton}"
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
index 76eb3909..21a3a034 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
@@ -8,7 +8,7 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
-    Width="375"
+    Width="380"
     d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
     SnapsToDevicePixels="True"
     TextElement.FontSize="13"
@@ -19,7 +19,7 @@
     mc:Ignorable="d">
     <StackPanel>
         <!--  Guild/channel info  -->
-        <Grid Margin="8,16">
+        <Grid Margin="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -40,7 +40,7 @@
                 Grid.Column="1"
                 Margin="8,0,0,0"
                 VerticalAlignment="Center"
-                FontSize="17"
+                FontSize="19"
                 TextTrimming="CharacterEllipsis">
                 <Run
                     Foreground="{DynamicResource SecondaryTextBrush}"
@@ -56,7 +56,7 @@
 
         <!--  Format  -->
         <ComboBox
-            Margin="8"
+            Margin="16,8"
             materialDesign:HintAssist.Hint="Export format"
             materialDesign:HintAssist.IsFloating="True"
             IsReadOnly="True"
@@ -78,7 +78,7 @@
             <DatePicker
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="8"
+                Margin="16,8"
                 materialDesign:HintAssist.Hint="From (optional)"
                 materialDesign:HintAssist.IsFloating="True"
                 DisplayDateEnd="{Binding To}"
@@ -86,7 +86,7 @@
             <DatePicker
                 Grid.Row="0"
                 Grid.Column="1"
-                Margin="8"
+                Margin="16,8"
                 materialDesign:HintAssist.Hint="To (optional)"
                 materialDesign:HintAssist.IsFloating="True"
                 DisplayDateStart="{Binding From}"
@@ -95,7 +95,7 @@
 
         <!--  Partitioning  -->
         <TextBox
-            Margin="8"
+            Margin="16,8"
             materialDesign:HintAssist.Hint="Messages per partition (optional)"
             materialDesign:HintAssist.IsFloating="True"
             Text="{Binding PartitionLimit, TargetNullValue=''}" />
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
index b22311cb..8305b453 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
@@ -7,7 +7,7 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
-    MinWidth="250"
+    Width="300"
     d:DataContext="{d:DesignInstance Type=dialogs:SettingsViewModel}"
     SnapsToDevicePixels="True"
     TextElement.FontSize="13"
@@ -17,16 +17,22 @@
     TextOptions.TextRenderingMode="Auto"
     mc:Ignorable="d">
     <StackPanel>
+        <TextBlock
+            Margin="16"
+            FontSize="17"
+            Foreground="{DynamicResource PrimaryTextBrush}"
+            Text="Settings" />
+
         <!--  Date format  -->
         <TextBox
-            Margin="16,16,16,8"
+            Margin="16,8"
             materialDesign:HintAssist.Hint="Date format"
             materialDesign:HintAssist.IsFloating="True"
             Text="{Binding DateFormat}" />
 
         <!--  Message group limit  -->
         <TextBox
-            Margin="16,8,16,8"
+            Margin="16,8"
             materialDesign:HintAssist.Hint="Message group limit"
             materialDesign:HintAssist.IsFloating="True"
             Text="{Binding MessageGroupLimit}" />
@@ -34,11 +40,11 @@
         <!--  Auto-updates  -->
         <DockPanel LastChildFill="False">
             <TextBlock
-                Margin="16,8,16,8"
+                Margin="16,8"
                 DockPanel.Dock="Left"
                 Text="Auto-updates" />
             <ToggleButton
-                Margin="16,8,16,8"
+                Margin="16,8"
                 DockPanel.Dock="Right"
                 IsChecked="{Binding IsAutoUpdateEnabled}" />
         </DockPanel>