diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 34befb6a1..142a00349 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -29,27 +29,24 @@
                 IsReadOnly="True"
                 Text="{Binding UserIdString}" />
         </StackPanel>
-        <Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Stretch">
+        <Grid Grid.Column="1">
             <Border
                 Name="ImageBox"
                 BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
                 BorderThickness="1"
-                VerticalAlignment="Stretch">
-                <Grid>
+                VerticalAlignment="Bottom"
+                HorizontalAlignment="Right">
+                <Panel>
                     <ui:SymbolIcon
                         FontSize="70"
                         Width="120"
                         Height="120"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
                         Foreground="{DynamicResource AppListHoverBackgroundColor}"
                         Symbol="Camera" />
                     <Image
                         Name="ProfileImage"
                         Width="120"
                         Height="120"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
                         Source="{Binding Image, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
                     <Border
                         Margin="2"
@@ -70,17 +67,19 @@
                             <ui:SymbolIcon Symbol="Edit" />
                             <Button.Flyout>
                                 <MenuFlyout Placement="Bottom">
-                                    <MenuItem Header="{ext:Locale UserProfiles_ProfileImage_Import}"
-                                            Icon="{ext:Icon fa-solid fa-image}"
-                                            Click="Import_OnClick" />
-                                    <MenuItem Header="{ext:Locale UserProfiles_ProfileImage_SelectAvatar}"
-                                            Icon="{ext:Icon fa-solid fa-floppy-disk}"
-                                            Click="SelectFirmwareImage_OnClick" />
+                                    <MenuItem
+                                        Header="{ext:Locale UserProfiles_ProfileImage_Import}"
+                                        Icon="{ext:Icon fa-solid fa-image}"
+                                        Click="Import_OnClick" />
+                                    <MenuItem
+                                        Header="{ext:Locale UserProfiles_ProfileImage_SelectAvatar}"
+                                        Icon="{ext:Icon fa-solid fa-floppy-disk}"
+                                        Click="SelectFirmwareImage_OnClick" />
                                 </MenuFlyout>
                             </Button.Flyout>
                         </Button>
                     </Border>
-                </Grid>
+                </Panel>
             </Border>
         </Grid>
         <StackPanel
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 3d6606170..e15eb6377 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -49,6 +49,10 @@
                     </Style>
                     <Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator">
                         <Setter Property="MinHeight" Value="70" />
+                        <Setter Property="IsVisible" Value="False" />
+                    </Style>
+                    <Style Selector="ListBoxItem:selected /template/ Rectangle#SelectionIndicator">
+                        <Setter Property="IsVisible" Value="True" />
                     </Style>
                 </ListBox.Styles>
                 <ListBox.ItemTemplate>
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
index 3ff181650..648d3e05a 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
@@ -50,6 +50,8 @@ namespace Ryujinx.Ava.UI.Views.User
             ((ContentDialog)_parent.Parent).Title =
                 $"{LocaleManager.Instance[LocaleKeys.UserProfiles_WindowTitle]} - " +
                 $"{LocaleManager.Instance[LocaleKeys.UserProfiles_SelectAvatarTitle]}";
+            
+            ViewModel.SelectedIndex = -1;
 
             _ = Task.Run(() =>
             {
diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
index b07b0b862..19a6ff08a 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -19,7 +19,7 @@
         <viewModels:UserProfileViewModel />
     </Design.DataContext>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
-        <Border BorderThickness="0" Padding="-3">
+        <Border Padding="-3" BorderThickness="0">
             <ListBox
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
@@ -28,7 +28,10 @@
                 SelectionChanged="ProfilesList_SelectionChanged">
                 <ListBox.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="5" /> 
+                        <WrapPanel
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal"/>
                     </ItemsPanelTemplate>
                 </ListBox.ItemsPanel>
                 <ListBox.Styles>
@@ -100,7 +103,7 @@
                     <DataTemplate
                         DataType="viewModels:BaseModel">
                         <Panel
-                            Height="120"
+                            Height="146"
                             Width="106">
                             <Button
                                 MinWidth="50"