UI: Remove title bar, put icon next to File button. Added icons to most dropdown menu actions. Title bar content is now displayed when hovering the logo in the title bar.

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -3,24 +3,29 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:icon="clr-namespace:Ryujinx.Ava.Common.Icon"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel">
-	<MenuItem
+    <MenuItem
         Click="RunApplication_Click"
-        Header="{locale:Locale GameListContextMenuRunApplication}" />
+        Header="{locale:Locale GameListContextMenuRunApplication}"
+        Icon="{icon:Icon fa-solid fa-play}"/>
     <MenuItem
         Click="ToggleFavorite_Click"
         Header="{locale:Locale GameListContextMenuToggleFavorite}"
+        Icon="{icon:Icon fa-solid fa-star}"
         ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
-	<MenuItem
-		Click="CreateApplicationShortcut_Click"
-		Header="{locale:Locale GameListContextMenuCreateShortcut}"
+    <MenuItem
+        Click="CreateApplicationShortcut_Click"
+        Header="{locale:Locale GameListContextMenuCreateShortcut}"
         IsEnabled="{Binding CreateShortcutEnabled}"
-		ToolTip.Tip="{OnPlatform Default={locale:Locale GameListContextMenuCreateShortcutToolTip}, macOS={locale:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
+        Icon="{icon:Icon fa-solid fa-bookmark}"
+        ToolTip.Tip="{OnPlatform Default={locale:Locale GameListContextMenuCreateShortcutToolTip}, macOS={locale:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <Separator />
     <MenuItem
         Click="OpenUserSaveDirectory_Click"
         Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
+        Icon="{icon:Icon mdi-folder-account}"
         IsEnabled="{Binding OpenUserSaveDirectoryEnabled}"
         ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
     <MenuItem
@@ -37,45 +42,55 @@
     <MenuItem
         Click="OpenTitleUpdateManager_Click"
         Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
+        Icon="{icon:Icon fa-solid fa-code-compare}"
         ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
     <MenuItem
         Click="OpenDownloadableContentManager_Click"
         Header="{locale:Locale GameListContextMenuManageDlc}"
+        Icon="{icon:Icon fa-solid fa-download}"
         ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
     <MenuItem
         Click="OpenCheatManager_Click"
         Header="{locale:Locale GameListContextMenuManageCheat}"
+        Icon="{icon:Icon fa-solid fa-code}"
         ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
     <MenuItem
         Click="OpenModManager_Click"
         Header="{locale:Locale GameListContextMenuManageMod}"
+        Icon="{icon:Icon mdi-view-module}"
         ToolTip.Tip="{locale:Locale GameListContextMenuManageModToolTip}" />
     <Separator />
     <MenuItem
         Click="OpenModsDirectory_Click"
         Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
+        Icon="{icon:Icon mdi-folder-file}"
         ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
     <MenuItem
         Click="OpenSdModsDirectory_Click"
         Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
+        Icon="{icon:Icon mdi-folder-file}"
         ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
     <Separator />
-    <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
+    <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}" Icon="{icon:Icon mdi-cached}">
         <MenuItem
             Click="PurgePtcCache_Click"
             Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
+            Icon="{icon:Icon mdi-refresh}"
             ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
         <MenuItem
             Click="PurgeShaderCache_Click"
             Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
+            Icon="{icon:Icon mdi-delete-alert}"
             ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
         <MenuItem
             Click="OpenPtcDirectory_Click"
             Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
+            Icon="{icon:Icon mdi-folder-arrow-up-down}"
             ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
         <MenuItem
             Click="OpenShaderCacheDirectory_Click"
             Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
+            Icon="{icon:Icon mdi-folder-arrow-up-down}"
             ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
     </MenuItem>
     <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -13,6 +13,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.HLE.HOS;
 using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common.Helper;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -34,165 +35,132 @@ namespace Ryujinx.Ava.UI.Controls
 
         public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
 
-            if (viewModel?.SelectedApplication != null)
+            viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
+
+            ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
             {
-                viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
+                appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
+            });
 
-                ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
-                {
-                    appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
-                });
-
-                viewModel.RefreshView();
-            }
+            viewModel.RefreshView();
         }
 
         public void OpenUserSaveDirectory_Click(object sender, RoutedEventArgs args)
         {
-            if (sender is MenuItem { DataContext: MainWindowViewModel viewModel })
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 OpenSaveDirectory(viewModel, SaveDataType.Account, new UserId((ulong)viewModel.AccountManager.LastOpenedUser.UserId.High, (ulong)viewModel.AccountManager.LastOpenedUser.UserId.Low));
-            }
         }
 
         public void OpenDeviceSaveDirectory_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            OpenSaveDirectory(viewModel, SaveDataType.Device, default);
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                OpenSaveDirectory(viewModel, SaveDataType.Device, default);
         }
 
         public void OpenBcatSaveDirectory_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            OpenSaveDirectory(viewModel, SaveDataType.Bcat, default);
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                OpenSaveDirectory(viewModel, SaveDataType.Bcat, default);
         }
 
         private static void OpenSaveDirectory(MainWindowViewModel viewModel, SaveDataType saveDataType, UserId userId)
         {
-            if (viewModel?.SelectedApplication != null)
-            {
-                var saveDataFilter = SaveDataFilter.Make(viewModel.SelectedApplication.Id, saveDataType, userId, saveDataId: default, index: default);
+            var saveDataFilter = SaveDataFilter.Make(viewModel.SelectedApplication.Id, saveDataType, userId, saveDataId: default, index: default);
 
-                ApplicationHelper.OpenSaveDir(in saveDataFilter, viewModel.SelectedApplication.Id, viewModel.SelectedApplication.ControlHolder, viewModel.SelectedApplication.Name);
-            }
+            ApplicationHelper.OpenSaveDir(in saveDataFilter, viewModel.SelectedApplication.Id, viewModel.SelectedApplication.ControlHolder, viewModel.SelectedApplication.Name);
         }
 
         public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
-            }
         }
 
         public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
-            }
         }
 
         public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await new CheatWindow(
                     viewModel.VirtualFileSystem,
                     viewModel.SelectedApplication.IdString,
                     viewModel.SelectedApplication.Name,
-                    viewModel.SelectedApplication.Path).ShowDialog(viewModel.TopLevel as Window);
-            }
+                    viewModel.SelectedApplication.Path).ShowDialog((Window)viewModel.TopLevel);
         }
 
         public void OpenModsDirectory_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
 
-            if (viewModel?.SelectedApplication != null)
-            {
-                string modsBasePath = ModLoader.GetModsBasePath();
-                string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, viewModel.SelectedApplication.IdString);
+            string modsBasePath = ModLoader.GetModsBasePath();
+            string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, viewModel.SelectedApplication.IdString);
 
-                OpenHelper.OpenFolder(titleModsPath);
-            }
+            OpenHelper.OpenFolder(titleModsPath);
         }
 
         public void OpenSdModsDirectory_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
 
-            if (viewModel?.SelectedApplication != null)
-            {
-                string sdModsBasePath = ModLoader.GetSdModsBasePath();
-                string titleModsPath = ModLoader.GetApplicationDir(sdModsBasePath, viewModel.SelectedApplication.IdString);
+            string sdModsBasePath = ModLoader.GetSdModsBasePath();
+            string titleModsPath = ModLoader.GetApplicationDir(sdModsBasePath, viewModel.SelectedApplication.IdString);
 
-                OpenHelper.OpenFolder(titleModsPath);
-            }
+            OpenHelper.OpenFolder(titleModsPath);
         }
 
         public async void OpenModManager_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await ModManagerWindow.Show(viewModel.SelectedApplication.Id, viewModel.SelectedApplication.Name);
-            }
         }
 
         public async void PurgePtcCache_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
 
-            if (viewModel?.SelectedApplication != null)
+            UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
+                LocaleManager.Instance[LocaleKeys.DialogWarning],
+                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage, viewModel.SelectedApplication.Name)
+            );
+
+            if (result == UserResult.Yes)
             {
-                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogWarning],
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage, viewModel.SelectedApplication.Name),
-                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
+                DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
+                DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
 
-                if (result == UserResult.Yes)
+                List<FileInfo> cacheFiles = new();
+
+                if (mainDir.Exists)
                 {
-                    DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
-                    DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
+                    cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
+                }
 
-                    List<FileInfo> cacheFiles = new();
+                if (backupDir.Exists)
+                {
+                    cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
+                }
 
-                    if (mainDir.Exists)
+                if (cacheFiles.Count > 0)
+                {
+                    foreach (FileInfo file in cacheFiles)
                     {
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
-                    }
-
-                    if (backupDir.Exists)
-                    {
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                    }
-
-                    if (cacheFiles.Count > 0)
-                    {
-                        foreach (FileInfo file in cacheFiles)
+                        try
                         {
-                            try
-                            {
-                                file.Delete();
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
-                            }
+                            file.Delete();
+                        }
+                        catch (Exception ex)
+                        {
+                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
                         }
                     }
                 }
@@ -201,55 +169,51 @@ namespace Ryujinx.Ava.UI.Controls
 
         public async void PurgeShaderCache_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
 
-            if (viewModel?.SelectedApplication != null)
+            UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
+                LocaleManager.Instance[LocaleKeys.DialogWarning],
+                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage, viewModel.SelectedApplication.Name)
+            );
+
+            if (result == UserResult.Yes)
             {
-                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogWarning],
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage, viewModel.SelectedApplication.Name),
-                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
+                DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader"));
 
-                if (result == UserResult.Yes)
+                List<DirectoryInfo> oldCacheDirectories = new();
+                List<FileInfo> newCacheFiles = new();
+
+                if (shaderCacheDir.Exists)
                 {
-                    DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader"));
+                    oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
+                    newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
+                    newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
+                }
 
-                    List<DirectoryInfo> oldCacheDirectories = new();
-                    List<FileInfo> newCacheFiles = new();
-
-                    if (shaderCacheDir.Exists)
+                if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0))
+                {
+                    foreach (DirectoryInfo directory in oldCacheDirectories)
                     {
-                        oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
-                        newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
-                        newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
+                        try
+                        {
+                            directory.Delete(true);
+                        }
+                        catch (Exception ex)
+                        {
+                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, ex));
+                        }
                     }
 
-                    if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0))
+                    foreach (FileInfo file in newCacheFiles)
                     {
-                        foreach (DirectoryInfo directory in oldCacheDirectories)
+                        try
                         {
-                            try
-                            {
-                                directory.Delete(true);
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, ex));
-                            }
+                            file.Delete();
                         }
-
-                        foreach (FileInfo file in newCacheFiles)
+                        catch (Exception ex)
                         {
-                            try
-                            {
-                                file.Delete();
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.ShaderCachePurgeError, file.Name, ex));
-                            }
+                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.ShaderCachePurgeError, file.Name, ex));
                         }
                     }
                 }
@@ -258,30 +222,26 @@ namespace Ryujinx.Ava.UI.Controls
 
         public void OpenPtcDirectory_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
+            
+            string ptcDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu");
+            string mainDir = Path.Combine(ptcDir, "0");
+            string backupDir = Path.Combine(ptcDir, "1");
 
-            if (viewModel?.SelectedApplication != null)
+            if (!Directory.Exists(ptcDir))
             {
-                string ptcDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu");
-                string mainDir = Path.Combine(ptcDir, "0");
-                string backupDir = Path.Combine(ptcDir, "1");
-
-                if (!Directory.Exists(ptcDir))
-                {
-                    Directory.CreateDirectory(ptcDir);
-                    Directory.CreateDirectory(mainDir);
-                    Directory.CreateDirectory(backupDir);
-                }
-
-                OpenHelper.OpenFolder(ptcDir);
+                Directory.CreateDirectory(ptcDir);
+                Directory.CreateDirectory(mainDir);
+                Directory.CreateDirectory(backupDir);
             }
+
+            OpenHelper.OpenFolder(ptcDir);
         }
 
         public void OpenShaderCacheDirectory_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
             {
                 string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader");
 
@@ -296,9 +256,7 @@ namespace Ryujinx.Ava.UI.Controls
 
         public async void ExtractApplicationExeFs_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
             {
                 await ApplicationHelper.ExtractSection(
                     viewModel.StorageProvider,
@@ -310,67 +268,60 @@ namespace Ryujinx.Ava.UI.Controls
 
         public async void ExtractApplicationRomFs_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await ApplicationHelper.ExtractSection(
                     viewModel.StorageProvider,
                     NcaSectionType.Data,
                     viewModel.SelectedApplication.Path,
                     viewModel.SelectedApplication.Name);
-            }
         }
 
         public async void ExtractApplicationLogo_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
 
-            if (viewModel?.SelectedApplication is { } selectedApp)
+            var result = await viewModel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
             {
-                var result = await viewModel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                {
-                    Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
-                    AllowMultiple = false,
-                });
+                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
+                AllowMultiple = false,
+            });
 
-                if (result.Count == 0)
-                {
-                    return;
-                }
+            if (result.Count == 0)
+                return;
 
-                ApplicationHelper.ExtractSection(
-                    result[0].Path.LocalPath,
-                    NcaSectionType.Logo,
-                    viewModel.SelectedApplication.Path,
-                    viewModel.SelectedApplication.Name);
+            ApplicationHelper.ExtractSection(
+                result[0].Path.LocalPath,
+                NcaSectionType.Logo,
+                viewModel.SelectedApplication.Path,
+                viewModel.SelectedApplication.Name);
 
-                var iconFile = await result[0].CreateFileAsync(selectedApp.IdString + ".png");
-                await using var fileStream = await iconFile.OpenWriteAsync();
+            var iconFile = await result[0].CreateFileAsync($"{viewModel.SelectedApplication.IdString}.png");
+            await using var fileStream = await iconFile.OpenWriteAsync();
 
-                fileStream.Write(selectedApp.Icon);
-            }
+            using var bitmap = SKBitmap.Decode(viewModel.SelectedApplication.Icon)
+                .Resize(new SKSizeI(512, 512), SKFilterQuality.High);
+
+            using var png = bitmap.Encode(SKEncodedImageFormat.Png, 100);
+
+            png.SaveTo(fileStream);
         }
 
         public void CreateApplicationShortcut_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
-                ApplicationData selectedApplication = viewModel.SelectedApplication;
-                ShortcutHelper.CreateAppShortcut(selectedApplication.Path, selectedApplication.Name, selectedApplication.IdString, selectedApplication.Icon);
-            }
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                ShortcutHelper.CreateAppShortcut(
+                    viewModel.SelectedApplication.Path,
+                    viewModel.SelectedApplication.Name,
+                    viewModel.SelectedApplication.IdString,
+                    viewModel.SelectedApplication.Icon
+                );
         }
 
         public async void RunApplication_Click(object sender, RoutedEventArgs args)
         {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await viewModel.LoadApplication(viewModel.SelectedApplication);
-            }
         }
     }
 }

src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs

@@ -15,37 +15,22 @@ namespace Ryujinx.Ava.UI.Controls
 
         public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
         {
-            add { AddHandler(ApplicationOpenedEvent, value); }
-            remove { RemoveHandler(ApplicationOpenedEvent, value); }
+            add => AddHandler(ApplicationOpenedEvent, value);
+            remove => RemoveHandler(ApplicationOpenedEvent, value);
         }
 
-        public ApplicationGridView()
-        {
-            InitializeComponent();
-        }
+        public ApplicationGridView() => InitializeComponent();
 
         public void GameList_DoubleTapped(object sender, TappedEventArgs args)
         {
-            if (sender is ListBox listBox)
-            {
-                if (listBox.SelectedItem is ApplicationData selected)
-                {
-                    RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
-                }
-            }
+            if (sender is ListBox { SelectedItem: ApplicationData selected })
+                RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
 
         public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
         {
-            if (sender is ListBox listBox)
-            {
-                (DataContext as MainWindowViewModel).GridSelectedApplication = listBox.SelectedItem as ApplicationData;
-            }
-        }
-
-        private void SearchBox_OnKeyUp(object sender, KeyEventArgs args)
-        {
-            (DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
+            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
+                viewModel.GridSelectedApplication = selected;
         }
     }
 }

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -109,7 +109,7 @@
                                     Spacing="5">
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding Id, StringFormat=X16}"
+                                        Text="{Binding IdString}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap" />
                                     <TextBlock
@@ -131,7 +131,7 @@
                                         TextWrapping="Wrap" />
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding LastPlayedString, Converter={helpers:LocalizedNeverConverter}}"
+                                        Text="{Binding LastPlayedString}"
                                         TextAlignment="End"
                                         TextWrapping="Wrap" />
                                     <TextBlock

src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs

@@ -15,37 +15,22 @@ namespace Ryujinx.Ava.UI.Controls
 
         public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
         {
-            add { AddHandler(ApplicationOpenedEvent, value); }
-            remove { RemoveHandler(ApplicationOpenedEvent, value); }
+            add => AddHandler(ApplicationOpenedEvent, value);
+            remove => RemoveHandler(ApplicationOpenedEvent, value);
         }
 
-        public ApplicationListView()
-        {
-            InitializeComponent();
-        }
+        public ApplicationListView() => InitializeComponent();
 
         public void GameList_DoubleTapped(object sender, TappedEventArgs args)
         {
-            if (sender is ListBox listBox)
-            {
-                if (listBox.SelectedItem is ApplicationData selected)
-                {
-                    RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
-                }
-            }
+            if (sender is ListBox { SelectedItem: ApplicationData selected })
+                RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
 
         public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
         {
-            if (sender is ListBox listBox)
-            {
-                (DataContext as MainWindowViewModel).ListSelectedApplication = listBox.SelectedItem as ApplicationData;
-            }
-        }
-
-        private void SearchBox_OnKeyUp(object sender, KeyEventArgs args)
-        {
-            (DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
+            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
+                viewModel.ListSelectedApplication = selected;
         }
     }
 }