diff --git a/assets/locales.json b/assets/locales.json
index c1f651e02..5881505c0 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -11195,26 +11195,26 @@
     {
       "ID": "ProfileNameSelectionWatermark",
       "Translations": {
-        "ar_SA": "اختر اسم مستعار",
-        "de_DE": "Wähle einen Spitznamen",
-        "el_GR": "Επιλέξτε ψευδώνυμο",
-        "en_US": "Choose a Nickname",
-        "es_ES": "Escoge un Apodo",
-        "fr_FR": "Choisir un Pseudonyme",
-        "he_IL": "בחרו כינוי",
-        "it_IT": "Scegli un soprannome",
-        "ja_JP": "ニックネームを選択",
-        "ko_KR": "별명 선택",
-        "no_NO": "Velg ett kallenavn",
-        "pl_PL": "Wybierz pseudonim",
-        "pt_BR": "Escolha um Apelido",
-        "ru_RU": "Введите никнейм",
-        "sv_SE": "Välj ett smeknamn",
-        "th_TH": "เลือก ชื่อเล่น",
-        "tr_TR": "Kullanıcı Adı Seç",
-        "uk_UA": "Оберіть псевдонім",
-        "zh_CN": "输入昵称",
-        "zh_TW": "選擇暱稱"
+        "ar_SA": "اختر اسم الملف الشخصي",
+        "de_DE": "Wähle einen Profilnamen",
+        "el_GR": "Επιλέξτε όνομα προφίλ",
+        "en_US": "Choose a Profile Name",
+        "es_ES": "Escoge un Nombre de Perfil",
+        "fr_FR": "Choisir un Nom de Profil",
+        "he_IL": "בחרו שם פרופיל",
+        "it_IT": "Scegli un Nome Profilo",
+        "ja_JP": "プロフィール名を選択",
+        "ko_KR": "프로필 이름 선택",
+        "no_NO": "Velg et Profilnavn",
+        "pl_PL": "Wybierz nazwę profilu",
+        "pt_BR": "Escolha um Nome de Perfil",
+        "ru_RU": "Выберите имя профиля",
+        "sv_SE": "Välj ett Profilnamn",
+        "th_TH": "เลือก ชื่อโปรไฟล์",
+        "tr_TR": "Profil Adı Seç",
+        "uk_UA": "Оберіть ім'я профілю",
+        "zh_CN": "选择个人资料名称",
+        "zh_TW": "選擇個人資料名稱"
       }
     },
     {
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 6bbf8c6e1..4155ae6f2 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -24,6 +24,7 @@
             <TextBlock Text="{ext:Locale UserProfilesName}" />
             <TextBox
                 Name="NameBox"
+                Margin="0,0,0,5"
                 Width="300"
                 HorizontalAlignment="Stretch"
                 MaxLength="{Binding MaxProfileNameLength}"
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 662e8c362..0d77738ca 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -17,10 +17,7 @@
     <Design.DataContext>
         <viewModels:UserFirmwareAvatarSelectorViewModel />
     </Design.DataContext>
-    <Grid
-        Margin="10"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
         <ListBox
             Grid.Row="1"
             BorderThickness="0"