From e509f842e44989c43ac65177c6ef661c48f3d623 Mon Sep 17 00:00:00 2001
From: Michael Bucari-Tovo <mbucari1@gmail.com>
Date: Tue, 18 Mar 2025 21:14:47 -0600
Subject: [PATCH] Remove unused windows forms buttons and streamline dialogs

---
 Source/LibationAvalonia/App.axaml             |  1 +
 .../Dialogs/AboutDialog.axaml                 |  3 +-
 .../Dialogs/AccountsDialog.axaml              |  3 +-
 .../Dialogs/BookDetailsDialog.axaml           |  3 +-
 .../Dialogs/BookRecordsDialog.axaml           |  3 +-
 .../LibationAvalonia/Dialogs/DialogWindow.cs  | 12 ++--
 .../Dialogs/EditQuickFilters.axaml            |  1 -
 .../Dialogs/EditReplacementChars.axaml        |  3 +-
 .../Dialogs/EditTemplateDialog.axaml          |  1 -
 .../Dialogs/ImageDisplayDialog.axaml          |  3 +-
 .../Dialogs/LibationFilesDialog.axaml         |  3 +-
 .../LiberatedStatusBatchAutoDialog.axaml      |  3 +-
 .../LiberatedStatusBatchManualDialog.axaml    |  3 +-
 .../Dialogs/LocateAudiobooksDialog.axaml      |  3 +-
 .../Dialogs/Login/ApprovalNeededDialog.axaml  |  3 +-
 .../Dialogs/Login/CaptchaDialog.axaml         |  3 +-
 .../Dialogs/Login/LoginCallbackDialog.axaml   |  3 +-
 .../Login/LoginChoiceEagerDialog.axaml        |  3 +-
 .../Dialogs/Login/LoginExternalDialog.axaml   |  3 +-
 .../Dialogs/Login/MfaDialog.axaml             |  3 +-
 .../Dialogs/Login/WebLoginDialog.axaml        |  1 -
 .../Dialogs/Login/_2faCodeDialog.axaml        |  3 +-
 .../Dialogs/MessageBoxAlertAdminDialog.axaml  |  3 +-
 .../Dialogs/ScanAccountsDialog.axaml          |  3 +-
 .../Dialogs/SearchSyntaxDialog.axaml          |  3 +-
 .../Dialogs/SettingsDialog.axaml              |  3 +-
 .../Dialogs/TagsBatchDialog.axaml             |  3 +-
 .../Dialogs/UpgradeNotificationDialog.axaml   |  4 +-
 Source/LibationAvalonia/FormSaveExtension.cs  | 59 +++++++++++++++++++
 .../Views/SeriesViewDialog.axaml              |  1 -
 30 files changed, 90 insertions(+), 56 deletions(-)

diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml
index 918ba314..2cb9795f 100644
--- a/Source/LibationAvalonia/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -90,6 +90,7 @@
 
 		<Style Selector="dialogs|DialogWindow">
 			<Setter Property="SystemDecorations" Value="Full"/>
+			<Setter Property="Icon" Value="/Assets/libation.ico"/>
 			<Setter Property="Template">
 				<ControlTemplate>
 					<ContentPresenter Background="{DynamicResource SystemRegionColor}" Content="{TemplateBinding Content}" />
diff --git a/Source/LibationAvalonia/Dialogs/AboutDialog.axaml b/Source/LibationAvalonia/Dialogs/AboutDialog.axaml
index 151cc1b1..9f590f87 100644
--- a/Source/LibationAvalonia/Dialogs/AboutDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AboutDialog.axaml
@@ -7,8 +7,7 @@
 		Width="400" Height="520"
         x:Class="LibationAvalonia.Dialogs.AboutDialog"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-        Title="About Libation"
-		Icon="/Assets/libation.ico">
+        Title="About Libation">
 	
 	<Grid Margin="10" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
 		
diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
index 9cf38207..b6ef31d0 100644
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
@@ -5,8 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.AccountsDialog"
-        Title="Audible Accounts"
-		Icon="/Assets/libation.ico">
+        Title="Audible Accounts">
 	<Grid RowDefinitions="*,Auto">
 
 		<Grid.Styles>
diff --git a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
index ed529e13..c7c7ed3f 100644
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
@@ -7,8 +7,7 @@
 		Width="650" Height="500"
         x:Class="LibationAvalonia.Dialogs.BookDetailsDialog"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-        Title="Book Details" Name="BookDetails"
-		Icon="/Assets/libation.ico">
+        Title="Book Details" Name="BookDetails">
 
 	<Grid RowDefinitions="*,Auto,Auto,40">
 		<Grid.Styles>
diff --git a/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml b/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml
index 92f6252e..e181d106 100644
--- a/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml
@@ -5,8 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="450"
 		Width="700" Height="450"
         x:Class="LibationAvalonia.Dialogs.BookRecordsDialog"
-        Title="BookRecordsDialog"
-		Icon="/Assets/libation.ico">
+        Title="BookRecordsDialog">
 
 	<Grid RowDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/Dialogs/DialogWindow.cs b/Source/LibationAvalonia/Dialogs/DialogWindow.cs
index 092aa3a9..bda5e804 100644
--- a/Source/LibationAvalonia/Dialogs/DialogWindow.cs
+++ b/Source/LibationAvalonia/Dialogs/DialogWindow.cs
@@ -22,12 +22,19 @@ namespace LibationAvalonia.Dialogs
 			KeyDown += DialogWindow_KeyDown;
 			Initialized += DialogWindow_Initialized;
 			Opened += DialogWindow_Opened;
+			Loaded += DialogWindow_Loaded;
 			Closing += DialogWindow_Closing;
 
 			if (Design.IsDesignMode)
 				RequestedThemeVariant = ThemeVariant.Dark;
 		}
 
+		private void DialogWindow_Loaded(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (!CanResize)
+				this.HideMinMaxBtns();
+		}
+
 		protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 		{
 			base.OnApplyTemplate(e);
@@ -40,11 +47,6 @@ namespace LibationAvalonia.Dialogs
 			}
 		}
 
-		private void CloseButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			CancelAndClose();
-		}
-
 		private void DialogWindow_Initialized(object sender, EventArgs e)
 		{
 			this.WindowStartupLocation = WindowStartupLocation.CenterOwner;
diff --git a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
index 4fef0328..28a0927e 100644
--- a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
@@ -7,7 +7,6 @@
         Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditQuickFilters"
         Title="Audible Accounts"
-		Icon="/Assets/libation.ico"
 		x:DataType="dialogs:EditQuickFilters">
 	<Grid RowDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
index f8d8a42b..d04f1161 100644
--- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
@@ -6,8 +6,7 @@
 		MinWidth="500" MinHeight="450"
 		Width="500" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
-        Title="Illegal Character Replacement"		
-		Icon="/Assets/libation.ico">
+        Title="Illegal Character Replacement">
 
 	<Grid
 		RowDefinitions="*,Auto"
diff --git a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
index 9b29ec9e..2994870c 100644
--- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
@@ -6,7 +6,6 @@
 		Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
 		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
-		Icon="/Assets/libation.ico"
         Title="EditTemplateDialog">
 
 	<Grid RowDefinitions="Auto,*,Auto">
diff --git a/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml b/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
index 46654fb7..7a08fb95 100644
--- a/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
@@ -7,8 +7,7 @@
 		MinWidth="500" MinHeight="500"
 		Width="500" Height="520"
         Title="Cover"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Image Stretch="Uniform" Source="{Binding CoverImage}">
 		<Image.ContextMenu>
diff --git a/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
index ce8c93fb..5c66986e 100644
--- a/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
@@ -9,8 +9,7 @@
         x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
 		WindowStartupLocation="CenterScreen"
-        Title="Book Details"
-		Icon="/Assets/libation.ico">
+        Title="Book Details">
 	
 	<Grid
 		RowDefinitions="Auto,Auto">
diff --git a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
index 44d56413..cdd05454 100644
--- a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
@@ -9,8 +9,7 @@
 		MinHeight="135" MaxHeight="135"
 		MinWidth="550" MaxWidth="550"
 		Width="550" Height="135"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
  
 	<Grid Margin="10" RowDefinitions="Auto,Auto">
 		
diff --git a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
index 984e39d6..b28a5bc8 100644
--- a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
@@ -9,8 +9,7 @@
 		MinWidth="400" MinHeight="100"
 		MaxWidth="400" MaxHeight="100"
 		Width="400" Height="100"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml b/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml
index 3d4004bf..142ea69a 100644
--- a/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml
@@ -6,8 +6,7 @@
 		Width="600" Height="450"
 		x:Class="LibationAvalonia.Dialogs.LocateAudiobooksDialog"
         Title="Locate Audiobooks"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid Margin="5" ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
 		<TextBlock Grid.Column="0" Text="Found Audiobooks" />
diff --git a/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
index 1a6476f2..8d52c43c 100644
--- a/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
@@ -8,8 +8,7 @@
 		Width="240" Height="140"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
-        Title="Approval Alert Detected"
-		Icon="/Assets/libation.ico">
+        Title="Approval Alert Detected">
 
 	<Grid RowDefinitions="Auto,Auto,*">
 
diff --git a/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
index 1ab14620..4c4ab245 100644
--- a/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
@@ -8,8 +8,7 @@
 		Width="220" Height="250"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
-        Title="CAPTCHA"
-		Icon="/Assets/libation.ico">
+        Title="CAPTCHA">
 
 	<Grid
 		RowDefinitions="Auto,Auto,Auto,Auto,*"
diff --git a/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
index 7531be98..51b3cfe2 100644
--- a/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
@@ -7,8 +7,7 @@
 		Width="300" Height="120"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.LoginCallbackDialog"
-        Title="Audible Login" 
-		Icon="/Assets/libation.ico">
+        Title="Audible Login">
 
 
 	<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">
diff --git a/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
index 71596e98..d8adce88 100644
--- a/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
@@ -8,8 +8,7 @@
 		WindowStartupLocation="CenterOwner"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
-        Title="Audible Login"
-		Icon="/Assets/libation.ico" >
+        Title="Audible Login">
 
 	<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">
 		
diff --git a/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
index be84a3f6..4c070927 100644
--- a/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
@@ -6,8 +6,7 @@
 		Width="650" Height="500"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.LoginExternalDialog"
-        Title="Audible Login External"
-		Icon="/Assets/libation.ico">
+        Title="Audible Login External">
 
 	<Grid RowDefinitions="Auto,Auto,*,Auto,*" ColumnDefinitions="*" Margin="5">
 
diff --git a/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
index 61f8fb75..7304cea3 100644
--- a/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
@@ -8,8 +8,7 @@
 		Width="400" Height="200"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.MfaDialog"
-        Title="Two-Step Verification"
-		Icon="/Assets/libation.ico">
+        Title="Two-Step Verification">
 
 	<Grid RowDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml
index 0e1ed63d..3fa2efca 100644
--- a/Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml
@@ -7,7 +7,6 @@
         x:Class="LibationAvalonia.Dialogs.Login.WebLoginDialog"
 		Width="500" Height="800"
 		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico"
         Title="Audible Login">
 	<controls:NativeWebView Name="webView" />
 </Window>
diff --git a/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
index 648de8da..b8050f4c 100644
--- a/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
@@ -8,8 +8,7 @@
 		Width="200" Height="200"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login._2faCodeDialog"
-        Title="2FA Code"
-		Icon="/Assets/libation.ico">
+        Title="2FA Code">
 	
 	<Grid
 		VerticalAlignment="Stretch"
diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
index 6a91166d..e8fdaed8 100644
--- a/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
@@ -9,8 +9,7 @@
         x:Class="LibationAvalonia.Dialogs.MessageBoxAlertAdminDialog"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="MessageBoxAlertAdminDialog"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid RowDefinitions="Auto,*,Auto,Auto">
 
diff --git a/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
index f9c99e99..861ef45e 100644
--- a/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
@@ -7,8 +7,7 @@
 		MinWidth="500" MinHeight="160"
 		Width="500" Height="200"
         Title="Which Accounts?"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,*,Auto">
 		
diff --git a/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
index c98ce952..6240e94b 100644
--- a/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
@@ -8,8 +8,7 @@
 		Width="800" Height="650"
         x:Class="LibationAvalonia.Dialogs.SearchSyntaxDialog"
         Title="Filter Options"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid
 		Margin="10,0,10,10"
diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
index 5ecbb30f..ce5b79d5 100644
--- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
@@ -10,8 +10,7 @@
         xmlns:settings="clr-namespace:LibationAvalonia.Controls.Settings"
         xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
 		x:DataType="vm:SettingsVM"
-        Title="Edit Settings"
-		Icon="/Assets/libation.ico">
+        Title="Edit Settings">
 
 	<Grid RowDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
index ff420fb1..999ccf1e 100644
--- a/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
@@ -8,8 +8,7 @@
 		MaxWidth="630" MaxHeight="90"
 		Width="630" Height="110"
         Title="Replace Tags"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto" Margin="10">
 		<TextBlock
diff --git a/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml b/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
index dc2090ef..2ec74e26 100644
--- a/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
@@ -7,10 +7,8 @@
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
 		MinWidth="500" MinHeight="400"
 		Height="450" Width="550"
-		
 		WindowStartupLocation="CenterOwner"
-        Title="Upgrade Available"
-		Icon="/Assets/libation.ico">
+        Title="Upgrade Available">
 
 	<Grid  Margin="6" RowDefinitions="Auto,*,Auto">
 		<TextBlock
diff --git a/Source/LibationAvalonia/FormSaveExtension.cs b/Source/LibationAvalonia/FormSaveExtension.cs
index 7683ceb1..1dfa0a74 100644
--- a/Source/LibationAvalonia/FormSaveExtension.cs
+++ b/Source/LibationAvalonia/FormSaveExtension.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform;
+using Dinah.Core;
 using LibationFileManager;
 using System;
 using System.Linq;
@@ -111,5 +112,63 @@ namespace LibationAvalonia
 			public int Width;
 			public bool IsMaximized;
 		}
+
+		public static void HideMinMaxBtns(this Window form)
+		{
+			if (Design.IsDesignMode || !Configuration.IsWindows || form.TryGetPlatformHandle() is not IPlatformHandle handle)
+				return;
+
+			var windowStyle
+				= GetWindowStyle(handle.Handle)
+				.Remove(WINDOW_STYLE.WS_MINIMIZEBOX)
+				.Remove(WINDOW_STYLE.WS_MAXIMIZEBOX);
+
+			SetWindowStyle(handle.Handle, windowStyle);
+		}
+
+		const int GWL_STYLE = -16;
+
+		[System.Runtime.InteropServices.DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+		static extern long GetWindowLong(IntPtr hWnd, int nIndex);
+
+		[System.Runtime.InteropServices.DllImport("user32.dll", EntryPoint = "SetWindowLong")]
+		static extern int SetWindowLong(IntPtr hWnd, int nIndex, long dwNewLong);
+
+		static WINDOW_STYLE GetWindowStyle(IntPtr hWnd) => (WINDOW_STYLE)GetWindowLong(hWnd, GWL_STYLE);
+		static void SetWindowStyle(IntPtr hWnd, WINDOW_STYLE style) => SetWindowLong(hWnd, GWL_STYLE, (long)style);
+		
+
+		[Flags]
+		enum WINDOW_STYLE : long
+		{
+			WS_OVERLAPPED = 0x0,
+			WS_TILED = 0x0,
+			WS_ACTIVECAPTION = 0x1,
+			WS_MAXIMIZEBOX = 0x10000,
+			WS_TABSTOP = 0x10000,
+			WS_MINIMIZEBOX = 0x20000,
+			WS_GROUP = 0x20000,
+			WS_THICKFRAME = 0x40000,
+			WS_SIZEBOX = 0x40000,
+			WS_SYSMENU = 0x80000,
+			WS_HSCROLL = 0x100000,
+			WS_VSCROLL = 0x200000,
+			WS_DLGFRAME = 0x400000,
+			WS_BORDER = 0x800000,
+			WS_CAPTION = 0xc00000,
+			WS_OVERLAPPEDWINDOW = 0xcf0000,
+			WS_TILEDWINDOW = 0xcf0000,
+			WS_MAXIMIZE = 0x1000000,
+			WS_CLIPCHILDREN = 0x2000000,
+			WS_CLIPSIBLINGS = 0x4000000,
+			WS_DISABLED = 0x8000000,
+			WS_VISIBLE = 0x10000000,
+			WS_ICONIC = 0x20000000,
+			WS_MINIMIZE = 0x20000000,
+			WS_CHILD = 0x40000000,
+			WS_CHILDWINDOW = 0x40000000,
+			WS_POPUP = 0x80000000,
+			WS_POPUPWINDOW = 0x80880000
+		}
 	}
 }
diff --git a/Source/LibationAvalonia/Views/SeriesViewDialog.axaml b/Source/LibationAvalonia/Views/SeriesViewDialog.axaml
index 58ffdd26..e55a6f12 100644
--- a/Source/LibationAvalonia/Views/SeriesViewDialog.axaml
+++ b/Source/LibationAvalonia/Views/SeriesViewDialog.axaml
@@ -4,7 +4,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="LibationAvalonia.Views.SeriesViewDialog"
-		Icon="/Assets/libation.ico"
         Title="View All Items in Series">
 	
 	<TabControl