fix super mario galaxy 0x25E00040 error (ryubing/ryujinx!155)

See merge request ryubing/ryujinx!155

docs/compatibility.csv

@@ -2868,8 +2868,8 @@
 0100BC0018138000,"Super Mario RPG™",gpu;audio;nvdec,ingame,2024-06-19 17:43:42
 ,"Super Mario World",homebrew,boots,2024-06-13 01:40:31
 010049900F546000,"Super Mario™ 3D All-Stars",services-horizon;slow;vulkan;amd-vendor-bug,ingame,2024-05-07 02:38:16
-010099C022B96000,"Super Mario Galaxy",slow;vulkan;amd-vendor-bug,ingame,2025-10-01 15:30:00
-0100FD8022DAA000,"Super Mario Galaxy 2",slow;vulkan;amd-vendor-bug,ingame,2025-10-01 15:30:00
+010099C022B96000,"Super Mario Galaxy",slow;vulkan;amd-vendor-bug;vulkan-vendor-bug,ingame,2025-10-01 15:30:00
+0100FD8022DAA000,"Super Mario Galaxy 2",slow;vulkan;amd-vendor-bug;vulkan-vendor-bug;deadlock,ingame,2025-10-04 18:50:00
 010028600EBDA000,"Super Mario™ 3D World + Bowser’s Fury",ldn-works,playable,2024-07-31 10:45:37
 01004F8006A78000,"Super Meat Boy",services,playable,2020-04-02 23:10:07
 01009C200D60E000,"Super Meat Boy Forever",gpu,boots,2021-04-26 14:25:39

src/Ryujinx.Common/TitleIDs.cs

@@ -83,8 +83,8 @@ namespace Ryujinx.Common
             "010049900F546002", // Super Mario Sunshine
             "0100a3900c3e2000", // Paper Mario: The Origami King
             "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
-            "010099C022B96000", // Super Mario Galaxy
-            "0100FD8022DAA000", // Super Mario Galaxy 2
+            "01009cC022b96000", // Super Mario Galaxy
+            "0100fd8022daa000", // Super Mario Galaxy 2
 
                           //Pikmin Franchise
             "0100aa80194b0000", // Pikmin 1

src/Ryujinx.Graphics.GAL/Format.cs

@@ -149,6 +149,7 @@ namespace Ryujinx.Graphics.GAL
         B8G8R8A8Srgb,
         B10G10R10A2Unorm,
         X8UintD24Unorm,
+        A8B8G8R8Uint,
     }
 
     public static class FormatExtensions

src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs

@@ -359,6 +359,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             A2B10G10R10Sint     = (A2B10G10R10 << 21)  | (Sint << 27),    // 0x1e000000
             A2B10G10R10Uscaled  = (A2B10G10R10 << 21)  | (Uscaled << 27), // 0x2e000000
             A2B10G10R10Sscaled  = (A2B10G10R10 << 21)  | (Sscaled << 27), // 0x36000000
+            A8B8G8R8Uint        = (A8B8G8R8 << 21)     | (Uint << 27),    // 0x25E00040
         }
 
         private static readonly Dictionary<TextureFormat, FormatInfo> _textureFormats = new()
@@ -554,6 +555,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             { VertexAttributeFormat.A2B10G10R10Sint,     Format.R10G10B10A2Sint     },
             { VertexAttributeFormat.A2B10G10R10Uscaled,  Format.R10G10B10A2Uscaled  },
             { VertexAttributeFormat.A2B10G10R10Sscaled,  Format.R10G10B10A2Sscaled  },
+            { VertexAttributeFormat.A8B8G8R8Uint,        Format.A8B8G8R8Uint        },
         };
 #pragma warning restore IDE0055
 

src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs

@@ -211,6 +211,9 @@ namespace Ryujinx.Graphics.Vulkan
                     case Format.R16G16B16Uint:
                         format = VkFormat.R16G16B16A16Uint;
                         break;
+                    case Format.A8B8G8R8Uint:
+                        format = VkFormat.A8B8G8R8UintPack32;
+                        break;
                     default:
                         Logger.Error?.Print(LogClass.Gpu, $"Format {srcFormat} is not supported by the host.");
                         break;

src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs

@@ -160,7 +160,7 @@ namespace Ryujinx.Graphics.Vulkan
         private static bool HasPushDescriptorsBug(VulkanRenderer gd)
         {
             // Those GPUs/drivers do not work properly with push descriptors, so we must force disable them.
-            return gd.IsNvidiaPreTuring || (gd.IsIntelArc && gd.IsIntelWindows);
+            return gd.IsNvidiaPreTuring || (gd.IsIntelArc && (gd.IsIntelWindows || gd.IsIntelLinux));
         }
 
         private static bool CanUsePushDescriptors(VulkanRenderer gd, ResourceLayout layout, bool isCompute)

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -91,6 +91,7 @@ namespace Ryujinx.Graphics.Vulkan
         internal Vendor Vendor { get; private set; }
         internal bool IsAmdWindows { get; private set; }
         internal bool IsIntelWindows { get; private set; }
+        internal bool IsIntelLinux { get; private set; }
         internal bool IsAmdGcn { get; private set; }
         internal bool IsAmdRdna3 { get; private set; }
         internal bool IsNvidiaPreTuring { get; private set; }
@@ -359,6 +360,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             IsAmdWindows = Vendor == Vendor.Amd && OperatingSystem.IsWindows();
             IsIntelWindows = Vendor == Vendor.Intel && OperatingSystem.IsWindows();
+            IsIntelLinux = Vendor == Vendor.Intel && OperatingSystem.IsLinux();
             IsTBDR =
                 Vendor is Vendor.Apple or
                 Vendor.Qualcomm or
@@ -398,7 +400,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
             else if (Vendor == Vendor.Intel)
             {
-                IsIntelArc = GpuRenderer.StartsWith("Intel(R) Arc(TM)");
+                IsIntelArc = GpuRenderer.StartsWithIgnoreCase("Intel(R) Arc(TM)");
             }
 
             IsQualcommProprietary = hasDriverProperties && driverProperties.DriverID == DriverId.QualcommProprietary;

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -19,6 +19,7 @@
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
             <Color x:Key="Warning">#800080</Color>
+            <Color x:Key="CustomConfig">#00B5B8</Color>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -38,6 +39,7 @@
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
             <Color x:Key="Warning">#800080</Color>
+            <Color x:Key="CustomConfig">#00B5B8</Color>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -57,6 +59,7 @@
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
             <Color x:Key="Warning">#FFA500</Color>
+            <Color x:Key="CustomConfig">#00B5B8</Color>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>

src/Ryujinx/Systems/Updater/Updater.cs

@@ -101,8 +101,8 @@ namespace Ryujinx.Ava.Systems
             await Dispatcher.UIThread.InvokeAsync(async () =>
             {
                 string newVersionString = ReleaseInformation.IsCanaryBuild
-                    ? $"Canary {currentVersion} -> Canary {newVersion}"
-                    : $"{currentVersion} -> {newVersion}";
+                    ? $"Canary {currentVersion} → Canary {newVersion}"
+                    : $"{currentVersion} → {newVersion}";
 
                 Logger.Info?.Print(LogClass.Application, $"Version found: {newVersionString}");
 

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -114,16 +114,20 @@
             Header="{ext:Locale GameListContextMenuCacheManagementPurgePptc}"
             Icon="{ext:Icon fa-solid fa-arrow-rotate-right}"
             ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
+        <Separator/>
         <MenuItem
             Command="{Binding NukePtcCache}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementNukePptc}"
-            Icon="{ext:Icon fa-solid fa-trash-can}" />
+            Icon="{ext:Icon fa-solid fa-trash-can}"
+            IsEnabled="{Binding HasPtcCacheFiles}" />
         <MenuItem
             Command="{Binding PurgeShaderCache}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
-            Icon="{ext:Icon fa-solid fa-trash-can}" />
+            Icon="{ext:Icon fa-solid fa-trash-can}"
+            IsEnabled="{Binding HasShaderCacheFiles}" />
+        <Separator/>
         <MenuItem
             Command="{Binding OpenPtcDirectory}"
             CommandParameter="{Binding}"

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -354,8 +354,8 @@ namespace Ryujinx.Ava.UI.Helpers
                 primary,
                 secondaryText,
                 LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
                 LocaleManager.Instance[LocaleKeys.InputDialogNo],
+                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
                 (int)Symbol.Help,
                 UserResult.Yes);
 

src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs

@@ -14,6 +14,8 @@ namespace Ryujinx.Ava.UI.Helpers
             { Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
+            { Glyph.Device, char.ConvertFromUtf32(0xE7F7) },
+            { Glyph.Bug, char.ConvertFromUtf32(0xEBE8) },
             { Glyph.Important, char.ConvertFromUtf32((int)Symbol.Important) },
         };
 

src/Ryujinx/UI/Helpers/Glyph.cs

@@ -5,6 +5,8 @@ namespace Ryujinx.Ava.UI.Helpers
         List,
         Grid,
         Chip,
+        Device,
+        Bug,
         Important,
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1897,7 +1897,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     secondaryText,
                     LocaleManager.Instance[LocaleKeys.Continue],
                     LocaleManager.Instance[LocaleKeys.Cancel],
-                    LocaleManager.Instance[LocaleKeys.TrimXCIFileDialogTitle]
+                    LocaleManager.Instance[LocaleKeys.GameListContextMenuTrimXCI]
                 );
 
                 if (result == UserResult.Yes)
@@ -2121,7 +2121,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 });
 
         public static AsyncRelayCommand<MainWindowViewModel> NukePtcCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null &&
+                vm.HasPtcCacheFiles(),
                 async viewModel =>
                 {
                     UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
@@ -2170,8 +2171,22 @@ namespace Ryujinx.Ava.UI.ViewModels
                     }
                 });
 
+        private bool HasPtcCacheFiles()
+        {
+        if (this.SelectedApplication == null) return false;
+
+        DirectoryInfo mainDir = new DirectoryInfo(Path.Combine(AppDataManager.GamesDirPath,
+            this.SelectedApplication.IdString, "cache", "cpu", "0"));
+        DirectoryInfo backupDir = new DirectoryInfo(Path.Combine(AppDataManager.GamesDirPath,
+            this.SelectedApplication.IdString, "cache", "cpu", "1"));
+
+        return (mainDir.Exists && (mainDir.EnumerateFiles("*.cache").Any() || mainDir.EnumerateFiles("*.info").Any())) ||
+               (backupDir.Exists && (backupDir.EnumerateFiles("*.cache").Any() || backupDir.EnumerateFiles("*.info").Any()));
+        }
+
         public static AsyncRelayCommand<MainWindowViewModel> PurgeShaderCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+            Commands.CreateConditional<MainWindowViewModel>(
+                vm => vm?.SelectedApplication != null && vm.HasShaderCacheFiles(),
                 async viewModel =>
                 {
                     UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
@@ -2228,6 +2243,20 @@ namespace Ryujinx.Ava.UI.ViewModels
                     }
                 });
 
+        private bool HasShaderCacheFiles()
+        {
+        if (this.SelectedApplication == null) return false;
+
+        DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath,
+            this.SelectedApplication.IdString, "cache", "shader"));
+
+        if (!shaderCacheDir.Exists) return false;
+
+        return shaderCacheDir.EnumerateDirectories("*").Any() || 
+            shaderCacheDir.GetFiles("*.toc").Any() || 
+            shaderCacheDir.GetFiles("*.data").Any();
+        }
+
         public static RelayCommand<MainWindowViewModel> OpenPtcDirectory { get; } =
             Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel =>

src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml

@@ -27,11 +27,6 @@
                 <StackPanel 
                     Grid.Column="0"
                     Orientation="Horizontal">
-                    <TextBlock
-                        Margin="10,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{ext:Locale CommonSort}" />
                     <DropDownButton
                         Width="150"
                         HorizontalAlignment="Left"

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

@@ -235,11 +235,6 @@
                     Name="AboutWindowMenuItem"
                     Header="{ext:Locale MenuBarHelpAbout}"
                     Icon="{ext:Icon fa-solid fa-circle-info}" />
-                <MenuItem
-                    Name="UpdateMenuItem"
-                    IsEnabled="{Binding CanUpdate}"
-                    Header="{ext:Locale MenuBarHelpCheckForUpdates}"
-                    Icon="{ext:Icon fa-solid fa-rotate}" />
                 <MenuItem
                     Name="CompatibilityListMenuItem"
                     Header="{ext:Locale CompatibilityListOpen}"
@@ -255,21 +250,24 @@
                         Name="SetupGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpSetup}"
                         Icon="{ext:Icon fa-brands fa-gitlab}"
-                        CommandParameter="{x:Static common:SharedConstants.SetupGuideWikiUrl}"
-                        ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
+                        CommandParameter="{x:Static common:SharedConstants.SetupGuideWikiUrl}" />
                     <MenuItem
                         Name="LdnGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpMultiplayer}"
                         Icon="{ext:Icon fa-brands fa-gitlab}"
-                        CommandParameter="{x:Static common:SharedConstants.MultiplayerWikiUrl}"
-                        ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
+                        CommandParameter="{x:Static common:SharedConstants.MultiplayerWikiUrl}" />
                     <MenuItem
                         Name="FaqMenuItem"
                         Header="{ext:Locale MenuBarHelpFaq}"
                         Icon="{ext:Icon fa-brands fa-gitlab}"
-                        CommandParameter="{x:Static common:SharedConstants.FaqWikiUrl}"
-                        ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
+                        CommandParameter="{x:Static common:SharedConstants.FaqWikiUrl}" />
                 </MenuItem>
+                <Separator />
+                <MenuItem
+                    Name="UpdateMenuItem"
+                    IsEnabled="{Binding CanUpdate}"
+                    Header="{ext:Locale MenuBarHelpCheckForUpdates}"
+                    Icon="{ext:Icon fa-solid fa-rotate}" />
             </MenuItem>
         </Menu>
     </DockPanel>

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

@@ -46,10 +46,6 @@
                 FontFamily="avares://FluentAvalonia/Fonts#Symbols"
                 Glyph="{helpers:GlyphValueConverter Grid}" />
         </Button>
-        <TextBlock
-            Margin="10,0,5,0"
-            VerticalAlignment="Center"
-            Text="{ext:Locale IconSize}" />
         <controls:SliderScroll
             Width="150"
             Height="35"
@@ -171,11 +167,5 @@
                 </Flyout>
             </DropDownButton.Flyout>
         </DropDownButton>
-        <TextBlock
-            Margin="10,0"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Center"
-            DockPanel.Dock="Right"
-            Text="{ext:Locale CommonSort}" />
     </DockPanel>
 </UserControl>

src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml

@@ -35,7 +35,7 @@
             <ListBox.Styles>
                 <Style Selector="ListBoxItem">
                     <Setter Property="Margin" Value="5" />
-                    <Setter Property="CornerRadius" Value="4" />
+                    <Setter Property="CornerRadius" Value="15" />
                 </Style>
                 <Style Selector="ListBoxItem:selected /template/ Rectangle#SelectionIndicator">
                     <Setter Property="MinHeight" Value="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).GridItemSelectorSize}" />
@@ -53,7 +53,7 @@
                             Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
                             Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
                             ClipToBounds="True"
-                            CornerRadius="4">
+                            CornerRadius="12.5">
                             <Grid RowDefinitions="Auto,Auto">
                                 <Image
                                     Grid.Row="0"
@@ -72,42 +72,26 @@
                                             Text="{Binding Name}"
                                             TextAlignment="Center"
                                             TextWrapping="Wrap" />
-                                        <TextBlock
-                                            IsVisible="{Binding HasIndependentConfiguration}"
-                                            Text="{ext:Locale GameSpecificConfigurationHeader}"
-                                            TextAlignment="Center"
-                                            TextWrapping="Wrap"
-                                            Foreground="{DynamicResource Warning}" />
                                     </StackPanel>
                                 </Panel>
                             </Grid>
                         </Border>
                         <ui:SymbolIcon
-                            Margin="5,5,0,0"
+                            Margin="2.5,2.5,0,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            FontSize="18"
+                            FontSize="23"
                             Foreground="{DynamicResource FavoriteApplicationIconColor}"
                             IsVisible="{Binding Favorite}"
                             Symbol="StarFilled" />
-                        <Grid IsVisible="{Binding !$parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                            <Border
-                                Margin="15,35,5,15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Bottom"
-                                Width="90"
-                                Height="20"
-                                CornerRadius="4"
-                                IsVisible="{Binding HasIndependentConfiguration}"
-                                Background="{DynamicResource ThemeContentBackgroundColor}">
-                                <TextBlock
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{ext:Locale GameSpecificConfigurationHeader}"
-                                    TextAlignment="Center"
-                                    TextWrapping="Wrap" />
-                            </Border>
-                        </Grid>
+                        <ui:SymbolIcon
+                            Margin="0,2.5,2.5,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            FontSize="23"
+                            Foreground="{DynamicResource CustomConfig}"
+                            IsVisible="{Binding HasIndependentConfiguration}"
+                            Symbol="SettingsFilled" />
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>

src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml

@@ -34,6 +34,9 @@
                 </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
             <ListBox.Styles>
+                <Style Selector="ListBoxItem">
+                    <Setter Property="CornerRadius" Value="15" />
+                </Style>
                 <Style Selector="ListBoxItem:selected /template/ Rectangle#SelectionIndicator">
                     <Setter Property="MinHeight" Value="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ListItemSelectorSize}" />
                 </Style>
@@ -46,9 +49,11 @@
                             Padding="10"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            ClipToBounds="True"
-                            CornerRadius="5">
+                            ClipToBounds="True">
                             <Grid ColumnDefinitions="Auto,10,*,150,100">
+                                <Border
+                                    ClipToBounds="True"
+                                    CornerRadius="7">
                                 <Image
                                     Grid.RowSpan="3"
                                     Grid.Column="0"
@@ -58,6 +63,8 @@
                                     Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
                                     Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
                                     Source="{Binding Icon, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
+                                </Border>
+
                                 <Border
                                     Grid.Column="2"
                                     Margin="0,0,5,0"
@@ -91,7 +98,7 @@
                                             IsVisible="{Binding HasPlayabilityInfo}"
                                             Background="{DynamicResource AppListBackgroundColor}"
                                             Margin="-1, 0, 0, 0"
-                                            Padding="0">
+                                            Padding="1.5">
                                             <ToolTip.Tip>
                                                 <StackPanel Orientation="Vertical">
                                                     <TextBlock 
@@ -175,7 +182,7 @@
                                         Text="{ext:Locale GameSpecificConfigurationHeader}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"
-                                        Foreground="{DynamicResource Warning}" />
+                                        Foreground="{DynamicResource CustomConfig}" />
                                 </StackPanel>
                                 <StackPanel
                                     Grid.Column="4"
@@ -203,13 +210,23 @@
                                 <ui:SymbolIcon
                                     Grid.Row="0"
                                     Grid.Column="0"
-                                    Margin="-5,-5,0,0"
+                                    Margin="-7.5,-7.5,0,0"
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Top"
-                                    FontSize="16"
+                                    FontSize="18"
                                     Foreground="{DynamicResource FavoriteApplicationIconColor}"
                                     IsVisible="{Binding Favorite}"
                                     Symbol="StarFilled" />
+                                <ui:SymbolIcon
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="0,-7.5,-7.5,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    FontSize="18"
+                                    Foreground="{DynamicResource CustomConfig}"
+                                    IsVisible="{Binding HasIndependentConfiguration}"
+                                    Symbol="SettingsFilled" />
                             </Grid>
                         </Border>
                     </Grid>

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

@@ -27,13 +27,6 @@
                     Spacing="10">
                     <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
                     <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center"
-                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
-                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                            </StackPanel>
-                        </CheckBox>
                         <CheckBox
                             IsEnabled="{Binding !IsGameTitleNotNull}"
                             Opacity="{Binding PanelOpacity}"
@@ -62,6 +55,13 @@
                                 <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                             </StackPanel>
                         </CheckBox>
+                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                            </StackPanel>
+                        </CheckBox>
                         <StackPanel
                             Margin="0, 15, 0, 0"
                             Orientation="Horizontal">
@@ -101,7 +101,7 @@
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
+                                    <TextBlock Text="{ext:Locale CommonOff}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock
@@ -123,7 +123,7 @@
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
+                                    <TextBlock Text="{ext:Locale Never}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
@@ -146,7 +146,7 @@
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
+                                    <TextBlock Text="{ext:Locale CommonAuto}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
@@ -198,14 +198,13 @@
                             <TextBox
                                 Name="GameDirPathBox"
                                 Margin="0"
-                                ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
+                                Watermark="{ext:Locale AddGameDirBoxTooltip}"
                                 VerticalAlignment="Stretch" />
                             <Button
                                 Name="AddGameDirButton"
                                 Grid.Column="1"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
+                                Margin="10,0,0,0">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralAdd}" />
                             </Button>
@@ -213,8 +212,7 @@
                                 Name="RemoveGameDirButton"
                                 Grid.Column="2"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
+                                Margin="5,0,0,0"
                                 Click="RemoveGameDirButton_OnClick">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralRemove}" />
@@ -252,14 +250,13 @@
                             <TextBox
                                 Name="AutoloadDirPathBox"
                                 Margin="0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
+                                Watermark="{ext:Locale AddGameDirBoxTooltip}"
                                 VerticalAlignment="Stretch" />
                             <Button
                                 Name="AddAutoloadDirButton"
                                 Grid.Column="1"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
+                                Margin="10,0,0,0">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralAdd}" />
                             </Button>
@@ -267,8 +264,7 @@
                                 Name="RemoveAutoloadDirButton"
                                 Grid.Column="2"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
+                                Margin="5,0,0,0"
                                 Click="RemoveAutoloadDirButton_OnClick">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralRemove}" />

src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml

@@ -28,7 +28,6 @@
                 Orientation="Horizontal"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
-                <Label Content="{ext:Locale CommonSort}" VerticalAlignment="Center" />
                 <ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
                     <ComboBoxItem>
                         <Label

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml

@@ -32,12 +32,6 @@
                      Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" 
                      TextChanged="TextBox_OnTextChanged"/>
             <StackPanel Grid.Column="2" Orientation="Horizontal"  Margin="10, 5, 0, 5">
-                <TextBlock
-                        Margin="10,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Right"
-                        Text="{ext:Locale CommonSort}" />
                 <DropDownButton
                         Width="150"
                         HorizontalAlignment="Right"
@@ -102,12 +96,6 @@
         <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto,Auto" Name="NormalControls">
             <TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
             <StackPanel Grid.Column="1" Orientation="Horizontal"  Margin="10, 5, 5, 5">
-                <TextBlock
-                    Margin="10,0"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right"
-                    Text="{ext:Locale CommonSort}" />
                 <DropDownButton
                     Width="150"
                     HorizontalAlignment="Right"

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -39,11 +39,11 @@
         <Grid Name="Pages" IsVisible="False" Grid.Row="3">
             <settings:SettingsUiView Name="UiPage" />
             <settings:SettingsInputView Name="InputPage" />
-            <settings:SettingsHotkeysView Name="HotkeysPage" />
             <settings:SettingsSystemView Name="SystemPage" />
             <settings:SettingsCPUView Name="CpuPage" />
             <settings:SettingsGraphicsView Name="GraphicsPage" />
             <settings:SettingsAudioView Name="AudioPage" />
+            <settings:SettingsHotkeysView Name="HotkeysPage" />
             <settings:SettingsNetworkView Name="NetworkPage" />
             <settings:SettingsLoggingView Name="LoggingPage" />
             <settings:SettingsDebugView Name="DebugPage" />
@@ -54,7 +54,7 @@
             IsSettingsVisible="False"
             Name="NavPanel"
             IsBackEnabled="False"
-            Margin="10,10,10,0"
+            Margin="10,0,10,0"
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             OpenPaneLength="200">
@@ -62,16 +62,17 @@
                 <ui:NavigationViewItem
                     IsSelected="True"
                     Content="{ext:Locale SettingsTabGeneral}"
-                    Tag="UiPage"
-                    IconSource="New" />
+                    Tag="UiPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Device}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabInput}"
                     Tag="InputPage"
                     IconSource="Games" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabHotkeys}"
-                    Tag="HotkeysPage"
-                    IconSource="Keyboard" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabSystem}"
                     Tag="SystemPage"
@@ -93,6 +94,10 @@
                     Content="{ext:Locale SettingsTabAudio}"
                     IconSource="Audio"
                     Tag="AudioPage" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabHotkeys}"
+                    Tag="HotkeysPage"
+                    IconSource="Keyboard" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabNetwork}"
                     Tag="NetworkPage"
@@ -103,8 +108,13 @@
                     IconSource="Document" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabDebug}"
-                    Tag="DebugPage"
-                    IconSource="Star" />
+                    Tag="DebugPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Bug}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
                 <ui:NavigationViewItem
                     IsVisible="{Binding ShowDirtyHacks}"
                     Content="Dirty Hacks"