diff --git a/assets/locales.json b/assets/locales.json
index 0d71c95bd..5f6887690 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -25067,6 +25067,56 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "SetupWizardKeysPageHelpText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Not sure how to get your keys?",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardKeysPageSkipText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Skipped setting up keys as you already have a valid key installation and did not choose a folder to install from.\nClick '{0}' if you wish to reinstall your keys.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SetupWizardFirmwarePageTitle",
       "Translations": {
@@ -25217,6 +25267,156 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "SetupWizardFirmwarePageInstallSuccessNotificationTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Firmware installed",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardFirmwarePageInstallSuccessNotificationText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Installed firmware version {0}.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardFirmwarePageInstallFailNotificationTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Firmware not installed",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardFirmwarePageInstallFailNotificationText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "It seems some error occurred when trying to install the firmware at path '{0}'.\nDid that folder contain a firmware dump?",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardFirmwarePageHelpText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Not sure how to get your firmware off of your Switch?",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardFirmwarePageSkipText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Skipped setting up firmware as you already have a valid firmware installation and did not choose a folder or file to install from.\nClick '{0}' if you wish to overwrite your firmware.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SetupWizardGameDirsPageTitle",
       "Translations": {
@@ -25242,6 +25442,81 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "SetupWizardGameDirsPageDescription",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "{0} can be pointed at any number of folders to look for your games, updates, and DLC content.\nAt least one folder must be specified in game directories before continuing.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardGameDirsPageNoFoldersSelectedError",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "At least one folder for games must be selected; otherwise the UI will be empty.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SetupWizardGameDirsPageHelpText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Not sure how to get your games, updates, and/or DLC onto your PC?",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SetupWizardFinalPageTitle",
       "Translations": {
@@ -25316,6 +25591,31 @@
         "zh_CN": "",
         "zh_TW": ""
       }
+    },
+    {
+      "ID": "SetupWizardHelpLinkButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Click here to view a guide.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
     }
   ]
 }
diff --git a/src/Ryujinx/Common/LocaleManager.cs b/src/Ryujinx/Common/LocaleManager.cs
index bc9cfdf15..232af714d 100644
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -38,6 +38,7 @@ namespace Ryujinx.Ava.Common.Locale
                 { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
                 { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
                 { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
+                { LocaleKeys.SetupWizardGameDirsPageDescription, [RyujinxApp.FullAppName] },
                 { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityDatabase.Entries.Length] },
                 { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.Entries.Length] }
             });
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/Final/SetupFinishedPage.axaml b/src/Ryujinx/UI/SetupWizard/Pages/Final/SetupFinishedPage.axaml
index 79f861b2a..8383dc7e7 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/Final/SetupFinishedPage.axaml
+++ b/src/Ryujinx/UI/SetupWizard/Pages/Final/SetupFinishedPage.axaml
@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:markup="clr-namespace:Ryujinx.Ava.Common.Markup"
+             xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
              xmlns:pages="clr-namespace:Ryujinx.Ava.UI.SetupWizard.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="pages:SetupFinishedPageContext"
@@ -18,7 +18,7 @@
             VerticalAlignment="Stretch"
             CornerRadius="5"
             Background="{DynamicResource AppListBackgroundColor}">
-            <TextBlock Margin="15" Text="{markup:Locale SetupWizardFinalPageDescription}" TextAlignment="Center" TextWrapping="Wrap" />
+            <TextBlock Margin="15" Text="{ext:Locale SetupWizardFinalPageDescription}" TextAlignment="Center" TextWrapping="Wrap" />
         </Border>
         <Button Grid.Row="1"
                 VerticalAlignment="Bottom"
@@ -30,7 +30,7 @@
                 Click="Button_OnClick"
                 CornerRadius="5"
                 Tag="https://discord.gg/PEuzjrFXUA"
-                ToolTip.Tip="{markup:Locale AboutDiscordUrlTooltipMessage}">
+                ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}">
             <StackPanel Orientation="Horizontal" Spacing="5">
                 <Image Source="{Binding OwningWizard.DiscordLogo}" />
                 <TextBlock Text="Discord"/>
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePage.axaml b/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePage.axaml
index 1549cf17a..edf49b204 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePage.axaml
+++ b/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePage.axaml
@@ -2,22 +2,22 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:markup="clr-namespace:Ryujinx.Ava.Common.Markup"
+             xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
              xmlns:pages="clr-namespace:Ryujinx.Ava.UI.SetupWizard.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="pages:SetupFirmwarePageContext"
              x:Class="Ryujinx.Ava.UI.SetupWizard.Pages.SetupFirmwarePage">
     <StackPanel>
-        <TextBlock Text="{markup:Locale SetupWizardFirmwarePageDescription}"/>
+        <TextBlock Text="{ext:Locale SetupWizardFirmwarePageDescription}"/>
         <Grid ColumnDefinitions="*" RowDefinitions="*,Auto">
             <TextBox Name="FirmwarePathField" Margin="0, 10, 0, 5" Text="{Binding FirmwareSourcePath}" IsReadOnly="True" />
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="3.5">
                 <Button
-                        Content="{markup:Locale SetupWizardFirmwarePageFolderBrowse}"
+                        Content="{ext:Locale SetupWizardFirmwarePageFolderBrowse}"
                         Command="{Binding BrowseFolderCommand}"
                         CommandParameter="{Binding #FirmwarePathField}"/>
                 <Button
-                        Content="{markup:Locale SetupWizardFirmwarePageFileBrowse}"
+                        Content="{ext:Locale SetupWizardFirmwarePageFileBrowse}"
                         Command="{Binding BrowseFileCommand}"
                         CommandParameter="{Binding #FirmwarePathField}"/>
             </StackPanel>
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePageContext.cs b/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePageContext.cs
index 8d1d4439e..3bd78956c 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePageContext.cs
+++ b/src/Ryujinx/UI/SetupWizard/Pages/Fw/SetupFirmwarePageContext.cs
@@ -19,39 +19,40 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
 {
     public partial class SetupFirmwarePageContext() : SetupWizardPageContext(LocaleKeys.SetupWizardFirmwarePageTitle)
     {
-        [ObservableProperty]
-        public partial string FirmwareSourcePath { get; set; }
+        [ObservableProperty] public partial string FirmwareSourcePath { get; set; }
 
         [RelayCommand]
         private static async Task BrowseFile(TextBox tb)
         {
-            Optional<IStorageFile> result = await RyujinxApp.MainWindow.ViewModel.StorageProvider.OpenSingleFilePickerAsync(new FilePickerOpenOptions
-            {
-                Title = LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageFilePopupTitle],
-                FileTypeFilter = new List<FilePickerFileType>
-                {
-                    new(LocaleManager.Instance[LocaleKeys.FileDialogAllTypes])
+            Optional<IStorageFile> result =
+                await RyujinxApp.MainWindow.ViewModel.StorageProvider.OpenSingleFilePickerAsync(
+                    new FilePickerOpenOptions
                     {
-                        Patterns = ["*.xci", "*.zip"],
-                        AppleUniformTypeIdentifiers = ["com.ryujinx.xci", "public.zip-archive"],
-                        MimeTypes = ["application/x-nx-xci", "application/zip"],
-                    },
-                    new("XCI")
-                    {
-                        Patterns = ["*.xci"],
-                        AppleUniformTypeIdentifiers = ["com.ryujinx.xci"],
-                        MimeTypes = ["application/x-nx-xci"],
-                    },
-                    new("ZIP")
-                    {
-                        Patterns = ["*.zip"],
-                        AppleUniformTypeIdentifiers = ["public.zip-archive"],
-                        MimeTypes = ["application/zip"],
-                    }
-                }
-            });
+                        Title = LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageFilePopupTitle],
+                        FileTypeFilter = new List<FilePickerFileType>
+                        {
+                            new(LocaleManager.Instance[LocaleKeys.FileDialogAllTypes])
+                            {
+                                Patterns = ["*.xci", "*.zip"],
+                                AppleUniformTypeIdentifiers = ["com.ryujinx.xci", "public.zip-archive"],
+                                MimeTypes = ["application/x-nx-xci", "application/zip"],
+                            },
+                            new("XCI")
+                            {
+                                Patterns = ["*.xci"],
+                                AppleUniformTypeIdentifiers = ["com.ryujinx.xci"],
+                                MimeTypes = ["application/x-nx-xci"],
+                            },
+                            new("ZIP")
+                            {
+                                Patterns = ["*.zip"],
+                                AppleUniformTypeIdentifiers = ["public.zip-archive"],
+                                MimeTypes = ["application/zip"],
+                            }
+                        }
+                    });
 
-            if (result.TryGet(out IStorageFile firmwareFile)) 
+            if (result.TryGet(out IStorageFile firmwareFile))
             {
                 tb.Text = firmwareFile.TryGetLocalPath();
             }
@@ -60,12 +61,14 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
         [RelayCommand]
         private static async Task BrowseFolder(TextBox tb)
         {
-            Optional<IStorageFolder> result = await RyujinxApp.MainWindow.ViewModel.StorageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions 
-            {
-                Title = LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageFolderPopupTitle]
-            });
+            Optional<IStorageFolder> result =
+                await RyujinxApp.MainWindow.ViewModel.StorageProvider.OpenSingleFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageFolderPopupTitle]
+                    });
 
-            if (result.TryGet(out IStorageFolder firmwareFolder)) 
+            if (result.TryGet(out IStorageFolder firmwareFolder))
             {
                 tb.Text = firmwareFolder.TryGetLocalPath();
             }
@@ -81,14 +84,14 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
 
             grid.Children.Add(new TextBlock
             {
-                Text = "Not sure how to get your firmware off of your Switch?",
+                Text = LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageHelpText],
                 HorizontalAlignment = HorizontalAlignment.Center,
                 GridRow = 0
             });
 
             grid.Children.Add(new HyperlinkButton
             {
-                Content = "Click here to view a guide.",
+                Content = LocaleManager.Instance[LocaleKeys.SetupWizardHelpLinkButton],
                 NavigateUri = new Uri(SharedConstants.DumpFirmwareWikiUrl),
                 HorizontalAlignment = HorizontalAlignment.Center,
                 GridRow = 1
@@ -102,8 +105,12 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
             if (string.IsNullOrEmpty(FirmwareSourcePath) && RyujinxSetupWizard.HasFirmware)
             {
                 NotificationManager.Information(
-                    title: LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle],
-                    "Skipped setting up firmware as you already have a valid firmware installation and did not choose a folder or file to install from.\n\nClick 'Back' if you wish to overwrite your firmware.");
+                    title: LocaleManager.Instance[LocaleKeys.RyujinxInfo],
+                    text: LocaleManager.GetFormatted(
+                        LocaleKeys.SetupWizardFirmwarePageSkipText,
+                        LocaleManager.Instance[LocaleKeys.SetupWizardActionBack]
+                    )
+                );
                 return Result.Success; // This handles the user selecting no file/dir and just hitting Next.
             }
 
@@ -117,18 +124,24 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
                 if (installedFwVer != null)
                 {
                     NotificationManager.Information(
-                        "Firmware installed",
-                        $"Installed firmware version {installedFwVer.VersionString}."
+                        LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageInstallSuccessNotificationTitle],
+                        LocaleManager.GetFormatted(
+                            LocaleKeys.SetupWizardFirmwarePageInstallSuccessNotificationTitle,
+                            installedFwVer.VersionString
+                        )
                     );
                 }
                 else
                 {
                     NotificationManager.Error(
-                        "Firmware not installed",
-                        $"It seems some error occurred when trying to install the firmware at path '{FirmwareSourcePath}'." +
-                        "\nDid that folder contain a firmware dump?"
+                        LocaleManager.Instance[LocaleKeys.SetupWizardFirmwarePageInstallFailNotificationTitle],
+                        LocaleManager.GetFormatted(
+                            LocaleKeys.SetupWizardFirmwarePageInstallFailNotificationText,
+                            FirmwareSourcePath
+                        )
                     );
                 }
+
                 RyujinxApp.MainWindow.ViewModel.RefreshFirmwareStatus(installedFwVer, allowNullVersion: true);
 
                 // Purge Applet Cache.
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPage.axaml b/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPage.axaml
index 8d05e0656..28479e3e3 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPage.axaml
+++ b/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPage.axaml
@@ -11,8 +11,8 @@
         Margin="10"
         Spacing="10"
         Orientation="Vertical" HorizontalAlignment="Stretch">
+        <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SetupWizardGameDirsPageDescription}" />
         <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
-
         <StackPanel
             Margin="10,0,0,0"
             HorizontalAlignment="Stretch"
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs b/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs
index e5c166ee8..862d2fffd 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs
+++ b/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs
@@ -27,8 +27,8 @@ namespace Ryujinx.UI.SetupWizard.Pages
         {
             if (GameDirs.Count is 0)
             {
-                NotificationManager.Error("At least one folder for games must be selected; otherwise the UI will be empty.");
-                return Result.Failure(RetryError.Shared);
+                NotificationManager.Error(LocaleManager.Instance[LocaleKeys.SetupWizardGameDirsPageNoFoldersSelectedError]);
+                return Result.Fail;
             }
 
             ConfigurationState.Instance.UI.GameDirs.Value = GameDirs.ToList();
@@ -49,14 +49,14 @@ namespace Ryujinx.UI.SetupWizard.Pages
 
             grid.Children.Add(new TextBlock
             {
-                Text = "Not sure how to get your games, updates, and/or DLC onto your PC?",
+                Text = LocaleManager.Instance[LocaleKeys.SetupWizardGameDirsPageHelpText],
                 HorizontalAlignment = HorizontalAlignment.Center,
                 GridRow = 0
             });
 
             grid.Children.Add(new HyperlinkButton
             {
-                Content = "Click here to view a guide.",
+                Content = LocaleManager.Instance[LocaleKeys.SetupWizardHelpLinkButton],
                 HorizontalAlignment = HorizontalAlignment.Center,
                 NavigateUri = new Uri(SharedConstants.DumpContentWikiUrl),
                 GridRow = 1
@@ -65,9 +65,4 @@ namespace Ryujinx.UI.SetupWizard.Pages
             return grid;
         }
     }
-
-    public struct RetryError : IErrorState
-    {
-        public static readonly RetryError Shared = new();
-    }
 }
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPage.axaml b/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPage.axaml
index d24e86687..d533c750f 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPage.axaml
+++ b/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPage.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pages="clr-namespace:Ryujinx.Ava.UI.SetupWizard.Pages"
-             xmlns:markup="clr-namespace:Ryujinx.Ava.Common.Markup"
+             xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ryujinx.Ava.UI.SetupWizard.Pages.SetupKeysPage"
              x:DataType="pages:SetupKeysPageContext">
     <StackPanel>
-        <TextBlock Text="{markup:Locale SetupWizardKeysPageDescription}" Margin="0,0,0,10"/>
+        <TextBlock Text="{ext:Locale SetupWizardKeysPageDescription}" Margin="0,0,0,10"/>
         <Grid ColumnDefinitions="*,Auto">
             <TextBox Name="KeysFolderPathField" Text="{Binding KeysFolderPath}" IsReadOnly="True" />
             <Button Grid.Column="1"
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPageContext.cs b/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPageContext.cs
index 3deed115d..11203d8bc 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPageContext.cs
+++ b/src/Ryujinx/UI/SetupWizard/Pages/Keys/SetupKeysPageContext.cs
@@ -31,14 +31,14 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
 
             grid.Children.Add(new TextBlock
             {
-                Text = "Not sure how to get your keys?",
+                Text = LocaleManager.Instance[LocaleKeys.SetupWizardKeysPageHelpText],
                 HorizontalAlignment = HorizontalAlignment.Center,
                 GridRow = 0
             });
 
             grid.Children.Add(new HyperlinkButton
             {
-                Content = "Click here to view a guide.",
+                Content = LocaleManager.Instance[LocaleKeys.SetupWizardHelpLinkButton],
                 HorizontalAlignment = HorizontalAlignment.Center,
                 NavigateUri = new Uri(SharedConstants.DumpKeysWikiUrl),
                 GridRow = 1
@@ -70,8 +70,11 @@ namespace Ryujinx.Ava.UI.SetupWizard.Pages
             if (string.IsNullOrEmpty(KeysFolderPath) && RyujinxApp.MainWindow.VirtualFileSystem.HasKeySet)
             {
                 NotificationManager.Information(
-                    title: LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle],
-                    "Skipped setting up keys as you already have a valid key installation and did not choose a folder to install from.\n\nClick 'Back' if you wish to reinstall your keys.");
+                    title: LocaleManager.Instance[LocaleKeys.RyujinxInfo],
+                    text: LocaleManager.GetFormatted(
+                        LocaleKeys.SetupWizardKeysPageSkipText,
+                        LocaleManager.Instance[LocaleKeys.SetupWizardActionBack]
+                    ));
                 return Result.Success; // This handles the user selecting no folder and just hitting Next.
             }
 
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.Steps.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.Steps.cs
index b3fd68e3a..6439003ef 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.Steps.cs
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.Steps.cs
@@ -68,12 +68,7 @@ namespace Ryujinx.Ava.UI.SetupWizard
             if (!result)
                 return false;
 
-            var res = gdContext.CompleteStep();
-
-            if (res.IsOf<RetryError>())
-                return false;
-
-            if (!res)
+            if (!gdContext.CompleteStep())
                 goto Retry;
 
             return true;
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
index 5db3f724f..18209f0ac 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
@@ -62,7 +62,7 @@ namespace Ryujinx.Ava.UI.SetupWizard
                 // Fuck it, weird window height hack to do it instead.
                 // 120 is not exact, just a random number. Looks fine though.
                 NotificationPosition.TopCenter,
-                margin: new Thickness(0, _window.Height - 120, 0, 0)
+                margin: new Thickness(0, _window.Height - 135, 0, 0)
             );
 
             RyujinxSetupWizardWindow.IsOpen = true;
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
index def67a1c6..d04c6f391 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:markup="clr-namespace:Ryujinx.Ava.Common.Markup"
+        xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
         xmlns:windows="clr-namespace:Ryujinx.Ava.UI.Windows"
         xmlns:setupWizard="clr-namespace:Ryujinx.Ava.UI.SetupWizard"
         xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
@@ -10,10 +10,10 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Ryujinx.Ava.UI.SetupWizard.RyujinxSetupWizardWindow"
         x:DataType="setupWizard:RyujinxSetupWizard"
-        Title="{markup:Locale SetupWizardFirstPageTitle}">
+        Title="{ext:Locale SetupWizardFirstPageTitle}">
     <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="Auto,*">
         <Grid Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Name="FlushControls">
-            <controls:RyujinxLogo ToolTip.Tip="{markup:Locale SetupWizardFirstPageTitle}"/>
+            <controls:RyujinxLogo ToolTip.Tip="{ext:Locale SetupWizardFirstPageTitle}"/>
         </Grid>
         <ContentPresenter Grid.Row="1" Name="WizardPresenter"/>
     </Grid>