Remove Viewbox special cases.

ILSpy/Analyzers/RemoveAnalyzeContextMenuEntry.cs

@@ -20,7 +20,7 @@ using System.Linq;
 
 namespace ICSharpCode.ILSpy.Analyzers
 {
-	[ExportContextMenuEntry(Header = "Remove", Icon = "images/Delete.png", Category = "Analyze", Order = 200)]
+	[ExportContextMenuEntry(Header = "Remove", Icon = "images/Delete", Category = "Analyze", Order = 200)]
 	internal sealed class RemoveAnalyzeContextMenuEntry : IContextMenuEntry
 	{
 		public bool IsVisible(TextViewContext context)

ILSpy/Commands/DecompileInNewViewCommand.cs

@@ -23,7 +23,7 @@ using ICSharpCode.ILSpy.TreeNodes;
 
 namespace ICSharpCode.ILSpy.Analyzers
 {
-	[ExportContextMenuEntry(Header = nameof(Resources.DecompileToNewPanel), Icon = "images/Search.png", Category = nameof(Resources.Analyze), Order = 90)]
+	[ExportContextMenuEntry(Header = nameof(Resources.DecompileToNewPanel), Icon = "images/Search", Category = nameof(Resources.Analyze), Order = 90)]
 	internal sealed class DecompileInNewViewCommand : IContextMenuEntry
 	{
 		public bool IsVisible(TextViewContext context)

ILSpy/ContextMenuEntry.cs

@@ -222,15 +222,11 @@ namespace ICSharpCode.ILSpy
 						menuItem.Header = MainWindow.GetResourceString( entryPair.Metadata.Header);
 						menuItem.InputGestureText = entryPair.Metadata.InputGestureText;
 						if (!string.IsNullOrEmpty(entryPair.Metadata.Icon)) {
-							object image = Images.Load(entryPair.Value, entryPair.Metadata.Icon);
+							menuItem.Icon = new Image {
-							if (!(image is Viewbox)) {
+								Width = 16,
-								image = new Image {
+								Height = 16,
-									Width = 16,
+								Source = Images.Load(entryPair.Value, entryPair.Metadata.Icon)
-									Height = 16,
+							};
-									Source = (ImageSource)image
-								};
-							}
-							menuItem.Icon = image;
 						}
 						if (entryPair.Value.IsEnabled(context)) {
 							menuItem.Click += delegate { entry.Execute(context); };

ILSpy/MainWindow.xaml.cs

@@ -142,19 +142,15 @@ namespace ICSharpCode.ILSpy
 
 		Button MakeToolbarItem(Lazy<ICommand, IToolbarCommandMetadata> command)
 		{
-			object image = Images.Load(command.Value, command.Metadata.ToolbarIcon);
-			if (!(image is Viewbox)) {
-				image = new Image {
-					Width = 16,
-					Height = 16,
-					Source = (ImageSource)image
-				};
-			}
 			return new Button {
 				Command = CommandWrapper.Unwrap(command.Value),
 				ToolTip = Properties.Resources.ResourceManager.GetString(command.Metadata.ToolTip),
 				Tag = command.Metadata.Tag,
-				Content = image
+				Content = new Image {
+					Width = 16,
+					Height = 16,
+					Source = Images.Load(command.Value, command.Metadata.ToolbarIcon)
+				}
 			};
 		}
 		#endregion
@@ -180,15 +176,11 @@ namespace ICSharpCode.ILSpy
 						if (!string.IsNullOrEmpty(GetResourceString(entry.Metadata.Header)))
 							menuItem.Header = GetResourceString(entry.Metadata.Header);
 						if (!string.IsNullOrEmpty(entry.Metadata.MenuIcon)) {
-							object image = Images.Load(entry.Value, entry.Metadata.MenuIcon);
+							menuItem.Icon = new Image {
-							if (!(image is Viewbox)) {
+								Width = 16,
-								image = new Image {
+								Height = 16,
-									Width = 16,
+								Source = Images.Load(entry.Value, entry.Metadata.MenuIcon)
-									Height = 16,
+							};
-									Source = (ImageSource)image
-								};
-							}
-							menuItem.Icon = image;
 						}
 
 						menuItem.IsEnabled = entry.Metadata.IsEnabled;