diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 157df05030..121878423a 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -84,7 +84,7 @@
       <Border.Background>
         <SolidColorBrush Color="White" Opacity="0.7" />
       </Border.Background>
-      <TextBlock Margin="5 5 5 0" Text="Content In TitleBar" />
+      <TextBlock Margin="5 5 5 0" Text="Content In Title Bar" />
     </Border>
   </Panel>
 </Window>
diff --git a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
index db2a8a465a..b90f43c3b6 100644
--- a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
@@ -6,7 +6,7 @@
              x:Class="ControlCatalog.Pages.WindowCustomizationsPage">
   <StackPanel Spacing="10"  Margin="25">
     <CheckBox Content="Extend Client Area to Decorations" IsChecked="{Binding ExtendClientAreaEnabled}" />
-    <CheckBox Content="Titlebar" IsChecked="{Binding SystemTitleBarEnabled}" />    
+    <CheckBox Content="Title Bar" IsChecked="{Binding SystemTitleBarEnabled}" />    
     <CheckBox Content="Prefer System Chrome" IsChecked="{Binding PreferSystemChromeEnabled}" />
     <Slider Minimum="-1" Maximum="200" Value="{Binding TitleBarHeight}" />
     <ComboBox x:Name="TransparencyLevels" SelectedIndex="{Binding TransparencyLevel}">
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 3b36cad649..5ef26f1b27 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -104,7 +104,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<double> ExtendClientAreaTitleBarHeightHintProperty =
             AvaloniaProperty.Register<Window, double>(nameof(ExtendClientAreaTitleBarHeightHint), -1);
 
-
         /// <summary>
         /// Defines the <see cref="IsExtendedIntoWindowDecorations"/> property.
         /// </summary>
@@ -124,7 +123,6 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<Window, Thickness>(nameof(OffScreenMargin),
                 o => o.OffScreenMargin);
 
-
         /// <summary>
         /// Defines the <see cref="SystemDecorations"/> property.
         /// </summary>
@@ -534,9 +532,7 @@ namespace Avalonia.Controls
         protected virtual void ExtendClientAreaToDecorationsChanged(bool isExtended)
         {
             IsExtendedIntoWindowDecorations = isExtended;
-
             WindowDecorationMargins = PlatformImpl.ExtendedMargins;
-
             OffScreenMargin = PlatformImpl.OffScreenMargin;
 
             if (PlatformImpl.NeedsManagedDecorations)
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index ef2bd32bfc..885591495b 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -138,9 +138,9 @@ namespace Avalonia.Native
             return false;
         }
         
-        private void InvalidateExtendedMargins ()
+        private void InvalidateExtendedMargins()
         {
-            if(WindowState ==  WindowState.FullScreen)
+            if (WindowState ==  WindowState.FullScreen)
             {
                 ExtendedMargins = new Thickness();
             }
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index aac4b1a5dd..f19f9e97aa 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -266,7 +266,7 @@ namespace Avalonia.Native
             return args.Handled;
         }
 
-        protected virtual bool ChromeHitTest (RawPointerEventArgs e)
+        protected virtual bool ChromeHitTest(RawPointerEventArgs e)
         {
             return false;
         }
diff --git a/src/Avalonia.Themes.Default/CaptionButtons.xaml b/src/Avalonia.Themes.Default/CaptionButtons.xaml
index 282448bdd5..68249905a1 100644
--- a/src/Avalonia.Themes.Default/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Default/CaptionButtons.xaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="CaptionButtons">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="Canvas.Right" Value="0" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/CaptionButtons.xaml
index 282448bdd5..68249905a1 100644
--- a/src/Avalonia.Themes.Fluent/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/CaptionButtons.xaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="CaptionButtons">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="Canvas.Right" Value="0" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 67095a6fd5..0ba1d311bc 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -377,7 +377,7 @@ namespace Avalonia.Win32
 
                         if (windowState != _lastWindowState)
                         {
-                            _lastWindowState = windowState;                                                       
+                            _lastWindowState = windowState;
 
                             WindowStateChanged?.Invoke(windowState);