3 files changed, 3 insertions, 101 deletions
diff --git a/Ryujinx/Modules/DiscordIntegrationModule.cs b/Ryujinx/Modules/DiscordIntegrationModule.cs
deleted file mode 100644
index d890a4c8..00000000
--- a/Ryujinx/Modules/DiscordIntegrationModule.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using DiscordRPC;
-using Ryujinx.Common;
-using Ryujinx.Configuration;
-using System;
-
-namespace Ryujinx.Modules
-{
-    static class DiscordIntegrationModule
-    {
-        private const string Description = "A simple, experimental Nintendo Switch emulator.";
-        private const string CliendId    = "568815339807309834";
-
-        private static DiscordRpcClient _discordClient;
-        private static RichPresence     _discordPresenceMain;
-
-        public static void Initialize()
-        {
-            _discordPresenceMain = new RichPresence
-            {
-                Assets = new Assets
-                {
-                    LargeImageKey  = "ryujinx",
-                    LargeImageText = Description
-                },
-                Details    = "Main Menu",
-                State      = "Idling",
-                Timestamps = Timestamps.Now,
-                Buttons    = new Button[]
-                {
-                    new Button()
-                    { 
-                        Label = "Website", 
-                        Url   = "https://ryujinx.org/"
-                    }
-                }
-            };
-
-            ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
-        }
-
-        private static void Update(object sender, ReactiveEventArgs<bool> evnt)
-        {
-            if (evnt.OldValue != evnt.NewValue)
-            {
-                // If the integration was active, disable it and unload everything
-                if (evnt.OldValue)
-                {
-                    _discordClient?.Dispose();
-
-                    _discordClient = null;
-                }
-
-                // If we need to activate it and the client isn't active, initialize it
-                if (evnt.NewValue && _discordClient == null)
-                {
-                    _discordClient = new DiscordRpcClient(CliendId);
-
-                    _discordClient.Initialize();
-                    _discordClient.SetPresence(_discordPresenceMain);
-                }
-            }
-        }
-
-        public static void SwitchToPlayingState(string titleId, string titleName)
-        {
-            _discordClient?.SetPresence(new RichPresence
-            {
-                Assets = new Assets
-                {
-                    LargeImageKey  = "game",
-                    LargeImageText = titleName,
-                    SmallImageKey  = "ryujinx",
-                    SmallImageText = Description,
-                },
-                Details    = $"Playing {titleName}",
-                State      = (titleId == "0000000000000000") ? "Homebrew" : titleId.ToUpper(),
-                Timestamps = Timestamps.Now,
-                Buttons    = new Button[]
-                {
-                    new Button()
-                    {
-                        Label = "Website",
-                        Url   = "https://ryujinx.org/"
-                    }
-                }
-            });
-        }
-
-        public static void SwitchToMainMenu()
-        {
-            _discordClient?.SetPresence(_discordPresenceMain);
-        }
-
-        public static void Exit()
-        {
-            _discordClient?.Dispose();
-        }
-    }
-}
-\ No newline at end of file
diff --git a/Ryujinx/Modules/Updater/UpdateDialog.cs b/Ryujinx/Modules/Updater/UpdateDialog.cs
index 385b3357..5e5ef84d 100644
--- a/Ryujinx/Modules/Updater/UpdateDialog.cs
+++ b/Ryujinx/Modules/Updater/UpdateDialog.cs
@@ -1,6 +1,7 @@
 using Gdk;
 using Gtk;
 using Ryujinx.Ui;
+using Ryujinx.Ui.Common.Configuration;
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -31,7 +32,7 @@ namespace Ryujinx.Modules
             _mainWindow = mainWindow;
             _buildUrl   = buildUrl;
 
-            Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
+            Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
             MainText.Text      = "Do you want to update Ryujinx to the latest version?";
             SecondaryText.Text = $"{Program.Version} -> {newVersion}";
 
diff --git a/Ryujinx/Modules/Updater/Updater.cs b/Ryujinx/Modules/Updater/Updater.cs
index bf5f54ed..ded12620 100644
--- a/Ryujinx/Modules/Updater/Updater.cs
+++ b/Ryujinx/Modules/Updater/Updater.cs
@@ -118,7 +118,7 @@ namespace Ryujinx.Modules
                         string assetState = (string)asset["state"];
                         string downloadURL = (string)asset["browser_download_url"];
 
-                        if (!assetName.StartsWith("ryujinx-headless-sdl2") && assetName.EndsWith(_platformExt))
+                        if (assetName.StartsWith("ryujinx") && assetName.EndsWith(_platformExt))
                         {
                             _buildUrl = downloadURL;