diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml
index a8dfab59..75763c08 100644
--- a/Source/LibationAvalonia/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -84,6 +84,9 @@
 				<Setter Property="Foreground" Value="{DynamicResource SystemChromeAltLowColor}" />
 			</Style>
 		</Style>
+		<Style Selector="Button.SaveButton">
+			<Setter Property="Padding" Value="30,6" />
+		</Style>
 		<Style Selector="ScrollBar">
 			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
             <Setter Property="AllowAutoHide" Value="false"/>
diff --git a/Source/LibationAvalonia/Controls/Settings/Audio.axaml b/Source/LibationAvalonia/Controls/Settings/Audio.axaml
index 54d77e86..333d7845 100644
--- a/Source/LibationAvalonia/Controls/Settings/Audio.axaml
+++ b/Source/LibationAvalonia/Controls/Settings/Audio.axaml
@@ -412,7 +412,7 @@
 				<Button
 					Grid.Column="1"
 					Content="Edit"
-					Padding="30,0"
+					Classes="SaveButton"
 					Margin="10,0,0,0"
 					VerticalAlignment="Stretch"
 					Click="EditChapterTitleTemplateButton_Click" />
diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
index 39e3ed35..e0e26f7b 100644
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
@@ -99,13 +99,12 @@
 
 			<Button
 				Grid.Column="0"
-				Padding="5,5"
 				Content="Import from audible-cli"
 				Click="ImportButton_Clicked" />
 
 			<Button
 				Grid.Column="1"
-				Padding="30,5"
+				Classes="SaveButton"
 				Content="Save"
 				Click="SaveButton_Clicked" />
 		</Grid>
diff --git a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
index f877f60a..33c0d925 100644
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
@@ -140,7 +140,7 @@
 			<Button
 				Grid.Column="1"
 				Content="Save"
-				Padding="30,3,30,3"
+				Classes="SaveButton"
 				Click="SaveButton_Clicked" />
 		</Grid>
 		
diff --git a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
index c8fcaf33..5cb8f9f4 100644
--- a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
@@ -100,7 +100,7 @@
 
 			<Button
 				Grid.Column="1"
-				Padding="30,5"
+				Classes="SaveButton"
 				Name="saveBtn"
 				Content="Save"
 				Command="{Binding SaveAndClose}" />
diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
index 67e257d8..74c46309 100644
--- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
@@ -75,7 +75,7 @@
 			<Button Grid.Row="1" Grid.Column="3" IsVisible="{Binding !EnvironmentIsWindows}" Command="{Binding Barebones}" CommandParameter="True" Content="Barebones" />
 						
 			<Button Grid.RowSpan="2" Grid.Column="4" Command="{Binding Close}" Content="Cancel" />
-			<Button Grid.RowSpan="2" Grid.Column="5" Padding="20,6" Command="{Binding SaveAndClose}" Content="Save" />
+			<Button Grid.RowSpan="2" Grid.Column="5" Classes="SaveButton" Command="{Binding SaveAndClose}" Content="Save" />
 		</Grid>	
 	</Grid>	
 </Window>
diff --git a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
index 57749c32..b535fba4 100644
--- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
@@ -110,7 +110,7 @@
 			Command="{Binding GoToNamingTemplateWiki}" />
 		<Button
 			Grid.Row="2"
-			Padding="30,5,30,5"
+				Classes="SaveButton"
 			HorizontalAlignment="Right"
 			Content="Save"
 			Click="SaveButton_Click" />
diff --git a/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
index 5c66986e..cd868d9e 100644
--- a/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
@@ -25,7 +25,7 @@
 			Grid.Row="1"
 			HorizontalAlignment="Right"
 			Margin="5"
-			Padding="30,3,30,3"
+			Classes="SaveButton"
 			Content="Save"
 			Click="Save_Click" />
 	</Grid>
diff --git a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
index be6a419d..a6aa46d5 100644
--- a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
@@ -37,7 +37,7 @@
 		
 		<Button
 			Grid.Row="1"
-			Padding="30,5"
+			Classes="SaveButton"
 			Name="SaveButton"
 			HorizontalAlignment="Right"
 			Content="Save"
diff --git a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
index 2ff0185b..9ebd795f 100644
--- a/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
@@ -53,7 +53,7 @@
 			Grid.Row="1"
 			Grid.Column="1"
 			Margin="10,0"
-			Padding="30,5"
+			Classes="SaveButton"
 			VerticalAlignment="Stretch"
 			HorizontalAlignment="Right"
 			Content="Save"
diff --git a/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
index 4c070927..d4376236 100644
--- a/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
@@ -102,7 +102,8 @@
 			<Button
 				Grid.Row="1"
 				Margin="0,5,0,0"
-				Padding="30,3,30,3" HorizontalAlignment="Right"
+				Classes="SaveButton"
+				HorizontalAlignment="Right"
 				Content="Submit"
 				Click="Submit_Click" />
 		</Grid>
diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
index eebd8765..410de601 100644
--- a/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
@@ -64,11 +64,10 @@
 
 		<Button
 			Grid.Row="3"
-			Height="30"
 			HorizontalAlignment="Center"
-			Margin="10,10,10,10"
-			Padding="30,3,30,3"
+			Margin="10"
 			Name="OkButton"
+			Classes="SaveButton"
 			Content="Ok"
 			Click="OkButton_Clicked" />
 	</Grid>
diff --git a/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
index f0cb0686..a4531b19 100644
--- a/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
@@ -53,7 +53,7 @@
 		<Button
 			Grid.Row="2"
 			Grid.Column="1"
-			Padding="30,6"
+			Classes="SaveButton"
 			HorizontalAlignment="Right"
 			Content="Import"
 			Name="ImportButton"
diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
index 7d0939ff..cba6c958 100644
--- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
@@ -18,8 +18,7 @@
 			Grid.Row="1"
 			Margin="10"
 			HorizontalAlignment="Right"
-			Height="30"
-			Padding="30,3,30,3"
+			Classes="SaveButton"
 			Content="Save"
 			Name="saveBtn"
 			Click="SaveButton_Clicked" />
diff --git a/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
index 999ccf1e..925fdc9a 100644
--- a/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
@@ -24,7 +24,7 @@
 			Grid.Row="1"
 			Grid.Column="1"
 			Margin="10,0,0,0"
-			Padding="20,3"
+			Classes="SaveButton"
 			VerticalAlignment="Stretch"
 			Content="Save"
 			Command="{Binding SaveAndClose}"/>
diff --git a/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml b/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml
index 87399a3a..e86418f9 100644
--- a/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml
@@ -14,8 +14,7 @@
 			RowDefinitions="*,Auto,Auto">
 			<Grid.Styles>
 				<Style Selector="Button">
-					<Setter Property="Height" Value="30" />
-					<Setter Property="Padding" Value="20,0" />
+					<Setter Property="Padding" Value="20,6" />
 					<Setter Property="Margin" Value="5" />
 				</Style>
 			</Grid.Styles>
diff --git a/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml b/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
index 2ec74e26..064f5361 100644
--- a/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
@@ -77,7 +77,8 @@
 				Grid.Column="1"
 				TabIndex="0"
 				FontSize="16"
-				Padding="30,0,30,0"
+				Name="btnYes"
+				Classes="SaveButton"
 				VerticalAlignment="Stretch"
 				HorizontalAlignment="Right"
 				VerticalContentAlignment="Center"
diff --git a/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml.cs
index 618d3a06..4a586680 100644
--- a/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml.cs
@@ -27,6 +27,7 @@ namespace LibationAvalonia.Dialogs
 			}
 
 			InitializeComponent();
+			ControlToFocusOnShow = btnYes;
 		}
 
 		public UpgradeNotificationDialog(UpgradeProperties upgradeProperties, bool canUpgrade) : this()
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow.axaml
index 5934c5a1..9b05ad53 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml
@@ -173,9 +173,8 @@
 					<Setter Property="MinHeight" Value="10" />
 				</Style>
 				<Style Selector="Button">
-					<Setter Property="Padding" Value="15,0,15,0" />
+					<Setter Property="Padding" Value="15,6" />
 					<Setter Property="Margin" Value="10,0,0,0" />
-					<Setter Property="Height" Value="30" />
 					<Setter Property="HorizontalContentAlignment" Value="Center" />
 					<Setter Property="VerticalContentAlignment" Value="Center" />
 				</Style>
@@ -195,7 +194,7 @@
 
 			<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
 				<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" CommandParameter="{CompiledBinding #filterSearchTb.Text}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
-				<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Command="{CompiledBinding ToggleQueueHideBtn}">
+				<Button Padding="2,6" VerticalAlignment="Stretch" Command="{CompiledBinding ToggleQueueHideBtn}">
 					<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource	LeftArrows}">
 						<Path.RenderTransform>
 							<RotateTransform Angle="{CompiledBinding QueueButtonAngle}"/>
diff --git a/Source/LibationAvalonia/Views/ProcessBookControl.axaml b/Source/LibationAvalonia/Views/ProcessBookControl.axaml
index 1796257f..f5b9d15e 100644
--- a/Source/LibationAvalonia/Views/ProcessBookControl.axaml
+++ b/Source/LibationAvalonia/Views/ProcessBookControl.axaml
@@ -55,7 +55,7 @@
 			<Grid Name="ButtonsGrid" Margin="3" Grid.Column="2" HorizontalAlignment="Right" ColumnDefinitions="Auto,Auto">
 				<Grid.Styles>
 					<Style Selector="Button">
-						<Setter Property="Padding" Value="0,1,0,1" />
+						<Setter Property="Padding" Value="0,1" />
 						<Setter Property="Height" Value="20" />
 						<Setter Property="Width" Value="30" />
 						<Style Selector="^ > Path">