diff --git a/ICSharpCode.ILSpyX/Analyzers/IAnalyzer.cs b/ICSharpCode.ILSpyX/Analyzers/IAnalyzer.cs
index d21a871837..e028e4b7fd 100644
--- a/ICSharpCode.ILSpyX/Analyzers/IAnalyzer.cs
+++ b/ICSharpCode.ILSpyX/Analyzers/IAnalyzer.cs
@@ -42,6 +42,7 @@ public interface IAnalyzer
 	public interface IAnalyzerMetadata
 	{
 		string Header { get; }
+
 		int Order { get; }
 	}
 }
diff --git a/ILSpy/AboutPage.cs b/ILSpy/AboutPage.cs
index eb8007ce9d..319017fe06 100644
--- a/ILSpy/AboutPage.cs
+++ b/ILSpy/AboutPage.cs
@@ -78,14 +78,14 @@ private void Display(DecompilerTextView textView)
 					HorizontalAlignment = HorizontalAlignment.Center,
 					Orientation = Orientation.Horizontal
 				};
-				if (NotifyOfUpdatesStrategy.LatestAvailableVersion == null)
+				if (UpdateService.LatestAvailableVersion == null)
 				{
 					AddUpdateCheckButton(stackPanel, textView);
 				}
 				else
 				{
 					// we already retrieved the latest version sometime earlier
-					ShowAvailableVersion(NotifyOfUpdatesStrategy.LatestAvailableVersion, stackPanel);
+					ShowAvailableVersion(UpdateService.LatestAvailableVersion, stackPanel);
 				}
 				CheckBox checkBox = new() {
 					Margin = new Thickness(4),
@@ -171,7 +171,7 @@ static void AddUpdateCheckButton(StackPanel stackPanel, DecompilerTextView textV
 
 				try
 				{
-					AvailableVersionInfo vInfo = await NotifyOfUpdatesStrategy.GetLatestVersionAsync();
+					AvailableVersionInfo vInfo = await UpdateService.GetLatestVersionAsync();
 					stackPanel.Children.Clear();
 					ShowAvailableVersion(vInfo, stackPanel);
 				}
diff --git a/ILSpy/App.xaml.cs b/ILSpy/App.xaml.cs
index 17fc0961c3..c82af3125e 100644
--- a/ILSpy/App.xaml.cs
+++ b/ILSpy/App.xaml.cs
@@ -25,8 +25,6 @@
 using System.Runtime.Loader;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Navigation;
 using System.Windows.Threading;
 
 using ICSharpCode.ILSpy.AppEnv;
@@ -135,7 +133,7 @@ public App()
 
 		public new MainWindow MainWindow {
 			get => (MainWindow)base.MainWindow;
-			set => base.MainWindow = value;
+			private set => base.MainWindow = value;
 		}
 
 		private static void SingleInstance_NewInstanceDetected(object sender, NewInstanceEventArgs e) => ExportProvider.GetExportedValue<AssemblyTreeModel>().HandleSingleInstanceCommandLineArguments(e.Args).HandleExceptions();
diff --git a/ILSpy/AssemblyTree/AssemblyTreeModel.cs b/ILSpy/AssemblyTree/AssemblyTreeModel.cs
index c908c3fc1d..a212e763e0 100644
--- a/ILSpy/AssemblyTree/AssemblyTreeModel.cs
+++ b/ILSpy/AssemblyTree/AssemblyTreeModel.cs
@@ -303,7 +303,7 @@ private async Task NavigateOnLaunch(string? navigateTo, string[]? activeTreeView
 						SelectNode(node);
 
 						// only if not showing the about page, perform the update check:
-						await App.Current.MainWindow.ShowMessageIfUpdatesAvailableAsync(updateSettings);
+						MessageBus.Send(this, new CheckIfUpdateAvailableEventArgs());
 					}
 					else
 					{
diff --git a/ILSpy/Commands/CheckForUpdatesCommand.cs b/ILSpy/Commands/CheckForUpdatesCommand.cs
index 54fb1ac8a1..83923cde97 100644
--- a/ILSpy/Commands/CheckForUpdatesCommand.cs
+++ b/ILSpy/Commands/CheckForUpdatesCommand.cs
@@ -20,7 +20,6 @@
 using System.Composition;
 
 using ICSharpCode.ILSpy.Properties;
-using ICSharpCode.ILSpy.Updates;
 
 namespace ICSharpCode.ILSpy
 {
@@ -30,7 +29,7 @@ sealed class CheckForUpdatesCommand(SettingsService settingsService) : SimpleCom
 	{
 		public override async void Execute(object parameter)
 		{
-			await App.Current.MainWindow.ShowMessageIfUpdatesAvailableAsync(settingsService.GetSettings<UpdateSettings>(), forceCheck: true);
+			MessageBus.Send(this, new CheckIfUpdateAvailableEventArgs(notify: true));
 		}
 	}
 }
diff --git a/ILSpy/Commands/ExitCommand.cs b/ILSpy/Commands/ExitCommand.cs
index 67f698bfee..91483d829b 100644
--- a/ILSpy/Commands/ExitCommand.cs
+++ b/ILSpy/Commands/ExitCommand.cs
@@ -23,11 +23,11 @@ namespace ICSharpCode.ILSpy
 {
 	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.E_xit), MenuOrder = 99999, MenuCategory = nameof(Resources.Exit))]
 	[Shared]
-	sealed class ExitCommand : SimpleCommand
+	sealed class ExitCommand(MainWindow mainWindow) : SimpleCommand
 	{
 		public override void Execute(object parameter)
 		{
-			App.Current.MainWindow.Close();
+			mainWindow.Close();
 		}
 	}
 }
\ No newline at end of file
diff --git a/ILSpy/Commands/ManageAssemblyListsCommand.cs b/ILSpy/Commands/ManageAssemblyListsCommand.cs
index 8172f2182b..02eb5284cc 100644
--- a/ILSpy/Commands/ManageAssemblyListsCommand.cs
+++ b/ILSpy/Commands/ManageAssemblyListsCommand.cs
@@ -18,6 +18,8 @@
 
 
 using System.Composition;
+using System.Windows;
+using System.Windows.Data;
 
 using ICSharpCode.ILSpy.Properties;
 
@@ -25,13 +27,21 @@ namespace ICSharpCode.ILSpy
 {
 	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.ManageAssembly_Lists), MenuIcon = "Images/AssemblyList", MenuCategory = nameof(Resources.Open), MenuOrder = 1.7)]
 	[Shared]
-	sealed class ManageAssemblyListsCommand(SettingsService settingsService) : SimpleCommand
+	sealed class ManageAssemblyListsCommand(SettingsService settingsService) : SimpleCommand, IProvideParameterBinding
 	{
 		public override void Execute(object parameter)
 		{
-			ManageAssemblyListsDialog dlg = new ManageAssemblyListsDialog(settingsService);
-			dlg.Owner = App.Current.MainWindow;
+			ManageAssemblyListsDialog dlg = new(settingsService) {
+				Owner = parameter as Window
+			};
+
 			dlg.ShowDialog();
 		}
+
+		public Binding ParameterBinding => new() {
+			RelativeSource = new(RelativeSourceMode.FindAncestor) {
+				AncestorType = typeof(Window)
+			}
+		};
 	}
 }
diff --git a/ILSpy/Commands/OpenFromGacCommand.cs b/ILSpy/Commands/OpenFromGacCommand.cs
index ba65bfe214..b66e1c644a 100644
--- a/ILSpy/Commands/OpenFromGacCommand.cs
+++ b/ILSpy/Commands/OpenFromGacCommand.cs
@@ -26,15 +26,8 @@ namespace ICSharpCode.ILSpy
 {
 	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.OpenFrom_GAC), MenuIcon = "Images/AssemblyListGAC", MenuCategory = nameof(Resources.Open), MenuOrder = 1)]
 	[Shared]
-	sealed class OpenFromGacCommand : SimpleCommand
+	sealed class OpenFromGacCommand(AssemblyTreeModel assemblyTreeModel, MainWindow mainWindow) : SimpleCommand
 	{
-		private readonly AssemblyTreeModel assemblyTreeModel;
-
-		public OpenFromGacCommand(AssemblyTreeModel assemblyTreeModel)
-		{
-			this.assemblyTreeModel = assemblyTreeModel;
-		}
-
 		public override bool CanExecute(object parameter)
 		{
 			return AppEnvironment.IsWindows;
@@ -42,8 +35,8 @@ public override bool CanExecute(object parameter)
 
 		public override void Execute(object parameter)
 		{
-			OpenFromGacDialog dlg = new OpenFromGacDialog {
-				Owner = App.Current.MainWindow
+			OpenFromGacDialog dlg = new() {
+				Owner = mainWindow
 			};
 
 			if (dlg.ShowDialog() == true)
diff --git a/ILSpy/Commands/SimpleCommand.cs b/ILSpy/Commands/SimpleCommand.cs
index 67c7f517e1..19c1c7c9ec 100644
--- a/ILSpy/Commands/SimpleCommand.cs
+++ b/ILSpy/Commands/SimpleCommand.cs
@@ -17,7 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.ComponentModel;
+using System.Windows.Data;
 using System.Windows.Input;
 
 namespace ICSharpCode.ILSpy
@@ -37,38 +37,8 @@ public virtual bool CanExecute(object parameter)
 		}
 	}
 
-	public abstract class ToggleableCommand : ICommand, INotifyPropertyChanged
+	public interface IProvideParameterBinding
 	{
-		private bool isChecked;
-
-		public event EventHandler CanExecuteChanged {
-			add { CommandManager.RequerySuggested += value; }
-			remove { CommandManager.RequerySuggested -= value; }
-		}
-
-		public event PropertyChangedEventHandler PropertyChanged;
-
-		void ICommand.Execute(object parameter)
-		{
-			IsChecked = Execute(parameter);
-		}
-
-		public bool IsChecked {
-			get => isChecked;
-			set {
-				if (isChecked != value)
-				{
-					isChecked = value;
-					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsChecked)));
-				}
-			}
-		}
-
-		public abstract bool Execute(object parameter);
-
-		public virtual bool CanExecute(object parameter)
-		{
-			return true;
-		}
+		Binding ParameterBinding { get; }
 	}
 }
diff --git a/ILSpy/Docking/DockWorkspace.cs b/ILSpy/Docking/DockWorkspace.cs
index d9f3b85c32..d92b928476 100644
--- a/ILSpy/Docking/DockWorkspace.cs
+++ b/ILSpy/Docking/DockWorkspace.cs
@@ -33,7 +33,6 @@
 
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.ILSpy.Analyzers;
-using ICSharpCode.ILSpy.AssemblyTree;
 using ICSharpCode.ILSpy.Search;
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.ILSpy.ViewModels;
@@ -50,17 +49,17 @@ public class DockWorkspace : ObservableObject, ILayoutUpdateStrategy
 	{
 		private readonly IExportProvider exportProvider;
 
-		private SessionSettings SessionSettings { get; }
-
 		private readonly ObservableCollection<TabPageModel> tabPages = [];
 
+		readonly SessionSettings sessionSettings;
+
 		private DockingManager DockingManager => exportProvider.GetExportedValue<DockingManager>();
 
 		public DockWorkspace(SettingsService settingsService, IExportProvider exportProvider)
 		{
 			this.exportProvider = exportProvider;
 
-			SessionSettings = settingsService.SessionSettings;
+			sessionSettings = settingsService.SessionSettings;
 
 			this.tabPages.CollectionChanged += TabPages_CollectionChanged;
 			TabPages = new(tabPages);
@@ -70,10 +69,9 @@ public DockWorkspace(SettingsService settingsService, IExportProvider exportProv
 
 		private void CurrentAssemblyList_Changed(object sender, NotifyCollectionChangedEventArgs e)
 		{
-			if (e.OldItems == null)
-			{
+			if (e.OldItems is not { } oldItems)
 				return;
-			}
+
 			foreach (var tab in tabPages.ToArray())
 			{
 				var state = tab.GetState();
@@ -84,7 +82,7 @@ private void CurrentAssemblyList_Changed(object sender, NotifyCollectionChangedE
 				bool found = decompiledNodes
 					.Select(node => node.Ancestors().OfType<TreeNodes.AssemblyTreeNode>().LastOrDefault())
 					.ExceptNullItems()
-					.Any(assemblyNode => !e.OldItems.Contains(assemblyNode.LoadedAssembly));
+					.Any(assemblyNode => !oldItems.Contains(assemblyNode.LoadedAssembly));
 
 				if (!found)
 				{
@@ -190,7 +188,7 @@ public void InitializeLayout()
 			serializer.LayoutSerializationCallback += LayoutSerializationCallback;
 			try
 			{
-				SessionSettings.DockLayout.Deserialize(serializer);
+				sessionSettings.DockLayout.Deserialize(serializer);
 			}
 			finally
 			{
@@ -247,7 +245,7 @@ internal void ResetLayout()
 				pane.IsVisible = false;
 			}
 			CloseAllTabs();
-			SessionSettings.DockLayout.Reset();
+			sessionSettings.DockLayout.Reset();
 			InitializeLayout();
 
 			App.Current.Dispatcher.BeginInvoke(DispatcherPriority.Background, () => MessageBus.Send(this, new ResetLayoutEventArgs()));
diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml
index b0a437d439..3223ee1ff8 100644
--- a/ILSpy/MainWindow.xaml
+++ b/ILSpy/MainWindow.xaml
@@ -50,8 +50,9 @@
 	<DockPanel>
 		<!-- Main menu -->
 		<Menu DockPanel.Dock="Top" Name="mainMenu" Height="23" KeyboardNavigation.TabNavigation="None">
-			<MenuItem Header="{x:Static properties:Resources._File}" Tag="_File" />
-			<!-- contents of file menu are added using MEF -->
+			<MenuItem Header="{x:Static properties:Resources._File}" Tag="_File">
+				<!-- content of file menu is added using MEF -->
+			</MenuItem>
 			<MenuItem Header="{x:Static properties:Resources._View}" Tag="_View">
 				<MenuItem Header="{x:Static properties:Resources.Show_publiconlyTypesMembers}" IsCheckable="True"
 						  IsChecked="{Binding SessionSettings.LanguageSettings.ApiVisPublicOnly}" />
@@ -63,7 +64,7 @@
 				<MenuItem Header="{x:Static properties:Resources.Theme}" ItemsSource="{x:Static themes:ThemeManager.AllThemes}">
 					<MenuItem.ItemContainerStyle>
 						<Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
-							<Setter Property="Command" Value="{composition:Import {x:Type commands:SetThemeCommand}}" />
+							<Setter Property="Command" Value="{composition:Import commands:SetThemeCommand}" />
 							<Setter Property="CommandParameter" Value="{Binding}" />
 							<Setter Property="IsCheckable" Value="True" />
 							<!-- Required by AvalonDock's MenuItem style to show the checkmark -->
@@ -87,7 +88,9 @@
 							  IsChecked="{Binding SessionSettings.CurrentCulture, Converter={controls:CultureSelectionConverter}, ConverterParameter=zh-Hans}" />
 				</MenuItem>
 			</MenuItem>
-			<MenuItem Header="{x:Static properties:Resources._Window}" Tag="_Window" />
+			<MenuItem Header="{x:Static properties:Resources._Window}" Tag="_Window" >
+				<!-- content of window menu is added using MEF -->
+			</MenuItem>
 		</Menu>
 		<!-- ToolBar -->
 		<ToolBar
@@ -126,7 +129,8 @@
 						  ToolTip="{x:Static properties:Resources.SelectAssemblyListDropdownTooltip}"
 						  SelectedItem="{Binding SessionSettings.ActiveAssemblyList}" />
 			</Grid>
-			<Button Command="{composition:Import {x:Type local:ManageAssemblyListsCommand}}"
+			<Button Command="{composition:Import local:ManageAssemblyListsCommand}"
+					CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
 					ToolTip="{x:Static properties:Resources.ManageAssemblyLists}">
 				<Image Width="16" Height="16" Source="{controls:XamlResource Images/AssemblyList}"
 					   Style="{StaticResource DarkModeAwareImageStyle}" />
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index 562c341b24..2dc55cdbd9 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -17,7 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Composition;
 using System.Diagnostics;
@@ -30,7 +29,6 @@
 using System.Windows.Threading;
 
 using ICSharpCode.ILSpy.Updates;
-using ICSharpCode.ILSpyX.FileLoaders;
 
 using Screen = System.Windows.Forms.Screen;
 
@@ -55,6 +53,8 @@ public MainWindow(MainWindowViewModel mainWindowViewModel, MenuService menuServi
 
 			this.DataContext = mainWindowViewModel;
 
+			MessageBus<CheckIfUpdateAvailableEventArgs>.Subscribers += (_, e) => CheckIfUpdatesAvailableAsync(e.Notify).IgnoreExceptions();
+
 			InitializeComponent();
 
 			Dispatcher.BeginInvoke(DispatcherPriority.Background, () => {
@@ -122,20 +122,20 @@ protected override void OnKeyDown(KeyEventArgs e)
 
 		string updateAvailableDownloadUrl;
 
-		public async Task ShowMessageIfUpdatesAvailableAsync(UpdateSettings settings, bool forceCheck = false)
+		private async Task CheckIfUpdatesAvailableAsync(bool notify = false)
 		{
+			var settings = settingsService.GetSettings<UpdateSettings>();
 			string downloadUrl;
-			if (forceCheck)
+			if (notify)
 			{
-				downloadUrl = await NotifyOfUpdatesStrategy.CheckForUpdatesAsync(settings);
+				downloadUrl = await UpdateService.CheckForUpdatesAsync(settings);
 			}
 			else
 			{
-				downloadUrl = await NotifyOfUpdatesStrategy.CheckForUpdatesIfEnabledAsync(settings);
+				downloadUrl = await UpdateService.CheckForUpdatesIfEnabledAsync(settings);
 			}
 
-			// The Update Panel is only available for NotifyOfUpdatesStrategy, AutoUpdate will have differing UI requirements
-			AdjustUpdateUIAfterCheck(downloadUrl, forceCheck);
+			AdjustUpdateUIAfterCheck(downloadUrl, notify);
 		}
 
 		void UpdatePanelCloseButtonClick(object sender, RoutedEventArgs e)
@@ -152,15 +152,15 @@ async void DownloadOrCheckUpdateButtonClick(object sender, RoutedEventArgs e)
 			else
 			{
 				updatePanel.Visibility = Visibility.Collapsed;
-				string downloadUrl = await NotifyOfUpdatesStrategy.CheckForUpdatesAsync(settingsService.GetSettings<UpdateSettings>());
+				string downloadUrl = await UpdateService.CheckForUpdatesAsync(settingsService.GetSettings<UpdateSettings>());
 				AdjustUpdateUIAfterCheck(downloadUrl, true);
 			}
 		}
 
-		void AdjustUpdateUIAfterCheck(string downloadUrl, bool displayMessage)
+		void AdjustUpdateUIAfterCheck(string downloadUrl, bool notify)
 		{
 			updateAvailableDownloadUrl = downloadUrl;
-			updatePanel.Visibility = displayMessage ? Visibility.Visible : Visibility.Collapsed;
+			updatePanel.Visibility = notify ? Visibility.Visible : Visibility.Collapsed;
 			if (downloadUrl != null)
 			{
 				updatePanelMessage.Text = Properties.Resources.ILSpyVersionAvailable;
@@ -180,11 +180,9 @@ public static void OpenLink(string link)
 			try
 			{
 				Process.Start(new ProcessStartInfo { FileName = link, UseShellExecute = true });
-#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
 			}
 			catch (Exception)
 			{
-#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
 				// Process.Start can throw several errors (not all of them documented),
 				// just ignore all of them.
 			}
diff --git a/ILSpy/Options/OptionsDialog.xaml.cs b/ILSpy/Options/OptionsDialog.xaml.cs
index aa596a1d71..6a7efc162b 100644
--- a/ILSpy/Options/OptionsDialog.xaml.cs
+++ b/ILSpy/Options/OptionsDialog.xaml.cs
@@ -59,13 +59,14 @@ public sealed class ExportOptionPageAttribute() : ExportAttribute("OptionPages",
 
 	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._View), Header = nameof(Resources._Options), MenuCategory = nameof(Resources.Options), MenuOrder = 999)]
 	[Shared]
-	sealed class ShowOptionsCommand(AssemblyTreeModel assemblyTreeModel, SettingsService settingsService) : SimpleCommand
+	sealed class ShowOptionsCommand(AssemblyTreeModel assemblyTreeModel, SettingsService settingsService, MainWindow mainWindow) : SimpleCommand
 	{
 		public override void Execute(object parameter)
 		{
 			OptionsDialog dlg = new(settingsService) {
-				Owner = App.Current.MainWindow,
+				Owner = mainWindow
 			};
+
 			if (dlg.ShowDialog() == true)
 			{
 				assemblyTreeModel.Refresh();
diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs
index ea3792612b..2e65074d1a 100644
--- a/ILSpy/TextView/DecompilerTextView.cs
+++ b/ILSpy/TextView/DecompilerTextView.cs
@@ -78,6 +78,7 @@ public sealed partial class DecompilerTextView : UserControl, IHaveState, IProgr
 		readonly IExportProvider exportProvider;
 		readonly SettingsService settingsService;
 		readonly LanguageService languageService;
+		readonly MainWindow mainWindow;
 		readonly ReferenceElementGenerator referenceElementGenerator;
 		readonly UIElementGenerator uiElementGenerator;
 		readonly List<VisualLineElementGenerator?> activeCustomElementGenerators = new List<VisualLineElementGenerator?>();
@@ -103,6 +104,7 @@ public DecompilerTextView(IExportProvider exportProvider)
 			this.exportProvider = exportProvider;
 			settingsService = exportProvider.GetExportedValue<SettingsService>();
 			languageService = exportProvider.GetExportedValue<LanguageService>();
+			mainWindow = exportProvider.GetExportedValue<MainWindow>();
 
 			RegisterHighlighting();
 
@@ -138,7 +140,7 @@ public DecompilerTextView(IExportProvider exportProvider)
 
 			// SearchPanel
 			SearchPanel searchPanel = SearchPanel.Install(textEditor.TextArea);
-			searchPanel.RegisterCommands(App.Current.MainWindow.CommandBindings);
+			searchPanel.RegisterCommands(mainWindow.CommandBindings);
 			searchPanel.SetResourceReference(SearchPanel.MarkerBrushProperty, ResourceKeys.SearchResultBackgroundBrush);
 			searchPanel.Loaded += (_, _) => {
 				// HACK: fix search text box
@@ -413,7 +415,7 @@ void ToolTipClosed(object? sender, EventArgs e)
 			if (segment.Reference is ICSharpCode.Decompiler.Disassembler.OpCodeInfo code)
 			{
 				XmlDocumentationProvider docProvider = XmlDocLoader.MscorlibDocumentation;
-				DocumentationUIBuilder renderer = new DocumentationUIBuilder(new CSharpAmbience(), languageService.Language.SyntaxHighlighting, settingsService.DisplaySettings);
+				DocumentationUIBuilder renderer = new DocumentationUIBuilder(new CSharpAmbience(), languageService.Language.SyntaxHighlighting, settingsService.DisplaySettings, mainWindow);
 				renderer.AddSignatureBlock($"{code.Name} (0x{code.Code:x})");
 				if (docProvider != null)
 				{
@@ -423,14 +425,14 @@ void ToolTipClosed(object? sender, EventArgs e)
 						renderer.AddXmlDocumentation(documentation, null, null);
 					}
 				}
-				return new FlowDocumentTooltip(renderer.CreateDocument(), fontSize);
+				return new FlowDocumentTooltip(renderer.CreateDocument(), fontSize, mainWindow.ActualWidth);
 			}
 			else if (segment.Reference is IEntity entity)
 			{
 				var document = CreateTooltipForEntity(entity);
 				if (document == null)
 					return null;
-				return new FlowDocumentTooltip(document, fontSize);
+				return new FlowDocumentTooltip(document, fontSize, mainWindow.ActualWidth);
 			}
 			else if (segment.Reference is EntityReference unresolvedEntity)
 			{
@@ -452,7 +454,7 @@ void ToolTipClosed(object? sender, EventArgs e)
 					var document = CreateTooltipForEntity(resolved);
 					if (document == null)
 						return null;
-					return new FlowDocumentTooltip(document, fontSize);
+					return new FlowDocumentTooltip(document, fontSize, mainWindow.ActualWidth);
 				}
 				catch (BadImageFormatException)
 				{
@@ -465,7 +467,7 @@ void ToolTipClosed(object? sender, EventArgs e)
 		FlowDocument? CreateTooltipForEntity(IEntity resolved)
 		{
 			Language currentLanguage = languageService.Language;
-			DocumentationUIBuilder renderer = new DocumentationUIBuilder(new CSharpAmbience(), currentLanguage.SyntaxHighlighting, settingsService.DisplaySettings);
+			DocumentationUIBuilder renderer = new DocumentationUIBuilder(new CSharpAmbience(), currentLanguage.SyntaxHighlighting, settingsService.DisplaySettings, mainWindow);
 			RichText richText = currentLanguage.GetRichTextTooltip(resolved);
 			if (richText == null)
 			{
@@ -504,14 +506,14 @@ sealed class FlowDocumentTooltip : Popup
 		{
 			readonly FlowDocumentScrollViewer viewer;
 
-			public FlowDocumentTooltip(FlowDocument document, double fontSize)
+			public FlowDocumentTooltip(FlowDocument document, double fontSize, double maxWith)
 			{
 				TextOptions.SetTextFormattingMode(this, TextFormattingMode.Display);
-				viewer = new FlowDocumentScrollViewer() {
+				viewer = new() {
 					Width = document.MinPageWidth + fontSize * 5,
-					MaxWidth = App.Current.MainWindow.ActualWidth
+					MaxWidth = maxWith,
+					Document = document
 				};
-				viewer.Document = document;
 				Border border = new Border {
 					BorderThickness = new Thickness(1),
 					MaxHeight = 400,
@@ -575,7 +577,7 @@ public void Report(DecompilationProgress value)
 				progressTitle.Text = !string.IsNullOrWhiteSpace(value.Title) ? value.Title : Properties.Resources.Decompiling;
 				progressText.Text = value.Status;
 				progressText.Visibility = !string.IsNullOrWhiteSpace(progressText.Text) ? Visibility.Visible : Visibility.Collapsed;
-				var taskBar = App.Current.MainWindow.TaskbarItemInfo;
+				var taskBar = mainWindow.TaskbarItemInfo;
 				if (taskBar != null)
 				{
 					taskBar.ProgressState = System.Windows.Shell.TaskbarItemProgressState.Normal;
@@ -605,7 +607,7 @@ public Task<T> RunWithCancellation<T>(Func<CancellationToken, Task<T>> taskCreat
 				progressText.Text = null;
 				progressText.Visibility = Visibility.Collapsed;
 				waitAdorner.BeginAnimation(OpacityProperty, new DoubleAnimation(0, 1, new Duration(TimeSpan.FromSeconds(0.5)), FillBehavior.Stop));
-				var taskBar = App.Current.MainWindow.TaskbarItemInfo;
+				var taskBar = mainWindow.TaskbarItemInfo;
 				if (taskBar != null)
 				{
 					taskBar.ProgressState = System.Windows.Shell.TaskbarItemProgressState.Indeterminate;
@@ -644,7 +646,7 @@ public Task<T> RunWithCancellation<T>(Func<CancellationToken, Task<T>> taskCreat
 						progressBar.IsIndeterminate = false;
 						progressText.Text = null;
 						progressText.Visibility = Visibility.Collapsed;
-						var taskBar = App.Current.MainWindow.TaskbarItemInfo;
+						var taskBar = mainWindow.TaskbarItemInfo;
 						if (taskBar != null)
 						{
 							taskBar.ProgressState = System.Windows.Shell.TaskbarItemProgressState.None;
diff --git a/ILSpy/TextView/DocumentationUIBuilder.cs b/ILSpy/TextView/DocumentationUIBuilder.cs
index 56b53b98f6..d493928d01 100644
--- a/ILSpy/TextView/DocumentationUIBuilder.cs
+++ b/ILSpy/TextView/DocumentationUIBuilder.cs
@@ -45,15 +45,17 @@ public class DocumentationUIBuilder
 		readonly IAmbience ambience;
 		readonly IHighlightingDefinition highlightingDefinition;
 		readonly DisplaySettings displaySettings;
+		readonly MainWindow mainWindow;
 		readonly FlowDocument document;
 		BlockCollection blockCollection;
 		InlineCollection inlineCollection;
 
-		public DocumentationUIBuilder(IAmbience ambience, IHighlightingDefinition highlightingDefinition, DisplaySettings displaySettings)
+		public DocumentationUIBuilder(IAmbience ambience, IHighlightingDefinition highlightingDefinition, DisplaySettings displaySettings, MainWindow mainWindow)
 		{
 			this.ambience = ambience;
 			this.highlightingDefinition = highlightingDefinition;
 			this.displaySettings = displaySettings;
+			this.mainWindow = mainWindow;
 			this.document = new FlowDocument();
 			this.blockCollection = document.Blocks;
 
@@ -119,7 +121,7 @@ public void AddSignatureBlock(string signature, RichTextModel highlighting = nul
 			};
 			text.Inlines.AddRange(richText.CreateRuns(document));
 			text.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-			this.document.MinPageWidth = Math.Min(text.DesiredSize.Width, App.Current.MainWindow.ActualWidth);
+			this.document.MinPageWidth = Math.Min(text.DesiredSize.Width, mainWindow.ActualWidth);
 			block.Inlines.AddRange(richText.CreateRuns(document));
 			block.FontFamily = GetCodeFont();
 			block.TextAlignment = TextAlignment.Left;
diff --git a/ILSpy/Updates/NotifyOfUpdatesStrategy.cs b/ILSpy/Updates/UpdateService.cs
similarity index 97%
rename from ILSpy/Updates/NotifyOfUpdatesStrategy.cs
rename to ILSpy/Updates/UpdateService.cs
index f2fb2ff4bb..259dbf4781 100644
--- a/ILSpy/Updates/NotifyOfUpdatesStrategy.cs
+++ b/ILSpy/Updates/UpdateService.cs
@@ -23,11 +23,9 @@
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-using ICSharpCode.ILSpyX.Settings;
-
 namespace ICSharpCode.ILSpy.Updates
 {
-	internal static class NotifyOfUpdatesStrategy
+	internal static class UpdateService
 	{
 		static readonly Uri UpdateUrl = new Uri("https://ilspy.net/updates.xml");
 		const string band = "stable";
diff --git a/ILSpy/Util/MenuService.cs b/ILSpy/Util/MenuService.cs
index 3199baf625..e5ae79f8b7 100644
--- a/ILSpy/Util/MenuService.cs
+++ b/ILSpy/Util/MenuService.cs
@@ -22,6 +22,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
 
@@ -74,28 +75,31 @@ void InitMainMenu(Menu mainMenu)
 						}
 						else
 						{
+							var command = entry.Value;
+
 							var menuItem = new MenuItem {
-								Command = CommandWrapper.Unwrap(entry.Value),
+								Command = CommandWrapper.Unwrap(command),
 								Tag = entry.Metadata?.MenuID,
 								Header = ResourceHelper.GetString(entry.Metadata?.Header)
 							};
+
 							if (!string.IsNullOrEmpty(entry.Metadata?.MenuIcon))
 							{
 								menuItem.Icon = new Image {
 									Width = 16,
 									Height = 16,
-									Source = Images.Load(entry.Value, entry.Metadata.MenuIcon)
+									Source = Images.Load(command, entry.Metadata.MenuIcon)
 								};
 							}
 
 							menuItem.IsEnabled = entry.Metadata?.IsEnabled ?? false;
-							if (entry.Value is ToggleableCommand)
+							menuItem.InputGestureText = entry.Metadata?.InputGestureText;
+
+							if (command is IProvideParameterBinding parameterBinding)
 							{
-								menuItem.IsCheckable = true;
-								menuItem.SetBinding(MenuItem.IsCheckedProperty, new Binding("IsChecked") { Source = entry.Value, Mode = BindingMode.OneWay });
+								BindingOperations.SetBinding(menuItem, MenuItem.CommandParameterProperty, parameterBinding.ParameterBinding);
 							}
 
-							menuItem.InputGestureText = entry.Metadata?.InputGestureText;
 							parentMenuItem.Items.Add(menuItem);
 						}
 					}
@@ -153,23 +157,23 @@ void InitToolbar(ToolBar toolBar)
 		{
 			int navigationPos = 0;
 			int openPos = 1;
-			var toolbarCommandsByTitle = exportProvider.GetExports<ICommand, IToolbarCommandMetadata>("ToolbarCommand")
+			var toolbarCommandsByCategory = exportProvider.GetExports<ICommand, IToolbarCommandMetadata>("ToolbarCommand")
 				.OrderBy(c => c.Metadata?.ToolbarOrder)
 				.GroupBy(c => c.Metadata?.ToolbarCategory);
 
-			foreach (var commandGroup in toolbarCommandsByTitle)
+			foreach (var commandCategory in toolbarCommandsByCategory)
 			{
-				if (commandGroup.Key == nameof(Properties.Resources.Navigation))
+				if (commandCategory.Key == nameof(Properties.Resources.Navigation))
 				{
-					foreach (var command in commandGroup)
+					foreach (var command in commandCategory)
 					{
 						toolBar.Items.Insert(navigationPos++, CreateToolbarItem(command));
 						openPos++;
 					}
 				}
-				else if (commandGroup.Key == nameof(Properties.Resources.Open))
+				else if (commandCategory.Key == nameof(Properties.Resources.Open))
 				{
-					foreach (var command in commandGroup)
+					foreach (var command in commandCategory)
 					{
 						toolBar.Items.Insert(openPos++, CreateToolbarItem(command));
 					}
@@ -177,13 +181,12 @@ void InitToolbar(ToolBar toolBar)
 				else
 				{
 					toolBar.Items.Add(new Separator());
-					foreach (var command in commandGroup)
+					foreach (var command in commandCategory)
 					{
 						toolBar.Items.Add(CreateToolbarItem(command));
 					}
 				}
 			}
-
 		}
 
 		Control CreateMenuItem(TabPageModel pane)
@@ -237,19 +240,28 @@ Control CreateMenuItem(ToolPaneModel pane, InputBindingCollection inputBindings)
 			return menuItem;
 		}
 
-		static Button CreateToolbarItem(IExport<ICommand, IToolbarCommandMetadata> command)
+		static Button CreateToolbarItem(IExport<ICommand, IToolbarCommandMetadata> commandExport)
 		{
-			return new() {
+			var command = commandExport.Value;
+
+			Button toolbarItem = new() {
 				Style = ThemeManager.Current.CreateToolBarButtonStyle(),
-				Command = CommandWrapper.Unwrap(command.Value),
-				ToolTip = Properties.Resources.ResourceManager.GetString(command.Metadata?.ToolTip),
-				Tag = command.Metadata?.Tag,
+				Command = CommandWrapper.Unwrap(command),
+				ToolTip = Properties.Resources.ResourceManager.GetString(commandExport.Metadata?.ToolTip ?? string.Empty),
+				Tag = commandExport.Metadata?.Tag,
 				Content = new Image {
 					Width = 16,
 					Height = 16,
-					Source = Images.Load(command.Value, command.Metadata?.ToolbarIcon)
+					Source = Images.Load(command, commandExport.Metadata?.ToolbarIcon)
 				}
 			};
+
+			if (command is IProvideParameterBinding parameterBinding)
+			{
+				BindingOperations.SetBinding(toolbarItem, ButtonBase.CommandParameterProperty, parameterBinding.ParameterBinding);
+			}
+
+			return toolbarItem;
 		}
 	}
 }
diff --git a/ILSpy/Util/MessageBus.cs b/ILSpy/Util/MessageBus.cs
index 3a33cffa3d..5d192e7ea3 100644
--- a/ILSpy/Util/MessageBus.cs
+++ b/ILSpy/Util/MessageBus.cs
@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Threading.Tasks;
 using System.Windows.Navigation;
 
 using ICSharpCode.ILSpy.TextView;
@@ -117,4 +118,9 @@ public class ShowSearchPageEventArgs(string? searchTerm) : EventArgs
 	{
 		public string? SearchTerm { get; } = searchTerm;
 	}
+
+	public class CheckIfUpdateAvailableEventArgs(bool notify = false) : EventArgs
+	{
+		public bool Notify { get; } = notify;
+	}
 }
\ No newline at end of file