diff --git a/src/Ryujinx/App.axaml.cs b/src/Ryujinx/App.axaml.cs
index 57adde8b48..a35f156fbf 100644
--- a/src/Ryujinx/App.axaml.cs
+++ b/src/Ryujinx/App.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
@@ -114,12 +115,14 @@ namespace Ryujinx.Ava
 
                 ShowRestartDialog();
             }
+
+            ThemeManager.OnThemeChanged();
         }
 
         /// <summary>
         /// Converts a PlatformThemeVariant value to the corresponding ThemeVariant value.
         /// </summary>
-        private ThemeVariant ConvertThemeVariant(PlatformThemeVariant platformThemeVariant) =>
+        public static ThemeVariant ConvertThemeVariant(PlatformThemeVariant platformThemeVariant) =>
             platformThemeVariant switch
             {
                 PlatformThemeVariant.Dark => ThemeVariant.Dark,
@@ -127,11 +130,15 @@ namespace Ryujinx.Ava
                 _ => ThemeVariant.Default,
             };
 
-        private ThemeVariant DetectSystemTheme()
+        public static ThemeVariant DetectSystemTheme()
         {
-            var colorValues = PlatformSettings.GetColorValues();
+            if (Application.Current is App app)
+            {
+                var colorValues = app.PlatformSettings.GetColorValues();
 
-            return ConvertThemeVariant(colorValues.ThemeVariant);
+                return ConvertThemeVariant(colorValues.ThemeVariant);
+            }
+            return ThemeVariant.Default;
         }
     }
 }
diff --git a/src/Ryujinx/Common/ThemeManager.cs b/src/Ryujinx/Common/ThemeManager.cs
new file mode 100644
index 0000000000..b51006b8c2
--- /dev/null
+++ b/src/Ryujinx/Common/ThemeManager.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Ryujinx.Ava.Common
+{
+    public static class ThemeManager
+    {
+        public static event EventHandler ThemeChanged;
+
+        public static void OnThemeChanged()
+        {
+            ThemeChanged?.Invoke(null, EventArgs.Empty);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
index 6020f40e0c..4b604565b9 100644
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -1,6 +1,8 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using Avalonia.Threading;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Common.Utilities;
 using Ryujinx.UI.Common.Configuration;
@@ -11,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class AboutWindowViewModel : BaseModel
+    public class AboutWindowViewModel : BaseModel, IDisposable
     {
         private Bitmap _githubLogo;
         private Bitmap _discordLogo;
@@ -85,24 +87,38 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public AboutWindowViewModel()
         {
-            Version = Program.Version;
-
-            if (ConfigurationState.Instance.UI.BaseStyle.Value == "Light")
-            {
-                GithubLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_GitHub_Light.png?assembly=Ryujinx.UI.Common")));
-                DiscordLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_Discord_Light.png?assembly=Ryujinx.UI.Common")));
-                PatreonLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_Patreon_Light.png?assembly=Ryujinx.UI.Common")));
-                TwitterLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_Twitter_Light.png?assembly=Ryujinx.UI.Common")));
-            }
-            else
-            {
-                GithubLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_GitHub_Dark.png?assembly=Ryujinx.UI.Common")));
-                DiscordLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_Discord_Dark.png?assembly=Ryujinx.UI.Common")));
-                PatreonLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_Patreon_Dark.png?assembly=Ryujinx.UI.Common")));
-                TwitterLogo = new Bitmap(AssetLoader.Open(new Uri("resm:Ryujinx.UI.Common.Resources.Logo_Twitter_Dark.png?assembly=Ryujinx.UI.Common")));
-            }
-
+            UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
             Dispatcher.UIThread.InvokeAsync(DownloadPatronsJson);
+
+            ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
+        }
+
+        private void ThemeManager_ThemeChanged(object sender, EventArgs e)
+        {
+            Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value));
+        }
+
+        private void UpdateLogoTheme(string theme)
+        {
+            bool isDarkTheme = theme == "Dark" || (theme == "Auto" && App.DetectSystemTheme() == ThemeVariant.Dark);
+
+            string basePath = "resm:Ryujinx.UI.Common.Resources.";
+            string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png";
+
+            GithubLogo = LoadBitmap($"{basePath}Logo_GitHub_{themeSuffix}?assembly=Ryujinx.UI.Common");
+            DiscordLogo = LoadBitmap($"{basePath}Logo_Discord_{themeSuffix}?assembly=Ryujinx.UI.Common");
+            PatreonLogo = LoadBitmap($"{basePath}Logo_Patreon_{themeSuffix}?assembly=Ryujinx.UI.Common");
+            TwitterLogo = LoadBitmap($"{basePath}Logo_Twitter_{themeSuffix}?assembly=Ryujinx.UI.Common");
+        }
+
+        private Bitmap LoadBitmap(string uri)
+        {
+            return new Bitmap(Avalonia.Platform.AssetLoader.Open(new Uri(uri)));
+        }
+
+        public void Dispose()
+        {
+            ThemeManager.ThemeChanged -= ThemeManager_ThemeChanged;
         }
 
         private async Task DownloadPatronsJson()