diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml
index 9edde65f..918ba314 100644
--- a/Source/LibationAvalonia/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -89,61 +89,13 @@
 		</Style>
 
 		<Style Selector="dialogs|DialogWindow">
-			<Style Selector="^[UseCustomTitleBar=false]">
-				<Setter Property="SystemDecorations" Value="Full"/>
-				<Setter Property="Template">
-					<ControlTemplate>
-						<ContentPresenter Background="{DynamicResource SystemRegionColor}" Content="{TemplateBinding Content}" />
-					</ControlTemplate>
-				</Setter>
-			</Style>
-			<Style Selector="^[UseCustomTitleBar=true]">
-				<Style Selector="^[CanResize=false] Border#DialogWindowFormBorder">
-					<Setter Property="BorderThickness" Value="2" />
-				</Style>
-				<Setter Property="SystemDecorations" Value="BorderOnly"/>
-				<Setter Property="Template">
-					<ControlTemplate>
-						<Border Name="DialogWindowFormBorder" BorderBrush="{DynamicResource SystemBaseMediumLowColor}" Background="{DynamicResource SystemRegionColor}">
-							<Grid RowDefinitions="30,*">
-								<Border Name="DialogWindowTitleBorder" Margin="5,0" Background="{DynamicResource SystemAltMediumColor}">
-									<Border.Styles>
-										<Style Selector="Button#DialogCloseButton">
-											<Style Selector="^:pointerover">
-												<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-													<Setter Property="Background" Value="Red" />
-												</Style>
-												<Style Selector="^ Path">
-													<Setter Property="Fill" Value="{DynamicResource IconFill}" />
-												</Style>
-											</Style>
-											<Style Selector="^:not(:pointerover) /template/ ContentPresenter#PART_ContentPresenter">
-												<Setter Property="Background" Value="Transparent" />
-												<Setter Property="BorderBrush" Value="Transparent" />
-											</Style>
-										</Style>
-									</Border.Styles>
-								
-									<Grid ColumnDefinitions="Auto,*,Auto">
-
-										<Path Name="DialogWindowTitleIcon" Margin="3,5,0,5" Fill="{DynamicResource IconFill}" Stretch="Uniform"  Data="{StaticResource LibationGlassIcon}"/>
-									
-										<TextBlock Name="DialogWindowTitleTextBlock" Margin="8,0,0,0" VerticalAlignment="Center" FontWeight="DemiBold" FontSize="12" Grid.Column="1" Text="{TemplateBinding Title}" />
-
-										<Button Name="DialogCloseButton" Grid.Column="2">
-											<Path Fill="{DynamicResource SystemControlBackgroundBaseLowBrush}" VerticalAlignment="Center" Stretch="Uniform" RenderTransform="{StaticResource Rotate45Transform}" Data="{StaticResource CancelButtonIcon}" />
-										</Button>
-									</Grid>
-								</Border>
-								<Path Stroke="{DynamicResource SystemBaseMediumLowColor}" StrokeThickness="1" VerticalAlignment="Bottom" Stretch="Fill" Data="M0,0 L1,0" />
-								<ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}" />
-							</Grid>
-						</Border>
-					</ControlTemplate>
-				</Setter>
-			</Style>
-		</Style>
-		
+			<Setter Property="SystemDecorations" Value="Full"/>
+			<Setter Property="Template">
+				<ControlTemplate>
+					<ContentPresenter Background="{DynamicResource SystemRegionColor}" Content="{TemplateBinding Content}" />
+				</ControlTemplate>
+			</Setter>
+		</Style>		
 	</Application.Styles>
 
 	<NativeMenu.Menu>
diff --git a/Source/LibationAvalonia/Dialogs/DialogWindow.cs b/Source/LibationAvalonia/Dialogs/DialogWindow.cs
index 776c9cab..092aa3a9 100644
--- a/Source/LibationAvalonia/Dialogs/DialogWindow.cs
+++ b/Source/LibationAvalonia/Dialogs/DialogWindow.cs
@@ -12,98 +12,34 @@ namespace LibationAvalonia.Dialogs
 	{
 		protected bool CancelOnEscape { get; set; } = true;
 		protected bool SaveOnEnter { get; set; } = true;
-		public bool SaveAndRestorePosition { get; set; } = true;
+		public bool SaveAndRestorePosition { get; set; }
 		public Control ControlToFocusOnShow { get; set; }
 		protected override Type StyleKeyOverride => typeof(DialogWindow);
 
-		public static readonly StyledProperty<bool> UseCustomTitleBarProperty =
-		AvaloniaProperty.Register<DialogWindow, bool>(nameof(UseCustomTitleBar));
-
-		public bool UseCustomTitleBar
-		{
-			get { return GetValue(UseCustomTitleBarProperty); }
-			set { SetValue(UseCustomTitleBarProperty, value); }
-		}
-
-		public DialogWindow()
+		public DialogWindow(bool saveAndRestorePosition = true)
 		{
+			SaveAndRestorePosition = saveAndRestorePosition;
 			KeyDown += DialogWindow_KeyDown;
 			Initialized += DialogWindow_Initialized;
 			Opened += DialogWindow_Opened;
 			Closing += DialogWindow_Closing;
 
-			UseCustomTitleBar = Configuration.IsWindows;
-
 			if (Design.IsDesignMode)
 				RequestedThemeVariant = ThemeVariant.Dark;
 		}
 
-		private bool fixedMinHeight = false;
-		private bool fixedMaxHeight = false;
-		private bool fixedHeight = false;
-
-		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-		{
-			const int customTitleBarHeight = 30;
-			if (UseCustomTitleBar)
-			{
-				if (change.Property == MinHeightProperty && !fixedMinHeight)
-				{
-					fixedMinHeight = true;
-					MinHeight += customTitleBarHeight;
-					fixedMinHeight = false;
-				}
-				if (change.Property == MaxHeightProperty && !fixedMaxHeight)
-				{
-					fixedMaxHeight = true;
-					MaxHeight += customTitleBarHeight;
-					fixedMaxHeight = false;
-				}
-				if (change.Property == HeightProperty && !fixedHeight)
-				{
-					fixedHeight = true;
-					Height += customTitleBarHeight;
-					fixedHeight = false;
-				}
-			}
-			base.OnPropertyChanged(change);
-		}
-
-		public DialogWindow(bool saveAndRestorePosition) : this()
-		{
-			SaveAndRestorePosition = saveAndRestorePosition;
-		}
-
 		protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 		{
 			base.OnApplyTemplate(e);
 
-			if (!UseCustomTitleBar)
-				return;
-
-			var closeButton = e.NameScope.Find<Button>("DialogCloseButton");
-			var border = e.NameScope.Get<Border>("DialogWindowTitleBorder");
-			var titleBlock = e.NameScope.Get<TextBlock>("DialogWindowTitleTextBlock");
-			var icon = e.NameScope.Get<Avalonia.Controls.Shapes.Path>("DialogWindowTitleIcon");
-
-			closeButton.Click += CloseButton_Click;
-			border.PointerPressed += Border_PointerPressed;
-			icon.IsVisible = Icon != null;
-
 			if (MinHeight == MaxHeight && MinWidth == MaxWidth)
 			{
 				CanResize = false;
-				border.Margin = new Thickness(0);
-				icon.Margin = new Thickness(8, 5, 0, 5);
+				Height = MinHeight;
+				Width = MinWidth;
 			}
 		}
 
-		private void Border_PointerPressed(object sender, Avalonia.Input.PointerPressedEventArgs e)
-		{
-			if (e.GetCurrentPoint(null).Properties.IsLeftButtonPressed)
-				BeginMoveDrag(e);
-		}
-
 		private void CloseButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			CancelAndClose();
diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
index ea9980a5..6387c198 100644
--- a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
@@ -6,8 +6,8 @@
         mc:Ignorable="d" d:DesignWidth="265" d:DesignHeight="110"
 		MinWidth="265" MinHeight="110"
         x:Class="LibationAvalonia.Dialogs.MessageBoxWindow"
-        Title="{Binding Caption}" ShowInTaskbar="True"
-		Icon="/Assets/1x1.png">
+        Title="{Binding Caption}" ShowInTaskbar="True">
+	
 	<Grid ColumnDefinitions="*" RowDefinitions="*,Auto">
 		
 		<DockPanel Margin="5,10,10,20" Grid.Row="0">
diff --git a/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs
index 2d80a84d..5f45ef85 100644
--- a/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs
@@ -16,7 +16,7 @@ public partial class ThemePickerDialog : DialogWindow
 	protected DataGridCollectionView ThemeColors { get; }
 	private ChardonnayTheme ExistingTheme { get; } = ChardonnayTheme.GetLiveTheme();
 
-	public ThemePickerDialog() : base(saveAndRestorePosition: false)
+	public ThemePickerDialog()
 	{
 		InitializeComponent();
 		CancelOnEscape = false;
diff --git a/Source/LibationAvalonia/Themes/ChardonnayTheme.cs b/Source/LibationAvalonia/Themes/ChardonnayTheme.cs
index 53b95de6..ba13cd17 100644
--- a/Source/LibationAvalonia/Themes/ChardonnayTheme.cs
+++ b/Source/LibationAvalonia/Themes/ChardonnayTheme.cs
@@ -128,7 +128,6 @@ public class ChardonnayTheme : IUpdatable, ICloneable
 
 			App.Current.Styles.Add(newFluent);
 		}
-
 	}
 
 	/// <summary> Get the currently-active theme colors. </summary>