diff --git a/CHANGELIST.md b/CHANGELIST.md
index cbf8b22e..5199d18c 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -116,6 +116,7 @@
 - Enable tabs in input fields by default
 - Adjust row count in protection options
 - Pedantic GUI changes
+- More pendantic GUI changes
 
 ### 3.2.4 (2024-11-24)
 
diff --git a/MPF.UI/Windows/CheckDumpWindow.xaml b/MPF.UI/Windows/CheckDumpWindow.xaml
index f6062cc6..7557e3aa 100644
--- a/MPF.UI/Windows/CheckDumpWindow.xaml
+++ b/MPF.UI/Windows/CheckDumpWindow.xaml
@@ -111,7 +111,14 @@
 
             <!-- Check Dump / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
+                <GroupBox.Template>
+                    <ControlTemplate TargetType="GroupBox">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                        </Border>
+                    </ControlTemplate>
+                </GroupBox.Template>
+                <UniformGrid Columns="4" Margin="5,5,5,5" Height="27">
                     <Label/>
                     <!-- Empty label for padding -->
                     <Button Name="CheckDumpButton" Height="25" Width="80" IsDefault="True" Content="Check Dump"
diff --git a/MPF.UI/Windows/CreateIRDWindow.xaml b/MPF.UI/Windows/CreateIRDWindow.xaml
index 0e64883a..58baf775 100644
--- a/MPF.UI/Windows/CreateIRDWindow.xaml
+++ b/MPF.UI/Windows/CreateIRDWindow.xaml
@@ -193,7 +193,14 @@
 
             <!-- Create IRD / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
+                <GroupBox.Template>
+                    <ControlTemplate TargetType="GroupBox">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                        </Border>
+                    </ControlTemplate>
+                </GroupBox.Template>
+                <UniformGrid Columns="4" Margin="5,5,5,5" Height="27">
                     <Label/>
                     <!-- Empty label for padding -->
                     <Button Name="CreateIRDButton" Height="25" Width="80" IsDefault="True" Content="Create IRD"
diff --git a/MPF.UI/Windows/OptionsWindow.xaml b/MPF.UI/Windows/OptionsWindow.xaml
index 8465af22..ab6ddffc 100644
--- a/MPF.UI/Windows/OptionsWindow.xaml
+++ b/MPF.UI/Windows/OptionsWindow.xaml
@@ -487,7 +487,14 @@
 
             <!-- Accept / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
+                <GroupBox.Template>
+                    <ControlTemplate TargetType="GroupBox">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                        </Border>
+                    </ControlTemplate>
+                </GroupBox.Template>
+                <UniformGrid Columns="4" Margin="5,5,5,5" Height="27">
                     <Label/>
                     <!-- Empty label for padding -->
                     <Button Name="AcceptButton" Height="25" Width="80" IsDefault="True" Content="Accept"