From 189033b84cc11683ca82ca79bcc5a77a4fce6f8c Mon Sep 17 00:00:00 2001
From: _Neo_ <ursamajorjanus2819@gmail.com>
Date: Mon, 23 Mar 2026 20:56:34 +0200
Subject: [PATCH] General layout adjustments and tiny bug fixes

---
 src/Ryujinx/Systems/AppHost.cs                |  5 +--
 .../UI/Views/Main/MainMenuBarView.axaml       | 35 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/Ryujinx/Systems/AppHost.cs b/src/Ryujinx/Systems/AppHost.cs
index 5e30333c8..4722aae33 100644
--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/src/Ryujinx/Systems/AppHost.cs
@@ -476,10 +476,10 @@ namespace Ryujinx.Ava.Systems
 
             TouchScreenManager.Initialize(Device);
 
-            _viewModel.IsGameRunning = true;
-
             Dispatcher.UIThread.InvokeAsync(() =>
             {
+                _viewModel.IsGameRunning = true;
+                _viewModel.IsPaused = false;
                 _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
             });
 
@@ -578,6 +578,7 @@ namespace Ryujinx.Ava.Systems
         public void Stop()
         {
             _isActive = false;
+            _viewModel.IsPaused = false;
             _playTimer.Stop();
         }
 
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
index 21e09a34a..8adf1725c 100755
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -173,32 +173,28 @@
                     Icon="{ext:Icon fa-solid fa-rotate-right}"
                     InputGesture="Ctrl + R"
                     IsEnabled="{Binding IsGameRunning}" />
-                <MenuItem 
-                    Command="{Binding SimulateWakeUpMessage}" 
-                    Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" 
-                    Icon="{ext:Icon fa-solid fa-sun}" 
-                    InputGesture="Ctrl + M" />
-                <Separator />
+                <Separator/>
                 <MenuItem
                     Command="{Binding OpenAmiiboWindow}"
                     AttachedToVisualTree="ScanAmiiboMenuItem_AttachedToVisualTree"
                     Header="{ext:Locale MenuBarActionsScanAmiibo}"
-                    Icon="{ext:Icon fa-solid fa-cube}"
+                    Icon="{ext:Icon fa-solid fa-chess-rook}"
                     InputGesture="Ctrl + A"
                     IsEnabled="{Binding IsAmiiboRequested}" />
                 <MenuItem
                     Command="{Binding OpenBinFile}"
                     AttachedToVisualTree="ScanBinAmiiboMenuItem_AttachedToVisualTree"
                     Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
-                    Icon="{ext:Icon fa-solid fa-cube}"
+                    Icon="{ext:Icon fa-solid fa-chess-rook}"
                     IsVisible="{Binding CanScanAmiiboBinaries}"
                     InputGesture="Ctrl + B"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
+                <Separator IsVisible="{Binding CanScanAmiiboBinaries}"/>
                 <MenuItem
                     Command="{Binding OpenSkylanderWindow}"
                     AttachedToVisualTree="ScanSkylanderMenuItem_AttachedToVisualTree"
                     Header="{ext:Locale MenuBarActionsScanSkylander}"
-                    Icon="{ext:Icon fa-solid fa-cube}"
+                    Icon="{ext:Icon fa-solid fa-dragon}"
                     IsVisible="{Binding ShowSkylanderActions}"
                     InputGesture="Ctrl + S"
                     IsEnabled="{Binding IsSkylanderRequested}" />
@@ -206,10 +202,23 @@
                     Command="{Binding RemoveSkylander}"
                     AttachedToVisualTree="RemoveSkylanderMenuItem_AttachedToVisualTree"
                     Header="{ext:Locale MenuBarActionsRemoveSkylander}"
-                    Icon="{ext:Icon fa-solid fa-cube}"
+                    Icon="{ext:Icon fa-solid fa-dragon}"
                     IsVisible="{Binding ShowSkylanderActions}"
                     InputGesture="Ctrl + D"
                     IsEnabled="{Binding HasSkylander}" />
+                <Separator IsVisible="{Binding ShowSkylanderActions}"/>
+                <MenuItem
+                    Command="{Binding OpenCheatManagerForCurrentApp}"
+                    Header="{ext:Locale GameListContextMenuManageCheat}"
+                    Icon="{ext:Icon fa-solid fa-code}"
+                    InputGesture="Ctrl + C"
+                    IsEnabled="{Binding IsGameRunning}" />
+                <MenuItem 
+                    Command="{Binding SimulateWakeUpMessage}" 
+                    Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" 
+                    Icon="{ext:Icon fa-solid fa-sun}" 
+                    InputGesture="Ctrl + M" />
+                <Separator />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
                     Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"
@@ -222,12 +231,6 @@
                     Icon="{ext:Icon fa-solid fa-eye-slash}"
                     InputGesture="{Binding ShowUiKey}"
                     IsEnabled="{Binding IsGameRunning}" />
-                <MenuItem
-                    Name="CheatManagerMenuItem"
-                    Header="{ext:Locale GameListContextMenuManageCheat}"
-                    Icon="{ext:Icon fa-solid fa-code}"
-                    InputGesture="Ctrl + C"
-                    IsEnabled="{Binding IsGameRunning}" />
                 <Separator IsVisible="{Binding RenderDocIsAvailable}" />
                 <MenuItem
                     IsVisible="{Binding ShowStartCaptureButton}"