diff --git a/Source/LibationAvalonia/Assets/MBIcons/Asterisk.ico b/Source/LibationAvalonia/Assets/MBIcons/Asterisk.ico
new file mode 100644
index 00000000..4771c82f
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Asterisk.ico differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png b/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png
deleted file mode 100644
index c345a8f9..00000000
Binary files a/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Asterisk_64.png b/Source/LibationAvalonia/Assets/MBIcons/Asterisk_64.png
new file mode 100644
index 00000000..50e37d5b
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Asterisk_64.png differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Error.ico b/Source/LibationAvalonia/Assets/MBIcons/Error.ico
new file mode 100644
index 00000000..a27fadb7
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Error.ico differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Error_64.png b/Source/LibationAvalonia/Assets/MBIcons/Error_64.png
new file mode 100644
index 00000000..446ed025
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Error_64.png differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Exclamation.ico b/Source/LibationAvalonia/Assets/MBIcons/Exclamation.ico
new file mode 100644
index 00000000..957a2b1c
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Exclamation.ico differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png b/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png
deleted file mode 100644
index cc884984..00000000
Binary files a/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Exclamation_64.png b/Source/LibationAvalonia/Assets/MBIcons/Exclamation_64.png
new file mode 100644
index 00000000..7d1edc9d
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Exclamation_64.png differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Question.ico b/Source/LibationAvalonia/Assets/MBIcons/Question.ico
new file mode 100644
index 00000000..f496ebfb
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Question.ico differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Question.png b/Source/LibationAvalonia/Assets/MBIcons/Question.png
deleted file mode 100644
index 3aeb017c..00000000
Binary files a/Source/LibationAvalonia/Assets/MBIcons/Question.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/Question_64.png b/Source/LibationAvalonia/Assets/MBIcons/Question_64.png
new file mode 100644
index 00000000..567588f7
Binary files /dev/null and b/Source/LibationAvalonia/Assets/MBIcons/Question_64.png differ
diff --git a/Source/LibationAvalonia/Assets/MBIcons/error.png b/Source/LibationAvalonia/Assets/MBIcons/error.png
deleted file mode 100644
index 916e14f1..00000000
Binary files a/Source/LibationAvalonia/Assets/MBIcons/error.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
index 6387c198..204a23a4 100644
--- a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
@@ -14,11 +14,11 @@
 			<StackPanel DockPanel.Dock="Top" Orientation="Horizontal"
 				VerticalAlignment="Top">
 			
-				<Panel Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">				
-					<Image IsVisible="{Binding IsAsterisk}" Stretch="None" Source="/Assets/MBIcons/Asterisk.png"/>
-					<Image IsVisible="{Binding IsError}" Stretch="None" Source="/Assets/MBIcons/error.png"/>
-					<Image IsVisible="{Binding IsQuestion}" Stretch="None" Source="/Assets/MBIcons/Question.png"/>
-					<Image IsVisible="{Binding IsExclamation}" Stretch="None" Source="/Assets/MBIcons/Exclamation.png"/>
+				<Panel Height="32" Width="32" Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">				
+					<Image IsVisible="{Binding IsAsterisk}" Stretch="Uniform" Source="/Assets/MBIcons/Asterisk_64.png"/>
+					<Image IsVisible="{Binding IsError}" Stretch="Uniform" Source="/Assets/MBIcons/Error_64.png"/>
+					<Image IsVisible="{Binding IsQuestion}" Stretch="Uniform" Source="/Assets/MBIcons/Question_64.png"/>
+					<Image IsVisible="{Binding IsExclamation}" Stretch="Uniform" Source="/Assets/MBIcons/Exclamation_64.png"/>
 				</Panel>
 			
 				<TextBlock Margin="5,0,0,0" Name="messageTextBlock" MinHeight="45" MinWidth="193" TextWrapping="WrapWithOverflow" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" Text="{Binding Message}" />
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 0696bdb1..d7860a57 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -41,10 +41,10 @@
 		<None Remove="Assets\img-coverart-prod-unavailable_500x500.jpg" />
 		<None Remove="Assets\img-coverart-prod-unavailable_80x80.jpg" />
 		<None Remove="Assets\1x1.png" />
-		<None Remove="Assets\MBIcons\Asterisk.png" />
-		<None Remove="Assets\MBIcons\error.png" />
-		<None Remove="Assets\MBIcons\Exclamation.png" />
-		<None Remove="Assets\MBIcons\Question.png" />
+		<None Remove="Assets\MBIcons\Asterisk_64.png" />
+		<None Remove="Assets\MBIcons\Error_64.png" />
+		<None Remove="Assets\MBIcons\Exclamation_64.png" />
+		<None Remove="Assets\MBIcons\Question_64.png" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Source/LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs b/Source/LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs
index 3f0ab9e0..31c0fab5 100644
--- a/Source/LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs
+++ b/Source/LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs
@@ -30,7 +30,8 @@ namespace LibationWinForms.Dialogs
 				return;
 
 			System.Media.SystemSounds.Hand.Play();
-			pictureBox1.Image = SystemIcons.Error.ToBitmap();
+			//This is a different (and newer) icon from SystemIcons.Error
+			pictureBox1.Image = SystemIcons.GetStockIcon(StockIconId.Error).ToBitmap();
 		}
 
 		private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)