diff --git a/assets/Locales/UserProfiles.json b/assets/Locales/UserProfiles.json
index 2adc9f0c9..e37f24872 100644
--- a/assets/Locales/UserProfiles.json
+++ b/assets/Locales/UserProfiles.json
@@ -76,7 +76,7 @@
       }
     },
     {
-      "ID": "DeleteUserSave",
+      "ID": "DeleteSaveNote",
       "Translations": {
         "ar_SA": "هل حذف بيانات حفظ المستخدم لهذه اللعبة؟",
         "de_DE": "Löschen Sie die gespeicherten Spielstände dieses Spiels?",
@@ -101,7 +101,7 @@
       }
     },
     {
-      "ID": "SaveManagerHeading",
+      "ID": "SaveManagerTitle",
       "Translations": {
         "ar_SA": "حفظات {0}",
         "de_DE": "{0}s Speicherstände",
@@ -551,7 +551,7 @@
       }
     },
     {
-      "ID": "AvatarSelectionTitle",
+      "ID": "SelectAvatarTitle",
       "Translations": {
         "ar_SA": "تحديد أفاتار البرنامج الثابت",
         "de_DE": "Firmware-Avatar auswählen",
@@ -576,7 +576,7 @@
       }
     },
     {
-      "ID": "AvatarChoose",
+      "ID": "ButtonChooseAvatar",
       "Translations": {
         "ar_SA": "اختر الأفاتار",
         "de_DE": "Wähle Avatar",
@@ -676,7 +676,7 @@
       }
     },
     {
-      "ID": "Delete",
+      "ID": "ButtonDelete",
       "Translations": {
         "ar_SA": "حذف",
         "de_DE": "Löschen",
@@ -701,7 +701,7 @@
       }
     },
     {
-      "ID": "Save",
+      "ID": "ButtonSave",
       "Translations": {
         "ar_SA": "حفظ",
         "de_DE": "Speichern",
diff --git a/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
index 9f8b12072..7dd178555 100644
--- a/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private readonly AccountManager _accountManager;
 
-        public string UserProfiles_SaveManagerHeading => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.UserProfiles_SaveManagerHeading, _accountManager.LastOpenedUser.Name, _accountManager.LastOpenedUser.UserId);
+        public string SaveManagerTitle => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.UserProfiles_SaveManagerTitle, _accountManager.LastOpenedUser.Name);
 
         public UserSaveManagerViewModel(AccountManager accountManager)
         {
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 79f878378..34befb6a1 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -101,10 +101,10 @@
             Margin="0,30,0,0"
             Spacing="10">
             <Button Name="DeleteButton" Click="DeleteButton_Click">
-                <TextBlock Text="{ext:Locale UserProfiles_Delete}" />
+                <TextBlock Text="{ext:Locale UserProfiles_ButtonDelete}" />
             </Button>
             <Button Name="SaveButton" Click="SaveButton_Click">
-                <TextBlock Text="{ext:Locale UserProfiles_Save}" />
+                <TextBlock Text="{ext:Locale UserProfiles_ButtonSave}" />
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 477690e1a..3d6606170 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -99,10 +99,9 @@
                 </ui:ColorPickerButton.Styles>
             </ui:ColorPickerButton>
             <Button
-                Content="{ext:Locale UserProfiles_AvatarChoose}"
                 Height="37"
                 Click="ChooseButton_OnClick">
-                <TextBlock Text="{ext:Locale UserProfiles_AvatarChoose}" /> 
+                <TextBlock Text="{ext:Locale UserProfiles_ButtonChooseAvatar}" /> 
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
index 513715e94..3ff181650 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.Views.User
 
             ((ContentDialog)_parent.Parent).Title =
                 $"{LocaleManager.Instance[LocaleKeys.UserProfiles_WindowTitle]} - " +
-                $"{LocaleManager.Instance[LocaleKeys.UserProfiles_AvatarSelectionTitle]}";
+                $"{LocaleManager.Instance[LocaleKeys.UserProfiles_SelectAvatarTitle]}";
 
             _ = Task.Run(() =>
             {
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
index 670b35be5..1d6f1e66f 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
@@ -55,7 +55,7 @@ namespace Ryujinx.Ava.UI.Views.User
                 }
 
                 DataContext = ViewModel = new UserSaveManagerViewModel(_accountManager);
-                ((ContentDialog)_parent.Parent).Title = $"{LocaleManager.Instance[LocaleKeys.UserProfiles_WindowTitle]} - {ViewModel.UserProfiles_SaveManagerHeading}";
+                ((ContentDialog)_parent.Parent).Title = $"{LocaleManager.Instance[LocaleKeys.UserProfiles_WindowTitle]} - {ViewModel.SaveManagerTitle}";
 
                 Task.Run(LoadSaves);
             }
@@ -127,7 +127,7 @@ namespace Ryujinx.Ava.UI.Views.User
             {
                 if (button.DataContext is SaveModel saveModel)
                 {
-                    UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance[LocaleKeys.UserProfiles_DeleteUserSave],
+                    UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance[LocaleKeys.UserProfiles_DeleteSaveNote],
                         LocaleManager.Instance[LocaleKeys.UserProfiles_IrreversibleActionNote],
                         LocaleManager.Instance[LocaleKeys.InputDialogYes],
                         LocaleManager.Instance[LocaleKeys.InputDialogNo],