diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index ae8bb17c..f1503e9e 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -572,12 +572,14 @@
                 Value="0,0,1,1" />
         <Setter Property="FocusVisualStyle"
                 Value="{x:Null}" />
+        <Setter Property="Padding"
+                Value="2,2,0,2" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Border Background="Transparent"
                             x:Name="ButtonPaddingBorder"
-                            Padding="2,2,0,2">
+                            Padding="{TemplateBinding Padding}">
                         <Border BorderThickness="{TemplateBinding BorderThickness}"
                                 BorderBrush="{DynamicResource ButtonDarkShadow}"
                                 x:Name="ButtonOuterBottomBorder">
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index 9ac169b5..fb40d525 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -112,8 +112,8 @@
     <Style TargetType="ToggleButton"
            x:Key="ShowDesktopButton"
            BasedOn="{StaticResource StartButton}">
-        <Setter Property="Margin"
-                Value="-2,0,2,0" />
+        <Setter Property="Padding"
+                Value="0,2,2,2" />
         <Setter Property="HorizontalAlignment"
                 Value="Center" />
         <Style.Triggers>