diff --git a/Common/UI/View.cpp b/Common/UI/View.cpp
index be4a31ee52..08659568aa 100644
--- a/Common/UI/View.cpp
+++ b/Common/UI/View.cpp
@@ -604,8 +604,9 @@ void InfoItem::Draw(UIContext &dc) {
 	dc.SetFontStyle(dc.GetTheme().uiFont);
 	dc.DrawTextRect(text_, padBounds, style.fgColor, ALIGN_VCENTER);
 
+	// The info item should not look too clickable even if it has a background. Make the right side dimmed a little.
 	Bounds rightBounds(padBounds.x + leftWidth, padBounds.y, padBounds.w - leftWidth, padBounds.h);
-	dc.DrawTextRect(rightText_, rightBounds, style.fgColor, ALIGN_VCENTER | ALIGN_RIGHT | FLAG_WRAP_TEXT);
+	dc.DrawTextRect(rightText_, rightBounds, alphaMul(style.fgColor, 0.75f), ALIGN_VCENTER | ALIGN_RIGHT | FLAG_WRAP_TEXT);
 }
 
 std::string InfoItem::DescribeText() const {
diff --git a/UI/DeveloperSettingsPages.cpp b/UI/DeveloperSettingsPages.cpp
index 82ac37b5dc..1646226516 100644
--- a/UI/DeveloperSettingsPages.cpp
+++ b/UI/DeveloperSettingsPages.cpp
@@ -233,8 +233,6 @@ static void BuildGeneralPage(SettingsPage *page) {
 		host->PageScreenManager()->push(new GPIGPOScreen(T(I18NCat::DEVELOPER, "GPI/GPO switches/LEDs")));
 	});
 
-	page->Setting(&g_Config.bShowSaveLoadIndicator);
-
 #if PPSSPP_PLATFORM(ANDROID)
 	page->Setting(&g_Config.iDisplayFramerateMode).EnabledFunc([]() {
 		return System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 30;
diff --git a/UI/Settings/GeneralPage.cpp b/UI/Settings/GeneralPage.cpp
index 9664efbadc..a539036d50 100644
--- a/UI/Settings/GeneralPage.cpp
+++ b/UI/Settings/GeneralPage.cpp
@@ -154,6 +154,12 @@ static void BuildUISettingsPage(SettingsPage *page) {
 	using namespace UI;
 	SettingsPageHost *host = page->Host();
 
+	// Shared with achievements.
+	page->Header();
+	page->Setting(&g_Config.iNotificationPos);
+	page->Setting(&g_Config.bShowSaveLoadIndicator);
+
+	page->Header();
 	// The UI context is looked up when used, since it's recreated along with the graphics.
 	page->Setting(&g_Config.iUIScaleFactor).OnChange([host](UI::EventParams &e) {
 		const float dpiMul = UIScaleFactorToMultiplier(g_Config.iUIScaleFactor);
@@ -162,6 +168,7 @@ static void BuildUISettingsPage(SettingsPage *page) {
 		NativeResized();
 	});
 
+	page->Header();
 	const Path bgPng = GetSysDirectory(DIRECTORY_SYSTEM) / "background.png";
 	const Path bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) / "background.jpg";
 	if (File::Exists(bgPng) || File::Exists(bgJpg)) {
@@ -175,13 +182,9 @@ static void BuildUISettingsPage(SettingsPage *page) {
 	}
 
 	page->Setting(&g_Config.bTransparentBackground);
-
-	// Shared with achievements.
-
-	page->Setting(&g_Config.iNotificationPos);
-
 	page->Setting(&g_Config.iBackgroundAnimation);
 
+	page->Header();
 	page->Custom("Theme", [host](UI::ViewGroup *parent) -> UI::View * {
 		PopupMultiChoiceDynamic *theme = parent->Add(new PopupMultiChoiceDynamic(&g_Config.sThemeName, T(I18NCat::SYSTEM, "Theme"), GetThemeInfoNames(), I18NCat::THEMES, host->PageScreenManager()));
 		theme->OnChoice.Add([](EventParams &e) {