From 1443e1a2ff8c0a31c5a74920f84654d07227a5f8 Mon Sep 17 00:00:00 2001
From: KeatonTheBot <keaton@ryujinx.app>
Date: Tue, 29 Jul 2025 18:01:11 -0500
Subject: [PATCH] UI: Update Avalonia to 11.3.2, FluentAvalonia to 2.4.0

* FluentAvalonia: Disabled NavigationView selection indicator animations due to bugged implementation in 2.1.0+, restoring previous behavior

* Avalonia: Fixed text on certain buttons being larger than normal

* Avalonia: Fixed ComboBox code inserting extra space to the left of selected items
---
 Directory.Packages.props                      |  16 +-
 src/Ryujinx/Ryujinx.csproj                    |   6 +-
 .../UI/Views/Settings/SettingsAudioView.axaml |  23 ++-
 .../UI/Views/Settings/SettingsCPUView.axaml   |  17 +-
 .../Views/Settings/SettingsGraphicsView.axaml | 159 +++++++---------
 .../Views/Settings/SettingsLoggingView.axaml  |  23 +--
 .../Views/Settings/SettingsNetworkView.axaml  |  15 +-
 .../Views/Settings/SettingsSystemView.axaml   | 175 +++++++-----------
 .../UI/Views/Settings/SettingsUIView.axaml    |  30 ++-
 .../UI/Views/User/UserEditorView.axaml        |  20 +-
 .../User/UserFirmwareAvatarSelectorView.axaml |  19 +-
 .../UI/Views/User/UserSaveManagerView.axaml   |  20 +-
 .../UI/Views/User/UserSelectorView.axaml      |  15 +-
 13 files changed, 229 insertions(+), 309 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index a9f66b99b..fb44fb14a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,18 +3,18 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia" Version="11.3.2" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.2" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.2" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.2" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.4.1.37" />
     <PackageVersion Include="DynamicData" Version="9.4.1" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
+    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build1" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index 4283aecd3..35b5d16c7 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -44,11 +44,11 @@
     <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Avalonia.Controls.DataGrid" />
     <PackageReference Include="Avalonia.Markup.Xaml.Loader" />
-    <PackageReference Include="Avalonia.Svg" />
-    <PackageReference Include="Avalonia.Svg.Skia" />
+    <PackageReference Include="Svg.Controls.Avalonia" />
+    <PackageReference Include="Svg.Controls.Skia.Avalonia" />
     <PackageReference Include="CommandLineParser" />
     <PackageReference Include="DynamicData" />
-    <PackageReference Include="FluentAvaloniaUI" />
+    <PackageReference Include="FluentAvaloniaUI.NoAnim" />
 
     <PackageReference Include="OpenTK.Core" />
     <PackageReference Include="Ryujinx.Audio.OpenAL" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" />
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
index 657e07ee7..9195edaf4 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
@@ -34,18 +34,17 @@
                     <ComboBox SelectedIndex="{Binding AudioBackend}"
                               Width="350"
                               HorizontalContentAlignment="Left">
-                        <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsOpenAlEnabled}"
+                            Content="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsSoundIoEnabled}"
+                            Content="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsSDL2Enabled}"
+                            Content="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
                     </ComboBox>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
index 48a50c9cf..4c3546fca 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -53,19 +53,14 @@
                                   HorizontalContentAlignment="Left"
                                   Width="350">
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}"
+                                Content="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}"
+                                Content="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}"
+                                Content="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
                         </ComboBox>
                     </StackPanel>
                     <CheckBox IsChecked="{Binding UseHypervisor}"
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
index 65f42aeff..8f2915dac 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
@@ -37,12 +37,12 @@
                                 HorizontalContentAlignment="Left"
                                 ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
                                 SelectedIndex="{Binding GraphicsBackendIndex}">
-                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
-                                <TextBlock Text="Vulkan" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
-                                <TextBlock Text="OpenGL" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                IsVisible="{Binding IsVulkanAvailable}"
+                                Content="Vulkan" />
+                            <ComboBoxItem
+                                IsEnabled="{Binding IsOpenGLAvailable}"
+                                Content="OpenGL" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
@@ -88,21 +88,16 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
                         </ComboBox>
                         <ui:NumberBox
                             Margin="10,0,0,0"
@@ -130,24 +125,18 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
                                       SelectedIndex="{Binding AntiAliasingEffect}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="FXAA" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaLow}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaMedium}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaHigh}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaUltra}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                <ComboBoxItem
+                                    Content="FXAA" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SmaaLow}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SmaaMedium}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SmaaHigh}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SmaaUltra}" />
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
@@ -164,18 +153,14 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
                                       SelectedIndex="{Binding ScalingFilter}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterBilinear}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterNearest}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterFsr}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterArea}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{locale:Locale GraphicsScalingFilterBilinear}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale GraphicsScalingFilterNearest}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale GraphicsScalingFilterFsr}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale GraphicsScalingFilterArea}" />
                             </ComboBox>
                             <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
                                     ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
@@ -206,23 +191,16 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
@@ -234,24 +212,18 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
@@ -269,15 +241,12 @@
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
                                   SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOn}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale CommonAuto}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale CommonOff}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale CommonOn}" />
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
index 5d22b891c..df2d05d6c 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
@@ -97,19 +97,14 @@
                                     Width="150"
                                     HorizontalContentAlignment="Left"
                                     ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
@@ -117,4 +112,4 @@
             </StackPanel>
         </Border>
     </ScrollViewer>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
index 894db57a5..bcb18badb 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
@@ -33,15 +33,12 @@
                         ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
                         HorizontalContentAlignment="Left"
                         Width="250">
-                        <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale MultiplayerModeDisabled}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale MultiplayerModeLdnRyu}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale MultiplayerModeLdnMitm}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{locale:Locale MultiplayerModeDisabled}" />
+                        <ComboBoxItem
+                            Content="{locale:Locale MultiplayerModeLdnRyu}" />
+                        <ComboBoxItem
+                            Content="{locale:Locale MultiplayerModeLdnMitm}" />
                     </ComboBox>
                     <CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}">
                         <TextBlock Text="{locale:Locale MultiplayerDisableP2P}"
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
index 5db6cdcff..02d251eba 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -45,27 +45,20 @@
                             ToolTip.Tip="{locale:Locale RegionTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionChina}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionChina}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel
@@ -81,60 +74,42 @@
                             ToolTip.Tip="{locale:Locale LanguageTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel
@@ -208,15 +183,12 @@
                             ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltipCustom}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
                         </ComboBox>
                         <ComboBox
                             IsVisible="{Binding !EnableCustomVSyncInterval}"
@@ -224,12 +196,10 @@
                             ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@@ -286,21 +256,16 @@
 						ToolTip.Tip="{locale:Locale DRamTooltip}"
 						HorizontalContentAlignment="Left"
 						Width="350">
-						<ComboBoxItem>
-							<TextBlock Text="{locale:Locale SettingsTabSystemDramSize4GiB}" />
-						</ComboBoxItem>
-						<ComboBoxItem>
-							<TextBlock Text="{locale:Locale SettingsTabSystemDramSize6GiB}" />
-						</ComboBoxItem>
-						<ComboBoxItem>
-							<TextBlock Text="{locale:Locale SettingsTabSystemDramSize8GiB}" />
-						</ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemDramSize10GiB}" />
-                        </ComboBoxItem>
-						<ComboBoxItem>
-							<TextBlock Text="{locale:Locale SettingsTabSystemDramSize12GiB}" />
-						</ComboBoxItem>
+						<ComboBoxItem
+                            Content="{locale:Locale SettingsTabSystemDramSize4GiB}" />
+						<ComboBoxItem
+                            Content="{locale:Locale SettingsTabSystemDramSize6GiB}" />
+						<ComboBoxItem
+                            Content="{locale:Locale SettingsTabSystemDramSize8GiB}" />
+                        <ComboBoxItem
+                            Content="{locale:Locale SettingsTabSystemDramSize10GiB}" />
+						<ComboBoxItem
+                            Content="{locale:Locale SettingsTabSystemDramSize12GiB}" />
 					</ComboBox>
                 </StackPanel>
                 <StackPanel
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index 9749a24b7..b50696a10 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -46,15 +46,12 @@
                         <ComboBox SelectedIndex="{Binding HideCursor}"
                                   HorizontalContentAlignment="Left"
                                   MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGeneralHideCursorNever}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
@@ -65,15 +62,12 @@
                         <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
                                   HorizontalContentAlignment="Left"
                                   MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeLight}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeDark}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGeneralThemeAuto}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGeneralThemeLight}" />
+                            <ComboBoxItem
+                                Content="{locale:Locale SettingsTabGeneralThemeDark}" />
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 194d04bd8..2cb39d9c8 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -98,20 +98,24 @@
             Spacing="10">
             <Button
                 Name="DeleteButton"
-                Click="DeleteButton_Click"
-                Content="{locale:Locale UserProfilesDelete}" />
+                Click="DeleteButton_Click">
+                <TextBlock Text="{locale:Locale UserProfilesDelete}" />
+                </Button>
             <Button
                 Name="ChangePictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{locale:Locale UserProfilesChangeProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{locale:Locale UserProfilesChangeProfileImage}" />
+                </Button>
             <Button
                 Name="AddPictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{locale:Locale UserProfilesSetProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" />
+                </Button>
             <Button
                 Name="SaveButton"
-                Click="SaveButton_Click"
-                Content="{locale:Locale Save}" />
+                Click="SaveButton_Click">
+                <TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" />
+                </Button>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 954c1a907..032e96561 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -82,27 +82,22 @@
             Spacing="10"
             Margin="0 24 0 0"
             HorizontalAlignment="Right">
-            <ui:ColorPickerButton
-                FlyoutPlacement="Top"
-                IsMoreButtonVisible="False"
-                UseColorPalette="False"
-                UseColorTriangle="False"
-                UseColorWheel="False"
-                ShowAcceptDismissButtons="False"
+            <ColorPicker
                 IsAlphaEnabled="False"
                 Color="{Binding BackgroundColor, Mode=TwoWay}"
                 Name="ColorButton">
-                <ui:ColorPickerButton.Styles>
+                <ColorPicker.Styles>
                     <Style Selector="Grid#Root > DockPanel > Grid">
                         <Setter Property="IsVisible" Value="False" />
                     </Style>
-                </ui:ColorPickerButton.Styles>
-            </ui:ColorPickerButton>
+                </ColorPicker.Styles>
+            </ColorPicker>
             <Button
-                Content="{locale:Locale AvatarChoose}"
                 Height="35"
                 Name="ChooseButton"
-                Click="ChooseButton_OnClick" />
+                Click="ChooseButton_OnClick">
+                <TextBlock Text="{locale:Locale AvatarChoose}" />
+                </Button>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
index ed3df4a8a..13a8f38ac 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -38,14 +38,16 @@
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{locale:Locale Name}" />
+                            HorizontalContentAlignment="Left">
+                            <TextBlock Text="{locale:Locale Name}" />
+                        </Label>
                     </ComboBoxItem>
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{locale:Locale Size}" />
+                            HorizontalContentAlignment="Left">
+                            <TextBlock Text="{locale:Locale Size}" />
+                        </Label>
                     </ComboBoxItem>
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
@@ -57,14 +59,16 @@
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{locale:Locale OrderAscending}" />
+                            HorizontalContentAlignment="Left">
+                            <TextBlock Text="{locale:Locale OrderAscending}" />
+                        </Label>
                     </ComboBoxItem>
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{locale:Locale OrderDescending}" />
+                            HorizontalContentAlignment="Left">
+                            <TextBlock Text="{locale:Locale OrderDescending}" />
+                        </Label>
                     </ComboBoxItem>
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
index 48316cfa2..42c5a2ed9 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -142,11 +142,13 @@
             Orientation="Horizontal"
             Spacing="10">
             <Button
-                Click="ManageSaves"
-                Content="{locale:Locale UserProfilesManageSaves}" />
+                Click="ManageSaves">
+                <TextBlock Text="{locale:Locale UserProfilesManageSaves}" />
+                </Button>
             <Button
-                Click="RecoverLostAccounts"
-                Content="{locale:Locale UserProfilesRecoverLostAccounts}" />
+                Click="RecoverLostAccounts">
+                <TextBlock Text="{locale:Locale UserProfilesRecoverLostAccounts}" />
+                </Button>
         </StackPanel>
         <StackPanel
             Grid.Row="1"
@@ -154,8 +156,9 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
-                Click="Close"
-                Content="{locale:Locale UserProfilesClose}" />
+                Click="Close">
+                <TextBlock Text="{locale:Locale UserProfilesClose}" />
+            </Button>
         </StackPanel>
     </Grid>
 </UserControl>