diff --git a/assets/locales.json b/assets/locales.json
index dd5c72a1b..581b7570d 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -11220,26 +11220,26 @@
     {
       "ID": "ProfileImageSelectionHeader",
       "Translations": {
-        "ar_SA": "اختر صورة الملف الشخصي",
-        "de_DE": "Wähle ein Profilbild aus",
-        "el_GR": "Επιλέξτε μία Εικόνα Προφίλ",
-        "en_US": "Choose a Profile Image",
-        "es_ES": "Elige una Imagen de Perfil",
-        "fr_FR": "Choisir l'Image de Profil",
-        "he_IL": "בחרו תמונת פרופיל",
-        "it_IT": "Scegli un'immagine profilo",
-        "ja_JP": "プロファイル画像を選択",
-        "ko_KR": "프로필 이미지를 선택",
-        "no_NO": "Velg et profilbilde",
-        "pl_PL": "Wybierz zdjęcie profilowe",
-        "pt_BR": "Escolha uma Imagem de Perfil",
-        "ru_RU": "Выбор аватара",
-        "sv_SE": "Välj en profilbild",
-        "th_TH": "เลือก รูปโปรไฟล์",
-        "tr_TR": "Profil Resmi Seç",
-        "uk_UA": "Виберіть аватара",
-        "zh_CN": "选择合适的头像图片",
-        "zh_TW": "選擇設定檔圖像"
+        "ar_SA": "تحديد أفاتار البرنامج الثابت",
+        "de_DE": "Firmware-Avatar auswählen",
+        "el_GR": "Επιλογή Avatar Firmware",
+        "en_US": "Select Firmware Avatar",
+        "es_ES": "Seleccionar Avatar del Firmware",
+        "fr_FR": "Sélection d’un Avatar du Firmware",
+        "he_IL": "בחירת אוואטר קושחה",
+        "it_IT": "Selezione Avatar Firmware",
+        "ja_JP": "ファームウェアアバター選択",
+        "ko_KR": "펌웨어 아바타 선택",
+        "no_NO": "Velg firmware-avatar",
+        "pl_PL": "Wybór awatara oprogramowania",
+        "pt_BR": "Selecionar Avatar do Firmware",
+        "ru_RU": "Выбор аватара прошивки",
+        "sv_SE": "Välj firmware-avatar",
+        "th_TH": "การเลือกอวตารเฟิร์มแวร์",
+        "tr_TR": "Firmware Avatar Seçimi",
+        "uk_UA": "Вибір аватара прошивки",
+        "zh_CN": "选择固件头像",
+        "zh_TW": "選取韌體頭像"
       }
     },
     {
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
index ead2c3a7c..2b8f0bf09 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
@@ -132,7 +132,7 @@ namespace Ryujinx.Ava.UI.Views.User
 
             if (ViewModel.Image == null)
             {
-                DataValidationErrors.SetError(ImageBox, new DataValidationException(LocaleManager.Instance[LocaleKeys.UserProfileEmptyNameError]));
+                DataValidationErrors.SetError(ImageBox, null);
                 ImageBox.BorderBrush = Brushes.Red;
 
                 return;
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 0d77738ca..228c0e5e8 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -18,43 +18,50 @@
         <viewModels:UserFirmwareAvatarSelectorViewModel />
     </Design.DataContext>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
-        <ListBox
+        <Border
             Grid.Row="1"
-            BorderThickness="0"
-            SelectedIndex="{Binding SelectedIndex}"
-            Height="400"
-            ItemsSource="{Binding Images}"
+            Padding="2.5"
+            BorderThickness="1"
+            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
+            CornerRadius="5"
             HorizontalAlignment="Stretch"
-            VerticalAlignment="Center">
-            <ListBox.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel
-                        Orientation="Horizontal"
-                        Margin="0"
-                        HorizontalAlignment="Center" />
-                </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-            <ListBox.Styles>
-                <Style Selector="ListBoxItem">
-                    <Setter Property="CornerRadius" Value="4" />
-                    <Setter Property="Width" Value="85" />
-                    <Setter Property="MaxWidth" Value="85" />
-                    <Setter Property="MinWidth" Value="85" />
-                </Style>
-                <Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator">
-                    <Setter Property="MinHeight" Value="70" />
-                </Style>
-            </ListBox.Styles>
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <Panel
-                        Background="{Binding BackgroundColor}"
-                        Margin="5">
-                        <Image Source="{Binding Data, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
-                    </Panel>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
+            VerticalAlignment="Stretch">
+            <ListBox
+                Grid.Row="1"
+                Background="Transparent"
+                SelectedIndex="{Binding SelectedIndex}"
+                Height="400"
+                ItemsSource="{Binding Images}">
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel
+                            Orientation="Horizontal"
+                            Margin="0"
+                            HorizontalAlignment="Center" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="CornerRadius" Value="4" />
+                        <Setter Property="Width" Value="85" />
+                        <Setter Property="MaxWidth" Value="85" />
+                        <Setter Property="MinWidth" Value="85" />
+                    </Style>
+                    <Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator">
+                        <Setter Property="MinHeight" Value="70" />
+                    </Style>
+                </ListBox.Styles>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Panel
+                            Background="{Binding BackgroundColor}"
+                            Margin="5">
+                            <Image Source="{Binding Data, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
+                        </Panel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </Border>
         <StackPanel
             Grid.Row="3"
             Orientation="Horizontal"