diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1389b58a6..4c3d5bcd3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,25 +3,25 @@
     <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.6" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.6.2" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2"/>
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
     <PackageVersion Include="DynamicData" Version="9.4.1" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
+    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build3" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index ecf6779dc..509a9f18e 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -221,10 +221,7 @@ namespace Ryujinx.Ava
             }
 
             // When you first load the program, copy to remember the path for the global configuration
-            if (GlobalConfigurationPath == null)
-            {
-                GlobalConfigurationPath = ConfigurationPath;
-            }
+            GlobalConfigurationPath ??= ConfigurationPath;
 
             UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration;
 
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index 480d14781..3d40ae64e 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -51,10 +51,10 @@
     <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="DynamicData" />
-    <PackageReference Include="FluentAvaloniaUI" />
+    <PackageReference Include="FluentAvaloniaUI.NoAnim" />
     <PackageReference Include="CommandLineParser" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="DiscordRichPresence" />
diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
index 57619aa70..a91a74711 100644
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -56,6 +56,7 @@ namespace Ryujinx.Ava.Systems.Configuration
 
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
+            Logger.EnableAvaloniaLog.Value = cff.LoggingEnableAvalonia;
             Logger.EnableStub.Value = cff.LoggingEnableStub;
             Logger.EnableInfo.Value = cff.LoggingEnableInfo;
             Logger.EnableWarn.Value = cff.LoggingEnableWarn;
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
index 4f1701c48..b09c6ef6c 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
@@ -35,18 +35,17 @@
                               Width="350"
                               ToolTip.Tip="{ext:Locale AudioBackendTooltip}"
                               HorizontalContentAlignment="Left">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsOpenAlEnabled}"
+                            Content="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsSoundIoEnabled}"
+                            Content="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsSDL2Enabled}"
+                            Content="{ext: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 0be13d9a5..2424aca97 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -55,19 +55,14 @@
                                   HorizontalContentAlignment="Left"
                                   Width="350">
                             <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}">
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}"
+                                Content="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
                             <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}"
+                                Content="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
                             <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}">
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}"
+                                Content="{ext: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 d21695d0f..22c7acfa2 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="{ext: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}">
@@ -65,15 +65,12 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
                                       SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonAuto}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonOff}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonOn}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonAuto}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonOff}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonOn}" />
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
@@ -108,21 +105,16 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
                         </ComboBox>
                         <ui:NumberBox
                             Margin="10,0,0,0"
@@ -150,24 +142,18 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
                                       SelectedIndex="{Binding AntiAliasingEffect}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="FXAA" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaLow}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaMedium}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaHigh}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaUltra}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                <ComboBoxItem
+                                    Content="FXAA" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaLow}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaMedium}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaHigh}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaUltra}" />
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
@@ -184,18 +170,14 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
                                       SelectedIndex="{Binding ScalingFilter}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterBilinear}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterNearest}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterFsr}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterArea}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterBilinear}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterNearest}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterFsr}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterArea}" />
                             </ComboBox>
                             <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
                                     ToolTip.Tip="{ext:Locale GraphicsScalingFilterLevelTooltip}"
@@ -226,23 +208,16 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{ext:Locale AnisotropyTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
@@ -254,24 +229,18 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
index d28f0ffa7..fa3b4e866 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
@@ -101,19 +101,14 @@
                                     Width="150"
                                     HorizontalContentAlignment="Left"
                                     ToolTip.Tip="{ext:Locale OpenGlLogLevel}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
index 2fc59f04d..3a249e097 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
@@ -33,15 +33,12 @@
                         ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}"
                         HorizontalContentAlignment="Left"
                         Width="250">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale MultiplayerModeDisabled}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale MultiplayerModeLdnRyu}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale MultiplayerModeLdnMitm}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{ext:Locale MultiplayerModeDisabled}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale MultiplayerModeLdnRyu}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale MultiplayerModeLdnMitm}" />
                     </ComboBox>
                     <CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}">
                         <TextBlock Text="{ext:Locale MultiplayerDisableP2P}"
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
index 8bfaacc89..2414fb7f6 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -42,27 +42,20 @@
                             SelectedIndex="{Binding Region}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionChina}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionChina}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel
@@ -76,60 +69,42 @@
                             SelectedIndex="{Binding Language}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel
@@ -208,15 +183,12 @@
                             ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltipCustom}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
                         </ComboBox>
                         <ComboBox
                             IsVisible="{Binding !EnableCustomVSyncInterval}"
@@ -224,12 +196,10 @@
                             ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
                         </ComboBox>
                     </StackPanel>
                     <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@@ -288,18 +258,14 @@
                         ToolTip.Tip="{ext:Locale DRamTooltip}"
                         HorizontalContentAlignment="Left"
                         Width="350">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize4GiB}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize6GiB}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize8GiB}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize12GiB}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize4GiB}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize6GiB}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize8GiB}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize12GiB}" />
                     </ComboBox>
                 </StackPanel>
                 <StackPanel
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index fed868243..e55c20b88 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -71,22 +71,16 @@
                             <ComboBox SelectedIndex="{Binding FocusLostActionType}"
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
                             </ComboBox>
                         </StackPanel>
                         <StackPanel
@@ -100,16 +94,12 @@
                             <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonOff}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonOff}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
                             </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
@@ -122,15 +112,12 @@
                             <ComboBox SelectedIndex="{Binding HideCursor}"
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale Never}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
-                                </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale Never}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
                             </ComboBox>
                         </StackPanel>
                         <StackPanel
@@ -145,15 +132,12 @@
                             <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonAuto}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                Content="{ext:Locale CommonAuto}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralThemeLight}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralThemeDark}" />
                             </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 47f6a60e1..b8983489a 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -92,20 +92,24 @@
             Spacing="10">
             <Button
                 Name="DeleteButton"
-                Click="DeleteButton_Click"
-                Content="{ext:Locale UserProfilesDelete}" />
+                Click="DeleteButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesDelete}" />
+            </Button>
             <Button
                 Name="ChangePictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{ext:Locale UserProfilesChangeProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesChangeProfileImage}" />
+            </Button>
             <Button
                 Name="AddPictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{ext:Locale UserProfilesSetProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
+            </Button>
             <Button
                 Name="SaveButton"
-                Click="SaveButton_Click"
-                Content="{ext:Locale Save}" />
+                Click="SaveButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
+            </Button>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
index f742af9ed..80fb442e5 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -22,44 +22,33 @@
     <Grid RowDefinitions="Auto,*,Auto">
         <Grid
             Grid.Row="0"
+            Margin="0,0,0,5"
             HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
             <StackPanel
                 Spacing="10"
                 Orientation="Horizontal"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
-                <ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale Name}" />
-                    </ComboBoxItem>
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale Size}" />
-                    </ComboBoxItem>
+                <ComboBox SelectedIndex="{Binding SortIndex}"
+                          HorizontalContentAlignment="Left"
+                          MinWidth="100">
+                    <ComboBoxItem
+                        Content="{ext:Locale Name}" />
+                    <ComboBoxItem
+                        Content="{ext:Locale Size}" />
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
                             <Setter Property="HorizontalAlignment" Value="Left" />
                         </Style>
                     </ComboBox.Styles>
                 </ComboBox>
-                <ComboBox SelectedIndex="{Binding OrderIndex}" Width="150">
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale OrderAscending}" />
-                    </ComboBoxItem>
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale OrderDescending}" />
-                    </ComboBoxItem>
+                <ComboBox SelectedIndex="{Binding OrderIndex}"
+                          HorizontalContentAlignment="Left"
+                          MinWidth="150">
+                    <ComboBoxItem
+                        Content="{ext:Locale OrderAscending}" />
+                    <ComboBoxItem
+                        Content="{ext:Locale OrderDescending}" />
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
                             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -71,9 +60,9 @@
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
                 Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
-                <Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
+                <TextBlock Text="{ext:Locale Search}" VerticalAlignment="Center" />
                 <TextBox
-                    Margin="5,0,0,0"
+                    Margin="10,0,0,0"
                     Grid.Column="1"
                     HorizontalAlignment="Stretch"
                     Text="{Binding Search}" />
diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
index d0fd5eeda..42ccc41fe 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -136,11 +136,13 @@
             Orientation="Horizontal"
             Spacing="10">
             <Button
-                Click="ManageSaves"
-                Content="{ext:Locale UserProfilesManageSaves}" />
+                Click="ManageSaves">
+                <TextBlock Text="{ext:Locale UserProfilesManageSaves}" />
+            </Button>
             <Button
-                Click="RecoverLostAccounts"
-                Content="{ext:Locale UserProfilesRecoverLostAccounts}" />
+                Click="RecoverLostAccounts">
+                <TextBlock Text="{ext:Locale UserProfilesRecoverLostAccounts}" />
+            </Button>
         </StackPanel>
         <StackPanel
             Grid.Row="1"
@@ -148,8 +150,9 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
-                Click="Close"
-                Content="{ext:Locale UserProfilesClose}" />
+                Click="Close">
+                <TextBlock Text="{ext:Locale UserProfilesClose}" />
+            </Button>
         </StackPanel>
     </Grid>
 </UserControl>