diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 6498042b63..13bc87f9b5 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -55,7 +55,9 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <ContextMenu x:Key="MahApps.TextBox.ContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu}" x:Shared="False">
+    <ContextMenu x:Key="MahApps.TextBox.ContextMenu"
+                 x:Shared="False"
+                 Style="{StaticResource MahApps.Styles.ContextMenu}">
         <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem}" />
         <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem}" />
         <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem}" />
diff --git a/src/MahApps.Metro/Styles/VS/ContextMenu.xaml b/src/MahApps.Metro/Styles/VS/ContextMenu.xaml
index c9fb349002..7f3385518d 100644
--- a/src/MahApps.Metro/Styles/VS/ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/VS/ContextMenu.xaml
@@ -55,7 +55,9 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <ContextMenu x:Key="MahApps.TextBox.ContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu.VisualStudio}" x:Shared="False">
+    <ContextMenu x:Key="MahApps.TextBox.ContextMenu"
+                 x:Shared="False"
+                 Style="{StaticResource MahApps.Styles.ContextMenu.VisualStudio}">
         <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem.VisualStudio}" />
         <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem.VisualStudio}" />
         <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem.VisualStudio}" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index ae6c0993c5..128515f428 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -22,6 +22,7 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForeground}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="MinWidth" Value="{DynamicResource ToggleSwitchThemeMinWidth}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
@@ -55,8 +56,8 @@
                                               TextElement.Foreground="{TemplateBinding mah:HeaderedControlHelper.HeaderForeground}"
                                               Visibility="Collapsed" />
 
-                            <Grid Grid.Row="1"
-                                  MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
+                            <Grid x:Name="SwitchContentGrid"
+                                  Grid.Row="1"
                                   HorizontalAlignment="Left"
                                   VerticalAlignment="Top">
 
@@ -345,6 +346,7 @@
                             <Setter TargetName="OffContentPresenter" Property="Grid.Column" Value="0" />
                             <Setter TargetName="OnContentPresenter" Property="Grid.Column" Value="0" />
                             <Setter TargetName="Switch" Property="Grid.Column" Value="2" />
+                            <Setter TargetName="SwitchContentGrid" Property="HorizontalAlignment" Value="Right" />
                         </Trigger>
 
                         <!--  MouseOver  -->