Merge 7a43dcb513 into f3a9cecf72

When switching profiles, if the profile does not belong to the gamepad itself, the gamepad began to be displayed as turned off.
Fixed a bug where the return button did not return the initially selected gamepad

src/Ryujinx/AppHost.cs

@@ -470,7 +470,7 @@ namespace Ryujinx.Ava
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
             });
 
             _viewModel.SetUiProgressHandlers(Device);
@@ -872,7 +872,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
@@ -881,7 +881,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 

src/Ryujinx/Assets/locales.json

@@ -3823,28 +3823,53 @@
       }
     },
     {
-      "ID": "SettingsTabGeneralShowTitleBar",
+      "ID": "SettingsTabGeneralShowOldUI",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Show Title Bar (Requires restart)",
+        "en_US": "Show Original UI Style (Requires restart)",
-        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
+        "es_ES": "",
-        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
+        "fr_FR": "",
         "he_IL": "",
-        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
+        "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
+        "ko_KR": "",
-        "no_NO": "Vis tittellinje (krever omstart)",
+        "no_NO": "Vis original UI-stil (krever omstart)",
         "pl_PL": "",
-        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
+        "pt_BR": "",
-        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
+        "ru_RU": "",
-        "sv_SE": "Visa titelrad (kräver omstart)",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
+        "uk_UA": "",
-        "zh_CN": "显示标题栏 (需要重启)",
+        "zh_CN": "",
-        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabGeneralShowOldUIToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -1,4 +1,5 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Humanizer;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
 
@@ -24,4 +25,17 @@ namespace Ryujinx.Ava.Common.Markup
         protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
             => bindingExtension.Source = LocaleManager.Instance;
     }
+    
+    internal class WindowTitleExtension(LocaleKeys key, bool includeVersion) : BasicMarkupExtension<string>
+    {
+        public WindowTitleExtension(LocaleKeys key) : this(key, true)
+        {
+        }
+        
+        public override string Name => "WindowTitleTranslation";
+        protected override string Value => RyujinxApp.FormatTitle(key, includeVersion);
+
+        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
+            => bindingExtension.Source = LocaleManager.Instance;
+    }
 }

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -46,12 +46,11 @@ namespace Ryujinx.Ava.Systems.Configuration
             
           
             EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
-            CheckUpdatesOnStart.Value = shouldLoadFromFile ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
             UpdateCheckerType.Value = shouldLoadFromFile ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
             FocusLostActionType.Value = cff.FocusLostActionType;
             ShowConfirmExit.Value = shouldLoadFromFile ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
             RememberWindowState.Value = shouldLoadFromFile ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
-            ShowTitleBar.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
+            ShowOldUI.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowOldUI.Value; // Get from global config only
             EnableHardwareAcceleration.Value = shouldLoadFromFile ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
             HideCursor.Value = cff.HideCursor;
           

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -783,11 +783,6 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// Enables or disables Discord Rich Presence
         /// </summary>
         public ReactiveObject<bool> EnableDiscordIntegration { get; private set; }
-
-        /// <summary>
-        /// Checks for updates when Ryujinx starts when enabled
-        /// </summary>
-        public ReactiveObject<bool> CheckUpdatesOnStart { get; private set; }
         
         /// <summary>
         /// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
@@ -810,9 +805,9 @@ namespace Ryujinx.Ava.Systems.Configuration
         public ReactiveObject<bool> RememberWindowState { get; private set; }
 
         /// <summary>
-        /// Enables or disables the redesigned title bar
+        /// Disable the new title bar layout & window layout changes.
         /// </summary>
-        public ReactiveObject<bool> ShowTitleBar { get; private set; }
+        public ReactiveObject<bool> ShowOldUI { get; private set; }
 
         /// <summary>
         /// Enables hardware-accelerated rendering for Avalonia
@@ -833,15 +828,14 @@ namespace Ryujinx.Ava.Systems.Configuration
             Hid = new HidSection();
             Multiplayer = new MultiplayerSection();
             Hacks = new HacksSection();
-            EnableDiscordIntegration = new ReactiveObject<bool>();
-            CheckUpdatesOnStart = new ReactiveObject<bool>();
             UpdateCheckerType = new ReactiveObject<UpdaterType>();
             FocusLostActionType = new ReactiveObject<FocusLostType>();
+            HideCursor = new ReactiveObject<HideCursorMode>();
+            EnableDiscordIntegration = new ReactiveObject<bool>();
             ShowConfirmExit = new ReactiveObject<bool>();
             RememberWindowState = new ReactiveObject<bool>();
-            ShowTitleBar = new ReactiveObject<bool>();
+            ShowOldUI = new ReactiveObject<bool>();
             EnableHardwareAcceleration = new ReactiveObject<bool>();
-            HideCursor = new ReactiveObject<HideCursorMode>();
         }
 
         public HleConfiguration CreateHleConfiguration() =>

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -56,12 +56,11 @@ namespace Ryujinx.Ava.Systems.Configuration
                 MatchSystemTime = System.MatchSystemTime,
                 DockedMode = System.EnableDockedMode,
                 EnableDiscordIntegration = EnableDiscordIntegration,
-                CheckUpdatesOnStart = CheckUpdatesOnStart,
                 UpdateCheckerType = UpdateCheckerType,
                 FocusLostActionType = FocusLostActionType,
                 ShowConfirmExit = ShowConfirmExit,
                 RememberWindowState = RememberWindowState,
-                ShowTitleBar = ShowTitleBar,
+                ShowTitleBar = ShowOldUI,
                 EnableHardwareAcceleration = EnableHardwareAcceleration,
                 HideCursor = HideCursor,
                 VSyncMode = Graphics.VSyncMode,
@@ -183,7 +182,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             FocusLostActionType.Value = FocusLostType.DoNothing;
             ShowConfirmExit.Value = true;
             RememberWindowState.Value = true;
-            ShowTitleBar.Value = !OperatingSystem.IsWindows();
+            ShowOldUI.Value = !OperatingSystem.IsWindows();
             EnableHardwareAcceleration.Value = true;
             HideCursor.Value = HideCursorMode.OnIdle;
             Graphics.VSyncMode.Value = VSyncMode.Switch;

src/Ryujinx/UI/Controls/RyujinxLogo.cs

@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media.Imaging;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.ViewModels;
+using System.Reflection;
+
+namespace Ryujinx.Ava.UI.Controls
+{
+    public class RyujinxLogo : Image
+    {
+        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
+        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
+        // The border gets reduced to colored pixels in the 4 corners.
+        public static readonly Bitmap Bitmap =
+            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
+                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
+        
+        public RyujinxLogo()
+        {
+            Margin = new Thickness(7, 7, 7, 0);
+            Height = 25;
+            Width = 25;
+            Source = Bitmap;
+            IsVisible = !ConfigurationState.Instance.ShowOldUI;
+        }
+    }
+}

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -88,7 +88,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsKeyboard => !IsController;
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
-        public int DeviceIndexBeforeChange { get; set; }
+        public string RevertDeviceId { get; set; }
         public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
@@ -116,7 +116,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 // When you select a profile, the settings from the profile will be applied.
                 // To save the settings, you still need to click the apply button
-
                 _profileChoose = value;
                 LoadProfile();
                 OnPropertyChanged();
@@ -167,7 +166,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 LoadDevice();
                 LoadProfiles();
 
-                DeviceIndexBeforeChange = Device;
+                RevertDeviceId = Devices[Device].Id;
                 _isLoaded = true;
                 _isChangeTrackingActive = true;
                 OnPropertyChanged();
@@ -179,6 +178,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _controller;
             set
             {
+                MarkAsChanged();
+
                 _controller = value;
 
                 if (_controller == -1)
@@ -216,7 +217,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     
                     LoadInputDriver();
                     LoadProfiles();
-                    SetChangeTrackingActive();
                 }
        
                 OnPropertyChanged();
@@ -258,10 +258,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _device;
             set
             {
-                if (!IsModified)
+                MarkAsChanged();
-                {
-                    DeviceIndexBeforeChange = _device;
-                }
 
                 _device = value < 0 ? 0 : value;
 
@@ -282,8 +279,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     }
                 }
 
-                FindPairedDevice();
+                FindPairedDeviceInConfigFile();
-                SetChangeTrackingActive();
                 OnPropertyChanged();
                 NotifyChanges();
             }
@@ -363,50 +359,35 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
             }
 
-            FindPairedDevice();
+            FindPairedDeviceInConfigFile();
         }
 
-        private void FindPairedDevice()
+        private void FindPairedDeviceInConfigFile()
         {
-            // This feature allows you to display a notification
+            // This function allows you to output a message about the device configuration found in the file
-            // if a configuration is found, but the gamepad is not connected.
+            // NOTE: if the configuration is found, we display the message "Waiting for controller connection",
-            if (Config != null)
+            // but only if the id gamepad belongs to the selected player
-            {
+            NotificationView = Config != null && Devices.FirstOrDefault(d => d.Id == Config.Id).Id != Config.Id && Config.PlayerIndex == PlayerId;
-                (DeviceType Type, string Id, string Name) activeDevice = Devices.FirstOrDefault(d => d.Id == Config.Id);
-
-                if (activeDevice.Id != Config.Id)
-                {
-                    // display notification when input device is turned off, and
-                    // if device and configuration do not match (different controllers)
-                    NotificationView = true; 
-                }
-                else
-                {
-                    NotificationView = false;
-                }
-            }
-            else
-            {
-                NotificationView = false;
-            }
         }
 
-        private void SetChangeTrackingActive()
+
+        private void MarkAsChanged()
         {
-          
+            //If tracking is active, then allow changing the modifier      
-            if (_isChangeTrackingActive)
+            if (!IsModified && _isChangeTrackingActive)
             {
+                RevertDeviceId = Devices[Device].Id; // Remember the device to undo changes
                 IsModified = true;
             }
         }
 
 
-        public void DisableDeviceForSaving()
+        public void UnlinkDevice()
         {
             // "Disabled" mode is available after unbinding the device
             // NOTE: the IsModified flag to be able to apply the settings.
-            IsModified = true;
             NotificationView = false;
+            IsModified = true;
         }
 
 
@@ -477,34 +458,31 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         private async void HandleOnGamepadDisconnected(string id)
         {
-            _isChangeTrackingActive = false;
+            _isChangeTrackingActive = false; // Disable configuration change tracking
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 LoadDevices();
 
                 IsModified = true;
-                LoadSavedConfiguration();
+                RevertChanges();
-                FindPairedDevice();
+                FindPairedDeviceInConfigFile();
 
-                _isChangeTrackingActive = true;
+                _isChangeTrackingActive = true; // Enable configuration change tracking
                 return System.Threading.Tasks.Task.CompletedTask;
             });
         }
 
         private async void HandleOnGamepadConnected(string id)
         {
-            _isChangeTrackingActive = false;
+            _isChangeTrackingActive = false; // Disable configuration change tracking
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 LoadDevices();
 
-                if (Config != null)
+                IsModified = true;
-                {
+                RevertChanges();                  
-                    // Load configuration after connection if it is in the configuration file
+
-                    IsModified = true;
+                _isChangeTrackingActive = true;// Enable configuration change tracking
-                    LoadSavedConfiguration();                  
-                }
-                _isChangeTrackingActive = true;
             });
         }
 
@@ -809,9 +787,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public void LoadProfileButton()
-        {
+        { 
-            IsModified = true;
             LoadProfile();
+            IsModified = true;
         }
 
         public async void LoadProfile()
@@ -865,12 +843,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isLoaded = false;
 
-                config.Id = null; // ignore device IDs (there is no longer a need to store device IDs for presets due to their independence from devices)
+                config.Id = Config.Id; // Set current device id instead of changing device(independent profiles)
 
                 LoadConfiguration(config);
 
-                // This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers
+                //LoadDevice();  This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers 
-                // LoadDevice();
 
                 _isLoaded = true;
 
@@ -880,56 +857,58 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public async void SaveProfile()
         {
-            if (Device == 0)
+           
-            {
+           if (Device == 0)
-                return;
+           {
-            }
+               return;
+           }
+           
+           if (ConfigViewModel == null)
+           {
+               return;
+           }
+         
+           if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
+           {
+               await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
 
-            if (ConfigViewModel == null)
+               return;
-            {
+           }
-                return;
+           else
-            }
+           {
+               bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
 
-            if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
+               if (validFileName)
-            {
+               {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
+                   string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
 
-                return;
+                   InputConfig config = null;
-            }
-            else
-            {
-                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
 
-                if (validFileName)
+                   if (IsKeyboard)
-                {
+                   {
-                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+                       config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
+                   }
+                   else if (IsController)
+                   {
+                       config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
+                   }
 
-                    InputConfig config = null;
+                   config.ControllerType = Controllers[_controller].Type;
 
-                    if (IsKeyboard)
+                   string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
-                    {
-                        config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
-                    }
-                    else if (IsController)
-                    {
-                        config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
-                    }
 
-                    config.ControllerType = Controllers[_controller].Type;
+                   await File.WriteAllTextAsync(path, jsonString);
 
-                    string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
+                   LoadProfiles();
 
-                    await File.WriteAllTextAsync(path, jsonString);
+                   ProfileChoose = ProfileName; // Show new profile
-
+               }
-                    LoadProfiles();
+               else
-
+               {
-                    ProfileChoose = ProfileName; // Show new profile
+                   await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-                }
+               }
-                else
+           }
-                {
+           
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-                }
-            }
         }
 
         public async void RemoveProfile()
@@ -961,22 +940,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
-        public void LoadSavedConfiguration()
+        public void RevertChanges()
         {
-            // Restores settings and sets the previously selected device to the last saved state
+                Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId);
-            // NOTE: The current order allows the configuration and device to be loaded correctly until the configuration is changed.
-
-            if (IsModified) // Fixes random gamepad appearance in "disabled" option
-            {
-                Device = DeviceIndexBeforeChange;
-
                 LoadDevice();
                 LoadConfiguration();
-
-                IsModified = false;
-
                 OnPropertyChanged();
-            }
+                IsModified = false;
         }
 
         public void Save()
@@ -988,7 +958,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
 
             IsModified = false;
-            DeviceIndexBeforeChange = Device;
+
+            RevertDeviceId = Devices[Device].Id; // Remember selected device after saving
+
             List <InputConfig> newConfig = [];
 
             newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -137,13 +137,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         // Key is Title ID
         public SafeDictionary<string, LdnGameData.Array> LdnData = [];
 
-        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
-        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
-        // The border gets reduced to colored pixels in the 4 corners.
-        public static readonly Bitmap IconBitmap =
-            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
-                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
-
         public MainWindow Window { get; init; }
 
         internal AppHost AppHost { get; set; }
@@ -1794,7 +1787,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (WindowState is not WindowState.Normal)
             {
                 WindowState = WindowState.Normal;
-                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
+                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
 
                 if (IsGameRunning)
                 {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -130,11 +130,10 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();
 
         public bool EnableDiscordIntegration { get; set; }
-        public bool CheckUpdatesOnStart { get; set; }
         public bool ShowConfirmExit { get; set; }
         public bool IgnoreApplet { get; set; }
         public bool RememberWindowState { get; set; }
-        public bool ShowTitleBar { get; set; }
+        public bool ShowOldUI { get; set; }
         public int HideCursor { get; set; }
         public int UpdateCheckerType { get; set; }
         public bool EnableDockedMode { get; set; }
@@ -537,10 +536,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // User Interface
             EnableDiscordIntegration = config.EnableDiscordIntegration;
-            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
             ShowConfirmExit = config.ShowConfirmExit;
             RememberWindowState = config.RememberWindowState;
-            ShowTitleBar = config.ShowTitleBar;
+            ShowOldUI = config.ShowOldUI;
             HideCursor = (int)config.HideCursor.Value;
             UpdateCheckerType = (int)config.UpdateCheckerType.Value;
             FocusLostActionType = (int)config.FocusLostActionType.Value;
@@ -646,10 +644,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // User Interface
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
-            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
             config.RememberWindowState.Value = RememberWindowState;
-            config.ShowTitleBar.Value = ShowTitleBar;
+            config.ShowOldUI.Value = ShowOldUI;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
             config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
             config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;

src/Ryujinx/UI/Views/Input/InputView.axaml

@@ -75,7 +75,7 @@
                             Margin="5,0,0,0"
                             VerticalAlignment="Center"
                             ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
-                            Command="{Binding LoadSavedConfiguration}">
+                            Command="{Binding RevertChanges}">
                         <ui:SymbolIcon
                             Symbol="Undo"
                             FontSize="15"
@@ -206,15 +206,14 @@
                 <StackPanel>
                     <TextBlock 
                         Margin="5,20,0,0"
-                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />
+                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />       
-        
                     <Button
                         MinWidth="0"
                         Width="90"
                         Height="27"
                         Margin="5,10,0,0"
                         VerticalAlignment="Center"
-                        Command="{Binding DisableDeviceForSaving}">
+                        Command="{Binding UnlinkDevice}">
                         <TextBlock
                             Text="{ext:Locale ControllerSettingsUnlink}"
                             VerticalAlignment="Center"

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs

@@ -184,11 +184,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
-        private void FlagInputConfigChanged()
-        {
-            (DataContext as KeyboardInputViewModel)!.ParentModel.IsModified = true;
-        }
-
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -207,47 +202,45 @@ namespace Ryujinx.Ava.UI.Views.Input
 
         private void DeleteBind()
         {
-            if (DataContext is not KeyboardInputViewModel viewModel)
-                return;
 
             if (_currentAssigner != null)
             {
                 Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
                 {
-                    { "ButtonZl", () => viewModel.Config.ButtonZl = Key.Unbound },
+                    { "ButtonZl", () => ViewModel.Config.ButtonZl = Key.Unbound },
-                    { "ButtonL", () => viewModel.Config.ButtonL = Key.Unbound },
+                    { "ButtonL", () => ViewModel.Config.ButtonL = Key.Unbound },
-                    { "ButtonMinus", () => viewModel.Config.ButtonMinus = Key.Unbound },
+                    { "ButtonMinus", () => ViewModel.Config.ButtonMinus = Key.Unbound },
-                    { "LeftStickButton", () => viewModel.Config.LeftStickButton = Key.Unbound },
+                    { "LeftStickButton", () => ViewModel.Config.LeftStickButton = Key.Unbound },
-                    { "LeftStickUp", () => viewModel.Config.LeftStickUp = Key.Unbound },
+                    { "LeftStickUp", () => ViewModel.Config.LeftStickUp = Key.Unbound },
-                    { "LeftStickDown", () => viewModel.Config.LeftStickDown = Key.Unbound },
+                    { "LeftStickDown", () => ViewModel.Config.LeftStickDown = Key.Unbound },
-                    { "LeftStickRight", () => viewModel.Config.LeftStickRight = Key.Unbound },
+                    { "LeftStickRight", () => ViewModel.Config.LeftStickRight = Key.Unbound },
-                    { "LeftStickLeft", () => viewModel.Config.LeftStickLeft = Key.Unbound },
+                    { "LeftStickLeft", () => ViewModel.Config.LeftStickLeft = Key.Unbound },
-                    { "DpadUp", () => viewModel.Config.DpadUp = Key.Unbound },
+                    { "DpadUp", () => ViewModel.Config.DpadUp = Key.Unbound },
-                    { "DpadDown", () => viewModel.Config.DpadDown = Key.Unbound },
+                    { "DpadDown", () => ViewModel.Config.DpadDown = Key.Unbound },
-                    { "DpadLeft", () => viewModel.Config.DpadLeft = Key.Unbound },
+                    { "DpadLeft", () => ViewModel.Config.DpadLeft = Key.Unbound },
-                    { "DpadRight", () => viewModel.Config.DpadRight = Key.Unbound },
+                    { "DpadRight", () => ViewModel.Config.DpadRight = Key.Unbound },
-                    { "LeftButtonSr", () => viewModel.Config.LeftButtonSr = Key.Unbound },
+                    { "LeftButtonSr", () => ViewModel.Config.LeftButtonSr = Key.Unbound },
-                    { "LeftButtonSl", () => viewModel.Config.LeftButtonSl = Key.Unbound },
+                    { "LeftButtonSl", () => ViewModel.Config.LeftButtonSl = Key.Unbound },
-                    { "RightButtonSr", () => viewModel.Config.RightButtonSr = Key.Unbound },
+                    { "RightButtonSr", () => ViewModel.Config.RightButtonSr = Key.Unbound },
-                    { "RightButtonSl", () => viewModel.Config.RightButtonSl = Key.Unbound },
+                    { "RightButtonSl", () => ViewModel.Config.RightButtonSl = Key.Unbound },
-                    { "ButtonZr", () => viewModel.Config.ButtonZr = Key.Unbound },
+                    { "ButtonZr", () => ViewModel.Config.ButtonZr = Key.Unbound },
-                    { "ButtonR", () => viewModel.Config.ButtonR = Key.Unbound },
+                    { "ButtonR", () => ViewModel.Config.ButtonR = Key.Unbound },
-                    { "ButtonPlus", () => viewModel.Config.ButtonPlus = Key.Unbound },
+                    { "ButtonPlus", () => ViewModel.Config.ButtonPlus = Key.Unbound },
-                    { "ButtonA", () => viewModel.Config.ButtonA = Key.Unbound },
+                    { "ButtonA", () => ViewModel.Config.ButtonA = Key.Unbound },
-                    { "ButtonB", () => viewModel.Config.ButtonB = Key.Unbound },
+                    { "ButtonB", () => ViewModel.Config.ButtonB = Key.Unbound },
-                    { "ButtonX", () => viewModel.Config.ButtonX = Key.Unbound },
+                    { "ButtonX", () => ViewModel.Config.ButtonX = Key.Unbound },
-                    { "ButtonY", () => viewModel.Config.ButtonY = Key.Unbound },
+                    { "ButtonY", () => ViewModel.Config.ButtonY = Key.Unbound },
-                    { "RightStickButton", () => viewModel.Config.RightStickButton = Key.Unbound },
+                    { "RightStickButton", () => ViewModel.Config.RightStickButton = Key.Unbound },
-                    { "RightStickUp", () => viewModel.Config.RightStickUp = Key.Unbound },
+                    { "RightStickUp", () => ViewModel.Config.RightStickUp = Key.Unbound },
-                    { "RightStickDown", () => viewModel.Config.RightStickDown = Key.Unbound },
+                    { "RightStickDown", () => ViewModel.Config.RightStickDown = Key.Unbound },
-                    { "RightStickRight", () => viewModel.Config.RightStickRight = Key.Unbound },
+                    { "RightStickRight", () => ViewModel.Config.RightStickRight = Key.Unbound },
-                    { "RightStickLeft", () => viewModel.Config.RightStickLeft = Key.Unbound }
+                    { "RightStickLeft", () => ViewModel.Config.RightStickLeft = Key.Unbound }
                 };
 
                 if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
                 {
                     action();
-                    FlagInputConfigChanged();
+                    ViewModel.ParentModel.IsModified = true;
                 }
             }
         }

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -6,18 +6,16 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     mc:Ignorable="d"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     x:DataType="viewModels:MainWindowViewModel"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
     <Design.DataContext>
         <viewModels:MainWindowViewModel />
     </Design.DataContext>
     <DockPanel HorizontalAlignment="Stretch">
-        <Image
+        <controls:RyujinxLogo 
-            Name="RyuLogo"
+            Margin="7, 0" 
-            Margin="7, 0"
+            ToolTip.Tip="{Binding Title}"/>
-            Height="25"
-            Width="25"
-            ToolTip.Tip="{Binding Title}" />
         <Menu
             Name="Menu"
             Height="32"

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -34,9 +34,6 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             InitializeComponent();
 
-            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
-            RyuLogo.Source = MainWindowViewModel.IconBitmap;
-
             ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
             ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
 
@@ -226,7 +223,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
             double barsHeight = ((Window.StatusBarHeight + Window.MenuBarHeight) +
-                (ConfigurationState.Instance.ShowTitleBar ? (int)Window.TitleBar.Height : 0));
+                (ConfigurationState.Instance.ShowOldUI ? (int)Window.TitleBar.Height : 0));
 
             double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
             double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -191,16 +191,16 @@
                         IsEnabled="{Binding !IsGameTitleNotNull}"
                         Opacity="{Binding PanelOpacity}"
                         Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"
-                            Width="250"/>
                         <CheckBox
                             VerticalAlignment="Center"
                             IsChecked="{Binding MatchSystemTime}"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                                Width="250"/>
+                        </CheckBox>
+                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
                     <Separator />
                     <StackPanel Margin="0,10,0,10"

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -49,14 +49,15 @@
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                            </StackPanel>
+                        </StackPanel>
                     </CheckBox>
                     <CheckBox
                         IsEnabled="{Binding !IsGameTitleNotNull}"
                         Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
+                        IsChecked="{Binding ShowOldUI}"
+                        ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
+                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
                     </CheckBox>

src/Ryujinx/UI/Windows/AmiiboWindow.axaml

@@ -6,6 +6,7 @@
     xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     mc:Ignorable="d"
     d:DesignWidth="400"
     d:DesignHeight="350"
@@ -23,7 +24,25 @@
         <viewModels:AmiiboWindowViewModel />
     </Design.DataContext>
     <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
-        <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
+        <Grid Name="FlushControls" ColumnDefinitions="Auto,Auto" Grid.Row="1" Margin="-15">
+            <controls:RyujinxLogo 
+                Grid.Column="0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="8, 8, 7, 0"
+                ToolTip.Tip="{ext:WindowTitle Amiibo}" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
+                <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
+                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
+                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
+                </StackPanel>
+                <StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
+                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
+                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+        <Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
             <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
                 <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                 <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />

src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs

@@ -1,13 +1,14 @@
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;
 
 namespace Ryujinx.Ava.UI.Windows
 {
     public partial class AmiiboWindow : StyleableAppWindow
     {
-        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
+        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId) : base(true, 40)
         {
             DataContext = ViewModel = new AmiiboWindowViewModel(this, lastScannedAmiiboId, titleId)
             {
@@ -16,6 +17,9 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
+            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
+            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
+
             Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
         }
 

src/Ryujinx/UI/Windows/CheatWindow.axaml

@@ -6,6 +6,7 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     Width="600"
     Height="750"
     MinWidth="500"
@@ -20,38 +21,81 @@
         </Style>
     </Window.Styles>
     <Grid Name="CheatGrid" Margin="15" RowDefinitions="Auto,Auto,Auto,*,Auto" ColumnDefinitions="*,*">
-        <TextBlock
+        <Grid Name="FlushHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto,*">
-            Grid.Row="1"
+            <controls:RyujinxLogo
-            Grid.Column="0"
+                Grid.Row="0"
-            Grid.ColumnSpan="2"
+                Grid.Column="0"
-            MaxWidth="500"
+                HorizontalAlignment="Left"
-            Margin="20,15,20,5"
+                Margin="-7, -22, 7, 0"
-            HorizontalAlignment="Center"
+                Height="28"
-            VerticalAlignment="Center"
+                Width="28"
-            LineHeight="18"
+                ToolTip.Tip="{ext:WindowTitle CheatWindowTitle}"/>
-            Text="{Binding Heading}"
+            <StackPanel Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"
-            TextAlignment="Center"
+                        Margin="7, -7, 0, 5"
-            TextWrapping="Wrap" />
+                        Orientation="Horizontal"
-        <TextBlock
+                        VerticalAlignment="Center"
-            Grid.Row="2"
+                        HorizontalAlignment="Stretch">
-            Grid.Column="0"
+                <TextBlock
-            MaxWidth="500"
+                    MaxWidth="500"
-            Margin="140,15,20,5"
+                    Margin="0,8,5,0"
-            HorizontalAlignment="Center"
+                    LineHeight="30"
-            VerticalAlignment="Center"
+                    Text="{ext:Locale BuildId}"
-            LineHeight="30"
+                    TextAlignment="Center"
-            Text="{ext:Locale BuildId}"
+                    TextWrapping="Wrap" />
-            TextAlignment="Center"
+                <TextBox
-            TextWrapping="Wrap" />
+                    Margin="0,0,0,0"
-        <TextBox
+                    MinWidth="135"
-            Grid.Row="2"
+                    Text="{Binding BuildId}"
-            Grid.Column="1"
+                    IsReadOnly="True" />
-            Margin="0,5,110,5"
+            </StackPanel>
-            MinWidth="160"
+            <TextBlock
-            HorizontalAlignment="Center"
+                Grid.Row="1"
-            VerticalAlignment="Center"
+                Grid.Column="0"
-            Text="{Binding BuildId}"
+                Grid.ColumnSpan="4"
-            IsReadOnly="True" />
+                MaxWidth="500"
+                Margin="0,10,0,5"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                LineHeight="18"
+                Text="{Binding Heading}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+
+        </Grid>
+        <Grid Name="NormalHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,*">
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                MaxWidth="500"
+                Margin="20,15,20,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                LineHeight="18"
+                Text="{Binding Heading}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                MaxWidth="500"
+                Margin="140,15,20,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                LineHeight="30"
+                Text="{ext:Locale BuildId}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+            <TextBox
+                Grid.Row="2"
+                Grid.Column="1"
+                Margin="0,5,110,5"
+                MinWidth="160"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="{Binding BuildId}"
+                IsReadOnly="True" />
+        </Grid>
         <Border
             Grid.Row="3"
             Grid.Column="0"

src/Ryujinx/UI/Windows/CheatWindow.axaml.cs

@@ -4,6 +4,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;
@@ -32,7 +33,7 @@ namespace Ryujinx.Ava.UI.Windows
             Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
         {
             MinWidth = 500;
             MinHeight = 650;
@@ -44,6 +45,9 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
+            FlushHeader.IsVisible = !ConfigurationState.Instance.ShowOldUI;
+            NormalHeader.IsVisible = ConfigurationState.Instance.ShowOldUI;
+
             string modsBasePath = ModLoader.GetModsBasePath();
             string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, titleId);
             ulong titleIdValue = ulong.Parse(titleId, NumberStyles.HexNumber);

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml

@@ -7,6 +7,7 @@
              xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
              xmlns:systems="clr-namespace:Ryujinx.Ava.Systems"
              xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
+             xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
              CanResize="False"
              mc:Ignorable="d"
              MinWidth="800"
@@ -18,11 +19,10 @@
     </window:StyleableAppWindow.DataContext>
     <Grid RowDefinitions="Auto,*">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto" Name="FlushControls">
-            <Image
+            <controls:RyujinxLogo 
-                Name="RyuLogo"
+                Grid.Column="0"
                 Margin="15, 0, 7, 0"
-                Height="25"
+                ToolTip.Tip="{ext:WindowTitle CompatibilityListTitle, False}"/>
-                Width="25" />
             <TextBox Name="SearchBoxFlush" Grid.Column="1" Margin="0, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
             <CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
             <TextBlock Grid.Column="3" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs

@@ -21,17 +21,14 @@ namespace Ryujinx.Ava.UI.Windows
                 SearchBoxNormal = { Text = titleId ?? string.Empty }
             });
 
-        public CompatibilityListWindow() : base(useCustomTitleBar: true)
+        public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
         {
             Title = RyujinxApp.FormatTitle(LocaleKeys.CompatibilityListTitle);
             
-            TitleBar.Height = 37;
-            
             InitializeComponent();
-
+            
-            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowTitleBar;
         }
 
         // ReSharper disable once UnusedMember.Local

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -97,7 +97,7 @@ namespace Ryujinx.Ava.UI.Windows
             TitleBar.Height = MenuBarHeight;
             
             // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
+            TitleBarHeight = (ConfigurationState.Instance.ShowOldUI ? TitleBar.Height : 0);
 
             ApplicationList.DataContext = DataContext;
             ApplicationGrid.DataContext = DataContext;

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -11,10 +11,11 @@
     xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     Width="1100"
-    Height="927"
     MinWidth="800"
     MinHeight="480"
+    Title="{ext:WindowTitle Settings}"
     WindowStartupLocation="CenterOwner"
     x:DataType="viewModels:SettingsViewModel"
     mc:Ignorable="d"
@@ -22,13 +23,20 @@
     <Design.DataContext>
         <viewModels:SettingsViewModel />
     </Design.DataContext>
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,Auto,*,Auto">
+        <StackPanel Grid.Row="0" Orientation="Horizontal">
+            <controls:RyujinxLogo
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="7, 7, 7, 0"
+                ToolTip.Tip="{ext:WindowTitle Settings}"/>
+        </StackPanel>
         <ContentPresenter
             x:Name="ContentPresenter"
-            Grid.Row="1"
+            Grid.Row="2"
             IsVisible="False"
             KeyboardNavigation.IsTabStop="False"/>
-        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
+        <Grid Name="Pages" IsVisible="False" Grid.Row="3">
             <settings:SettingsUiView Name="UiPage" />
             <settings:SettingsInputView Name="InputPage" />
             <settings:SettingsHotkeysView Name="HotkeysPage" />
@@ -41,12 +49,11 @@
             <settings:SettingsHacksView Name="HacksPage" />
         </Grid>
         <ui:NavigationView
-            Grid.Row="1"
+            Grid.Row="2"
             IsSettingsVisible="False"
             Name="NavPanel"
             IsBackEnabled="False"
-            PaneDisplayMode="Left"
+            Margin="10,10,10,0"
-            Margin="2,10,10,0"
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             OpenPaneLength="200">
@@ -108,7 +115,7 @@
                 </Style>
             </ui:NavigationView.Styles>
         </ui:NavigationView>
-        <Grid Grid.Row="2"
+        <Grid Grid.Row="3"
               ColumnDefinitions="Auto,*,Auto">
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <Button

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.Input;
@@ -13,7 +14,7 @@ namespace Ryujinx.Ava.UI.Windows
     {
         internal readonly SettingsViewModel ViewModel;
 
-        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
+        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : base(true)
         {
             Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
 
@@ -23,6 +24,16 @@ namespace Ryujinx.Ava.UI.Windows
             ViewModel.SaveSettingsEvent += SaveSettings;
 
             InitializeComponent();
+
+            NavPanel.PaneDisplayMode =
+                ConfigurationState.Instance.ShowOldUI
+                    ? NavigationViewPaneDisplayMode.Left
+                    : NavigationViewPaneDisplayMode.Top;
+
+            Height = ConfigurationState.Instance.ShowOldUI
+                ? 927
+                : 993; // nav panel is put on top with custom title bar so account for new height
+            
             Load();
         }
 

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -7,6 +7,7 @@ using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;
 
@@ -22,7 +23,7 @@ namespace Ryujinx.Ava.UI.Windows
             await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
         }
         
-        protected StyleableAppWindow(bool useCustomTitleBar = false)
+        protected StyleableAppWindow(bool useCustomTitleBar = false, double? titleBarHeight = null)
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner;
             TransparencyLevelHint = [WindowTransparencyLevel.None];
@@ -32,11 +33,14 @@ namespace Ryujinx.Ava.UI.Windows
 
             if (useCustomTitleBar)
             {
-                TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
+                TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
-                TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowTitleBar ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
+                TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowOldUI ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
+                
+                if (TitleBar.ExtendsContentIntoTitleBar && titleBarHeight != null)
+                    TitleBar.Height = titleBarHeight.Value;
             }
 
-            Icon = MainWindowViewModel.IconBitmap;
+            Icon = RyujinxLogo.Bitmap;
         }
 
         private void LocaleChanged()
@@ -70,7 +74,7 @@ namespace Ryujinx.Ava.UI.Windows
             LocaleManager.Instance.LocaleChanged += LocaleChanged;
             LocaleChanged();
 
-            Icon = new WindowIcon(MainWindowViewModel.IconBitmap);
+            Icon = new WindowIcon(RyujinxLogo.Bitmap);
         }
 
         private void LocaleChanged()