diff --git a/Directory.Packages.props b/Directory.Packages.props
index 766f46b04..2a45370e5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,18 +3,18 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.2.8" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.8" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.8" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.8" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.2.8" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.2.7.1" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.2.7.1" />
+    <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="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageVersion Include="DynamicData" Version="9.0.4" />
-    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.3.0-build1" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
     <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index 5754c52aa..7fc61bec0 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -47,7 +47,7 @@
     <PackageReference Include="Avalonia.Svg" />
     <PackageReference Include="Avalonia.Svg.Skia" />
     <PackageReference Include="DynamicData" />
-    <PackageReference Include="FluentAvaloniaUI.NoAnim" />
+    <PackageReference Include="FluentAvaloniaUI" />
 
     <PackageReference Include="OpenTK.Core" />
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" 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 9195edaf4..657e07ee7 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
@@ -34,17 +34,18 @@
                     <ComboBox SelectedIndex="{Binding AudioBackend}"
                               Width="350"
                               HorizontalContentAlignment="Left">
-                        <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}" />
+                        <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>
                     </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 4c3546fca..48a50c9cf 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -53,14 +53,19 @@
                                   HorizontalContentAlignment="Left"
                                   Width="350">
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}"
-                                Content="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
+                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
+                                <TextBlock
+                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
+                            </ComboBoxItem>
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}"
-                                Content="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
+                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
+                            </ComboBoxItem>
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}"
-                                Content="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
+                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
+                                <TextBlock
+                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
+                            </ComboBoxItem>
                         </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 8f2915dac..65f42aeff 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}"
-                                Content="Vulkan" />
-                            <ComboBoxItem
-                                IsEnabled="{Binding IsOpenGLAvailable}"
-                                Content="OpenGL" />
+                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
+                                <TextBlock Text="Vulkan" />
+                            </ComboBoxItem>
+                            <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
+                                <TextBlock Text="OpenGL" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
@@ -88,16 +88,21 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
-                            <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}" />
+                            <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>
                         </ComboBox>
                         <ui:NumberBox
                             Margin="10,0,0,0"
@@ -125,18 +130,24 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
                                       SelectedIndex="{Binding AntiAliasingEffect}">
-                                <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}" />
+                                <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>
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
@@ -153,14 +164,18 @@
                                       HorizontalContentAlignment="Left"
                                       ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
                                       SelectedIndex="{Binding ScalingFilter}">
-                                <ComboBoxItem
-                                    Content="{locale:Locale GraphicsScalingFilterBilinear}" />
-                                <ComboBoxItem
-                                    Content="{locale:Locale GraphicsScalingFilterNearest}" />
-                                <ComboBoxItem
-                                    Content="{locale:Locale GraphicsScalingFilterFsr}" />
-                                <ComboBoxItem
-                                    Content="{locale:Locale GraphicsScalingFilterArea}" />
+                                <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>
                             </ComboBox>
                             <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
                                     ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
@@ -191,16 +206,23 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
-                            <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}" />
+                            <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>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
@@ -212,18 +234,24 @@
                                   Width="350"
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
-                            <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}" />
+                            <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>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
@@ -241,12 +269,15 @@
                                   HorizontalContentAlignment="Left"
                                   ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
                                   SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                            <ComboBoxItem
-                                Content="{locale:Locale CommonAuto}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale CommonOff}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale CommonOn}" />
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale CommonAuto}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale CommonOff}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale CommonOn}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
index df2d05d6c..5d22b891c 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
@@ -97,14 +97,19 @@
                                     Width="150"
                                     HorizontalContentAlignment="Left"
                                     ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
-                                <ComboBoxItem
-                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                <ComboBoxItem
-                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
-                                <ComboBoxItem
-                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
-                                <ComboBoxItem
-                                    Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
+                                <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>
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
@@ -112,4 +117,4 @@
             </StackPanel>
         </Border>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
index bcb18badb..894db57a5 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
@@ -33,12 +33,15 @@
                         ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
                         HorizontalContentAlignment="Left"
                         Width="250">
-                        <ComboBoxItem
-                            Content="{locale:Locale MultiplayerModeDisabled}" />
-                        <ComboBoxItem
-                            Content="{locale:Locale MultiplayerModeLdnRyu}" />
-                        <ComboBoxItem
-                            Content="{locale:Locale MultiplayerModeLdnMitm}" />
+                        <ComboBoxItem>
+                            <TextBlock Text="{locale:Locale MultiplayerModeDisabled}" />
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <TextBlock Text="{locale:Locale MultiplayerModeLdnRyu}" />
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <TextBlock Text="{locale:Locale MultiplayerModeLdnMitm}" />
+                        </ComboBoxItem>
                     </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 fcd30f583..b846d955c 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -45,20 +45,27 @@
                             ToolTip.Tip="{locale:Locale RegionTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <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}" />
+                            <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>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel
@@ -74,42 +81,60 @@
                             ToolTip.Tip="{locale:Locale LanguageTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <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}" />
+                            <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>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel
@@ -169,12 +194,15 @@
                             ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltipCustom}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
+                            </ComboBoxItem>
                         </ComboBox>
                         <ComboBox
                             IsVisible="{Binding !EnableCustomVSyncInterval}"
@@ -182,10 +210,12 @@
                             ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@@ -242,16 +272,21 @@
 						ToolTip.Tip="{locale:Locale DRamTooltip}"
 						HorizontalContentAlignment="Left"
 						Width="350">
-						<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}" />
+						<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>
 					</ComboBox>
                 </StackPanel>
                 <StackPanel
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index b50696a10..9749a24b7 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -46,12 +46,15 @@
                         <ComboBox SelectedIndex="{Binding HideCursor}"
                                   HorizontalContentAlignment="Left"
                                   MinWidth="100">
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabGeneralHideCursorNever}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
@@ -62,12 +65,15 @@
                         <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
                                   HorizontalContentAlignment="Left"
                                   MinWidth="100">
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabGeneralThemeAuto}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabGeneralThemeLight}" />
-                            <ComboBoxItem
-                                Content="{locale:Locale SettingsTabGeneralThemeDark}" />
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeAuto}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeLight}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeDark}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 2cb39d9c8..194d04bd8 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -98,24 +98,20 @@
             Spacing="10">
             <Button
                 Name="DeleteButton"
-                Click="DeleteButton_Click">
-                <TextBlock Text="{locale:Locale UserProfilesDelete}" />
-                </Button>
+                Click="DeleteButton_Click"
+                Content="{locale:Locale UserProfilesDelete}" />
             <Button
                 Name="ChangePictureButton"
-                Click="ChangePictureButton_Click">
-                <TextBlock Text="{locale:Locale UserProfilesChangeProfileImage}" />
-                </Button>
+                Click="ChangePictureButton_Click"
+                Content="{locale:Locale UserProfilesChangeProfileImage}" />
             <Button
                 Name="AddPictureButton"
-                Click="ChangePictureButton_Click">
-                <TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" />
-                </Button>
+                Click="ChangePictureButton_Click"
+                Content="{locale:Locale UserProfilesSetProfileImage}" />
             <Button
                 Name="SaveButton"
-                Click="SaveButton_Click">
-                <TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" />
-                </Button>
+                Click="SaveButton_Click"
+                Content="{locale:Locale Save}" />
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
index 13a8f38ac..ed3df4a8a 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -38,16 +38,14 @@
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left">
-                            <TextBlock Text="{locale:Locale Name}" />
-                        </Label>
+                            HorizontalContentAlignment="Left"
+                            Content="{locale:Locale Name}" />
                     </ComboBoxItem>
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left">
-                            <TextBlock Text="{locale:Locale Size}" />
-                        </Label>
+                            HorizontalContentAlignment="Left"
+                            Content="{locale:Locale Size}" />
                     </ComboBoxItem>
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
@@ -59,16 +57,14 @@
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left">
-                            <TextBlock Text="{locale:Locale OrderAscending}" />
-                        </Label>
+                            HorizontalContentAlignment="Left"
+                            Content="{locale:Locale OrderAscending}" />
                     </ComboBoxItem>
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left">
-                            <TextBlock Text="{locale:Locale OrderDescending}" />
-                        </Label>
+                            HorizontalContentAlignment="Left"
+                            Content="{locale:Locale OrderDescending}" />
                     </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 42c5a2ed9..48316cfa2 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -142,13 +142,11 @@
             Orientation="Horizontal"
             Spacing="10">
             <Button
-                Click="ManageSaves">
-                <TextBlock Text="{locale:Locale UserProfilesManageSaves}" />
-                </Button>
+                Click="ManageSaves"
+                Content="{locale:Locale UserProfilesManageSaves}" />
             <Button
-                Click="RecoverLostAccounts">
-                <TextBlock Text="{locale:Locale UserProfilesRecoverLostAccounts}" />
-                </Button>
+                Click="RecoverLostAccounts"
+                Content="{locale:Locale UserProfilesRecoverLostAccounts}" />
         </StackPanel>
         <StackPanel
             Grid.Row="1"
@@ -156,9 +154,8 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
-                Click="Close">
-                <TextBlock Text="{locale:Locale UserProfilesClose}" />
-            </Button>
+                Click="Close"
+                Content="{locale:Locale UserProfilesClose}" />
         </StackPanel>
     </Grid>
 </UserControl>