diff --git a/src/Ryujinx/UI/Views/Settings/CustomSettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/CustomSettingsAudioView.axaml
index 16146cfc8..959ce7c42 100644
--- a/src/Ryujinx/UI/Views/Settings/CustomSettingsAudioView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/CustomSettingsAudioView.axaml
@@ -52,7 +52,7 @@
                                Text="{locale:Locale SettingsTabSystemAudioVolume}"
                                ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
                                Width="250" />
-                    <ui:NumberBox Value="{Binding Volume}"
+                    <ui:FANumberBox Value="{Binding Volume}"
                             ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
                             Width="350"
                             SmallChange="1"
diff --git a/src/Ryujinx/UI/Views/Settings/CustomSettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/CustomSettingsCPUView.axaml
index d2e37649d..732e1a657 100644
--- a/src/Ryujinx/UI/Views/Settings/CustomSettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/CustomSettingsCPUView.axaml
@@ -95,7 +95,7 @@
                             Text="{locale:Locale SettingsTabSystemTurboMultiplier}"
                             ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierToolTip}"
                             Width="250" />
-                        <ui:NumberBox ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
+                        <ui:FANumberBox ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
                                       Value="{Binding TurboMultiplier}"
                                       Width="165"
                                       SmallChange="1.0"
diff --git a/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml b/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml
index 8b1c14cbe..9750ef96c 100644
--- a/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml
@@ -34,7 +34,7 @@
             <settings:CustomSettingsGraphicsView Name="GraphicsPage" />
             <settings:CustomSettingsAudioView Name="AudioPage" />
         </Grid>
-        <ui:NavigationView
+        <ui:FANavigationView
             Grid.Row="1"
             IsSettingsVisible="False"
             Name="NavPanel"
@@ -44,7 +44,7 @@
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             OpenPaneLength="200">
-            <ui:NavigationView.PaneHeader>
+            <ui:FANavigationView.PaneHeader>
                 <Border
                     Margin="10"
                     HorizontalAlignment="Stretch"
@@ -64,39 +64,39 @@
                         </Grid>
                     </Grid>
                 </Border>
-            </ui:NavigationView.PaneHeader>
-            <ui:NavigationView.MenuItems>
-                <ui:NavigationViewItem
+            </ui:FANavigationView.PaneHeader>
+            <ui:FANavigationView.MenuItems>
+                <ui:FANavigationViewItem
                     Content="{locale:Locale SettingsTabSystem}"
                     Tag="SystemPage"
                     IconSource="Settings" />
-                <ui:NavigationViewItem
+                <ui:FANavigationViewItem
                     Content="{locale:Locale SettingsTabCpu}"
                     Tag="CpuPage">
-                    <ui:NavigationViewItem.IconSource>
-                        <ui:FontIconSource
+                    <ui:FANavigationViewItem.IconSource>
+                        <ui:FAFontIconSource
                             FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
                             Glyph="{helpers:GlyphValueConverter Chip}" />
-                    </ui:NavigationViewItem.IconSource>
-                </ui:NavigationViewItem>
-                <ui:NavigationViewItem
+                    </ui:FANavigationViewItem.IconSource>
+                </ui:FANavigationViewItem>
+                <ui:FANavigationViewItem
                     Content="{locale:Locale SettingsTabGraphics}"
                     Tag="GraphicsPage"
                     IconSource="Image" />
-                <ui:NavigationViewItem
+                <ui:FANavigationViewItem
                     Content="{locale:Locale SettingsTabAudio}"
                     IconSource="Audio"
                     Tag="AudioPage" />
-            </ui:NavigationView.MenuItems>
-            <ui:NavigationView.Styles>
+            </ui:FANavigationView.MenuItems>
+            <ui:FANavigationView.Styles>
                 <Style Selector="Grid#PlaceholderGrid">
                     <Setter Property="Height" Value="160" />
                 </Style>
-                <Style Selector="ui|NavigationViewItem ui|SymbolIcon">
+                <Style Selector="ui|FANavigationViewItem ui|FASymbolIcon">
                     <Setter Property="FlowDirection" Value="LeftToRight" />
                 </Style>
-            </ui:NavigationView.Styles>
-        </ui:NavigationView>
+            </ui:FANavigationView.Styles>
+        </ui:FANavigationView>
         <ReversibleStackPanel
             Grid.Row="2"
             Margin="10"
diff --git a/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml.cs
index a7c3dcb93..b0a4777e9 100644
--- a/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml.cs
@@ -1,12 +1,10 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-using Avalonia.Threading;
-using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Ava.UI.Windows
@@ -79,9 +77,9 @@ namespace Ryujinx.Ava.UI.Windows
             NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
         }
 
-        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
+        private void NavPanelOnSelectionChanged(object sender, FANavigationViewSelectionChangedEventArgs e)
         {
-            if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
+            if (e.SelectedItem is FANavigationViewItem navItem && navItem.Tag is not null)
             {
                 switch (navItem.Tag.ToString())
                 {