diff --git a/Aaru.Gui/Views/Windows/DeviceView.axaml b/Aaru.Gui/Views/Windows/DeviceView.axaml
index bab365f15..339dfaea7 100644
--- a/Aaru.Gui/Views/Windows/DeviceView.axaml
+++ b/Aaru.Gui/Views/Windows/DeviceView.axaml
@@ -163,7 +163,9 @@
                                                    VerticalAlignment="Center" />
                     </StackPanel>
                 </TabItem.Header>
-                <StackPanel Orientation="Vertical">
+                <StackPanel Orientation="Vertical"
+                            Margin="8"
+                            Spacing="8">
                     <Grid ColumnDefinitions="Auto, *"
                           ColumnSpacing="8">
                         <controls:SpectreTextBlock Grid.Column="0"
@@ -597,7 +599,8 @@
                         </Grid>
                     </StackPanel>
                     <StackPanel Grid.Row="2"
-                                Orientation="Horizontal">
+                                Orientation="Horizontal"
+                                Spacing="8">
                         <Button IsVisible="{Binding SaveReadMediaSerialVisible, Mode=OneWay}"
                                 Command="{Binding SaveReadMediaSerialCommand, Mode=OneWay}">
                             <TextBlock
@@ -625,7 +628,8 @@
                                    VerticalAlignment="Center" />
                     </StackPanel>
                 </TabItem.Header>
-                <StackPanel Orientation="Horizontal">
+                <StackPanel Orientation="Horizontal"
+                            Spacing="8">
                     <Button IsVisible="{Binding SaveGetConfigurationVisible, Mode=OneWay}"
                             Command="{Binding SaveGetConfigurationCommand, Mode=OneWay}">
                         <TextBlock Text="{x:Static localization:UI.ButtonLabel_Save_GET_CONFIGURATION_response}" />