diff --git a/src/Avalonia.Themes.Default/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
index 9ce4da0873..9d1c024eb9 100644
--- a/src/Avalonia.Themes.Default/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
@@ -87,7 +87,6 @@
             Grid.Row="0"
             Content="{TemplateBinding Content}"
             ContentTemplate="{TemplateBinding ContentTemplate}"
-            Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
             VerticalAlignment="Top"/>
 
           <Grid Grid.Row="1"
@@ -163,6 +162,13 @@
     </Setter>
   </Style>
 
+  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
+  </Style>
+  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter:empty">
+    <Setter Property="Margin" Value="0" />
+  </Style>
+
   <!-- NormalState -->
   <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
     <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
diff --git a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
index 56249f5986..2491225a44 100644
--- a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
@@ -31,7 +31,7 @@
           Text="The previewer Shows a preview off your code, this could slow down your system"
           TextWrapping="Wrap"/>
         <ToggleSwitch
-          Content="Previewer"
+          Background="Green"
           IsChecked="True" />
       </StackPanel>
     </StackPanel>
@@ -53,7 +53,6 @@
             Grid.Row="0"
             Content="{TemplateBinding Content}"
             ContentTemplate="{TemplateBinding ContentTemplate}"
-            Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
             VerticalAlignment="Top"/>
 
           <Grid Grid.Row="1"
@@ -129,6 +128,13 @@
     </Setter>
   </Style>
 
+  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
+  </Style>
+  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter:empty">
+    <Setter Property="Margin" Value="0" />
+  </Style>
+
   <!-- NormalState -->
   <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
     <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>