diff --git a/UI/DiscordIntegration.cpp b/UI/DiscordIntegration.cpp
index 542fa1047c..840fbe66ea 100644
--- a/UI/DiscordIntegration.cpp
+++ b/UI/DiscordIntegration.cpp
@@ -7,6 +7,7 @@
 #include "Core/Config.h"
 #include "UI/DiscordIntegration.h"
 #include "Common/Data/Text/I18n.h"
+#include "Common/System/System.h"
 
 #if (PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(LINUX)) && !PPSSPP_PLATFORM(ANDROID) && !PPSSPP_PLATFORM(UWP)
 
@@ -116,11 +117,7 @@ void Discord::SetPresenceGame(std::string_view gameTitle) {
 	discordPresence.details = sc->T_cstr("Playing");
 	discordPresence.startTimestamp = time(0);
 	discordPresence.largeImageText = "PPSSPP is the best PlayStation Portable emulator around!";
-#ifdef GOLD
-	discordPresence.largeImageKey = "icon_gold_png";
-#else
-	discordPresence.largeImageKey = "icon_regular_png";
-#endif
+	discordPresence.largeImageKey = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "icon_gold_png" : "icon_regular_png";
 	Discord_UpdatePresence(&discordPresence);
 #endif
 }
@@ -141,12 +138,7 @@ void Discord::SetPresenceMenu() {
 	discordPresence.details = "";
 	discordPresence.startTimestamp = time(0);
 	discordPresence.largeImageText = "PPSSPP is the best PlayStation Portable emulator around!";
-#ifdef GOLD
-	discordPresence.largeImageKey = "icon_gold_png";
-#else
-	discordPresence.largeImageKey = "icon_regular_png";
-#endif
-	Discord_UpdatePresence(&discordPresence);
+	discordPresence.largeImageKey = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "icon_gold_png" : "icon_regular_png";
 #endif
 }
 
diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp
index fffb2f8321..166c74275d 100644
--- a/UI/MemStickScreen.cpp
+++ b/UI/MemStickScreen.cpp
@@ -136,11 +136,11 @@ static void AddExplanation(UI::ViewGroup *viewGroup, MemStickScreen::Choice choi
 		holder->Add(new TextView(iz->T("DataWillBeLostOnUninstall", "Warning! Data will be lost when you uninstall PPSSPP!"), flags, false))->SetBullet(true);
 		holder->Add(new TextView(iz->T("DataCannotBeShared", "Data CANNOT be shared between PPSSPP regular/Gold!"), flags, false))->SetBullet(true);
 #if !PPSSPP_PLATFORM(UWP)
-#if GOLD
-		holder->Add(new TextView(iz->T("USBAccessThroughGold", "USB access through Android/data/org.ppsspp.ppssppgold/files"), flags, false))->SetBullet(true);
-#else
-		holder->Add(new TextView(iz->T("USBAccessThrough", "USB access through Android/data/org.ppsspp.ppsspp/files"), flags, false))->SetBullet(true);
-#endif
+		if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
+			holder->Add(new TextView(iz->T("USBAccessThroughGold", "USB access through Android/data/org.ppsspp.ppssppgold/files"), flags, false))->SetBullet(true);
+		} else {
+			holder->Add(new TextView(iz->T("USBAccessThrough", "USB access through Android/data/org.ppsspp.ppsspp/files"), flags, false))->SetBullet(true);
+		}
 #endif
 		break;
 	case MemStickScreen::CHOICE_SET_MANUAL:
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 3100dea610..b116d4d2c3 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -162,6 +162,7 @@ namespace MainWindow {
 		return initialMenuKeys[menuID];
 	}
 
+	// TODO: Why isn't this just defined in the resoucre
 	void CreateHelpMenu(HMENU menu) {
 		auto des = GetI18NCategory(I18NCat::DESKTOPUI);
 
@@ -178,7 +179,9 @@ namespace MainWindow {
 		AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_OPENWEBSITE, visitMainWebsite.c_str());
 		AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_OPENFORUM, visitForum.c_str());
 		// Repeat the process for other languages, if necessary.
-		AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_BUYGOLD, buyGold.c_str());
+		if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) {
+			AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_BUYGOLD, buyGold.c_str());
+		}
 		AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_GITHUB, gitHub.c_str());
 		AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_DISCORD, discord.c_str());
 		AppendMenu(helpMenu, MF_SEPARATOR, 0, 0);