diff --git a/ILSpy/Commands/DecompileAllCommand.cs b/ILSpy/Commands/DecompileAllCommand.cs
index c20f01aaf..6a351bb60 100644
--- a/ILSpy/Commands/DecompileAllCommand.cs
+++ b/ILSpy/Commands/DecompileAllCommand.cs
@@ -43,7 +43,7 @@ namespace ILSpy.Commands
 	/// timing in a results tab. Hard-coded output path matches WPF — the command's
 	/// CanExecute gates on that directory existing so it's effectively opt-in.
 	/// </summary>
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDecompile), MenuCategory = nameof(Resources.Open), MenuOrder = 2.5)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDecompile), MenuCategory = "Debug", MenuOrder = 30)]
 	[Shared]
 	sealed class DecompileAllCommand : SimpleCommand
 	{
@@ -114,7 +114,7 @@ namespace ILSpy.Commands
 	/// <see cref="DecompileAllCommand"/> but routes through <see cref="ILLanguage"/>.
 	/// CanExecute gates on the output directory existing.
 	/// </summary>
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDisassemble), MenuCategory = nameof(Resources.Open), MenuOrder = 2.55)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDisassemble), MenuCategory = "Debug", MenuOrder = 31)]
 	[Shared]
 	sealed class DisassembleAllCommand : SimpleCommand
 	{
@@ -185,7 +185,7 @@ namespace ILSpy.Commands
 	/// and report average wall-clock time. Used for tracking decompilation perf
 	/// regressions across changes.
 	/// </summary>
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDecompile100x), MenuCategory = nameof(Resources.Open), MenuOrder = 2.6)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDecompile100x), MenuCategory = "Debug", MenuOrder = 32)]
 	[Shared]
 	sealed class Decompile100TimesCommand : SimpleCommand
 	{
diff --git a/ILSpy/Commands/FileCommands.cs b/ILSpy/Commands/FileCommands.cs
index 5d97ed07c..857d805b3 100644
--- a/ILSpy/Commands/FileCommands.cs
+++ b/ILSpy/Commands/FileCommands.cs
@@ -124,7 +124,7 @@ namespace ILSpy.Commands
 		}
 	}
 
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.ManageAssembly_Lists), MenuIcon = "Images/AssemblyList", MenuCategory = nameof(Resources.Open), MenuOrder = 1.7)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.ManageAssembly_Lists), MenuIcon = "Images/AssemblyList", MenuCategory = "AssemblyList", MenuOrder = 10)]
 	[Shared]
 	sealed class ManageAssemblyListsCommand : SimpleCommand
 	{
@@ -165,7 +165,7 @@ namespace ILSpy.Commands
 	// DEBUG-only Pdb2XmlCommand moved to its own file with `#if DEBUG && WINDOWS` gating.
 	// On non-Windows or non-Debug builds the entry simply isn't compiled.
 
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources._RemoveAssembliesWithLoadErrors), MenuCategory = nameof(Resources.Remove), MenuOrder = 2.6)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources._RemoveAssembliesWithLoadErrors), MenuCategory = "AssemblyList", MenuOrder = 11)]
 	[Shared]
 	[method: ImportingConstructor]
 	sealed class RemoveAssembliesWithLoadErrors(AssemblyTreeModel assemblyTreeModel) : SimpleCommand
@@ -186,7 +186,7 @@ namespace ILSpy.Commands
 		}
 	}
 
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.ClearAssemblyList), MenuCategory = nameof(Resources.Remove), MenuOrder = 2.6)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.ClearAssemblyList), MenuCategory = "AssemblyList", MenuOrder = 12)]
 	[Shared]
 	[method: ImportingConstructor]
 	sealed class ClearAssemblyListCommand(AssemblyTreeModel assemblyTreeModel) : SimpleCommand
@@ -197,7 +197,7 @@ namespace ILSpy.Commands
 		public override void Execute(object? parameter) => assemblyTreeModel.AssemblyList?.Clear();
 	}
 
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources._SaveCode), MenuIcon = "Images/Save", MenuCategory = nameof(Resources.Save), MenuOrder = 0, InputGestureText = "Ctrl+S")]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources._SaveCode), MenuIcon = "Images/Save", MenuCategory = nameof(Resources.Save), MenuOrder = 20, InputGestureText = "Ctrl+S")]
 	[Shared]
 	[method: ImportingConstructor]
 	internal sealed class SaveCommand(
@@ -275,7 +275,7 @@ namespace ILSpy.Commands
 		}
 	}
 
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.GeneratePortable), MenuCategory = nameof(Resources.Save))]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.GeneratePortable), MenuCategory = nameof(Resources.Save), MenuOrder = 21)]
 	[Shared]
 	sealed class GeneratePdbCommand : SimpleCommand
 	{
diff --git a/ILSpy/Commands/Pdb2XmlCommand.cs b/ILSpy/Commands/Pdb2XmlCommand.cs
index 090c2ae58..876cb1962 100644
--- a/ILSpy/Commands/Pdb2XmlCommand.cs
+++ b/ILSpy/Commands/Pdb2XmlCommand.cs
@@ -40,7 +40,7 @@ namespace ILSpy.Commands
 	/// <c>Microsoft.DiaSymReader</c> uses native COM interop. WPF gates this command
 	/// identically (<c>#if DEBUG &amp;&amp; WINDOWS</c>).
 	/// </summary>
-	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDumpPDBAsXML), MenuCategory = nameof(Resources.Open), MenuOrder = 2.7)]
+	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDumpPDBAsXML), MenuCategory = "Debug", MenuOrder = 33)]
 	[Shared]
 	sealed class Pdb2XmlCommand : SimpleCommand
 	{