diff --git a/Directory.Packages.props b/Directory.Packages.props
index 517c2fd1b..b3e19baaf 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,7 +14,7 @@
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.4.1.37" />
     <PackageVersion Include="DynamicData" Version="9.4.1" />
-    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build1" />
+    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build2" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 032e96561..954c1a907 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -82,22 +82,27 @@
             Spacing="10"
             Margin="0 24 0 0"
             HorizontalAlignment="Right">
-            <ColorPicker
+            <ui:ColorPickerButton
+                FlyoutPlacement="Top"
+                IsMoreButtonVisible="False"
+                UseColorPalette="False"
+                UseColorTriangle="False"
+                UseColorWheel="False"
+                ShowAcceptDismissButtons="False"
                 IsAlphaEnabled="False"
                 Color="{Binding BackgroundColor, Mode=TwoWay}"
                 Name="ColorButton">
-                <ColorPicker.Styles>
+                <ui:ColorPickerButton.Styles>
                     <Style Selector="Grid#Root > DockPanel > Grid">
                         <Setter Property="IsVisible" Value="False" />
                     </Style>
-                </ColorPicker.Styles>
-            </ColorPicker>
+                </ui:ColorPickerButton.Styles>
+            </ui:ColorPickerButton>
             <Button
+                Content="{locale:Locale AvatarChoose}"
                 Height="35"
                 Name="ChooseButton"
-                Click="ChooseButton_OnClick">
-                <TextBlock Text="{locale:Locale AvatarChoose}" />
-                </Button>
+                Click="ChooseButton_OnClick" />
         </StackPanel>
     </Grid>
 </UserControl>