diff --git a/Common/System/System.h b/Common/System/System.h
index cbd2ecb780..6c945be000 100644
--- a/Common/System/System.h
+++ b/Common/System/System.h
@@ -302,8 +302,8 @@ void System_AudioClear();
 // These samples really have 16 bits of value, but can be a little out of range.
 // This is for pushing rate-controlled 44khz audio from emulation.
 // If you push a little too fast, we'll pitch up to a limit, for example.
-// Volume is a 12-bit multiplier.
-void System_AudioPushSamples(const int32_t *audio, int numSamples, int volume);
+// Volume is a unit-range multiplier.
+void System_AudioPushSamples(const int32_t *audio, int numSamples, float volume);
 
 inline void System_AudioResetStatCounters() {
 	return System_AudioGetDebugStats(nullptr, 0);
diff --git a/Common/UI/Root.cpp b/Common/UI/Root.cpp
index 25cb5a7e0a..b2e2a56967 100644
--- a/Common/UI/Root.cpp
+++ b/Common/UI/Root.cpp
@@ -17,8 +17,7 @@ static View *focusedView;
 static bool focusMovementEnabled;
 bool focusForced;
 
-static std::function<void(UISound, float)> soundCallback;
-static bool soundEnabled = true;
+static std::function<void(UISound)> soundCallback;
 
 struct DispatchQueueItem {
 	Event *e;
@@ -126,17 +125,13 @@ static void MoveFocus(ViewGroup *root, FocusDirection direction) {
 	}
 }
 
-void SetSoundEnabled(bool enabled) {
-	soundEnabled = enabled;
-}
-
-void SetSoundCallback(std::function<void(UISound, float)> func) {
+void SetSoundCallback(std::function<void(UISound)> func) {
 	soundCallback = func;
 }
 
-void PlayUISound(UISound sound, float volume) {
-	if (soundEnabled && soundCallback) {
-		soundCallback(sound, volume);
+void PlayUISound(UISound sound) {
+	if (soundCallback) {
+		soundCallback(sound);
 	}
 }
 
diff --git a/Common/UI/Root.h b/Common/UI/Root.h
index 2c79777af3..625204b774 100644
--- a/Common/UI/Root.h
+++ b/Common/UI/Root.h
@@ -48,11 +48,10 @@ enum class UISound {
 	COUNT,
 };
 
-void SetSoundEnabled(bool enabled);
-void SetSoundCallback(std::function<void(UISound, float)> func);
+void SetSoundCallback(std::function<void(UISound)> func);
 
 // This is only meant for actual UI navigation sound, not achievements.
 // Call directly into the player for other UI effects.
-void PlayUISound(UISound sound, float volume = 0.25f);
+void PlayUISound(UISound sound);
 
 }  // namespace UI
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 1ac2c10a68..118c9de5ad 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -752,8 +752,9 @@ static const ConfigSetting soundSettings[] = {
 
 	ConfigSetting("GlobalVolume", &g_Config.iGameVolume, VOLUME_FULL, CfgFlag::PER_GAME),
 	ConfigSetting("ReverbVolume", &g_Config.iReverbVolume, VOLUME_FULL, CfgFlag::PER_GAME),
-	ConfigSetting("AltSpeedVolume", &g_Config.iAltSpeedVolume, -1, CfgFlag::PER_GAME),
+	ConfigSetting("AltSpeedRelativeVolume", &g_Config.iAltSpeedVolume, VOLUMEHI_FULL, CfgFlag::PER_GAME),
 	ConfigSetting("AchievementSoundVolume", &g_Config.iAchievementSoundVolume, 6, CfgFlag::PER_GAME),
+	ConfigSetting("UIVolume", &g_Config.iUIVolume, 70, CfgFlag::DEFAULT),
 
 	ConfigSetting("AudioDevice", &g_Config.sAudioDevice, "", CfgFlag::DEFAULT),
 	ConfigSetting("AutoAudioDevice", &g_Config.bAutoAudioDevice, true, CfgFlag::DEFAULT),
@@ -1295,12 +1296,14 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
 			vPostShaderNames.push_back(it.second);
 	}
 
-	// Check for an old dpad setting
-	Section *control = iniFile.GetOrCreateSection("Control");
-	float f;
-	control->Get("DPadRadius", &f, 0.0f);
-	if (f > 0.0f) {
-		ResetControlLayout();
+	// Check for an old dpad setting (very obsolete)
+	Section *control = iniFile.GetSection("Control");
+	if (control) {
+		float f;
+		control->Get("DPadRadius", &f, 0.0f);
+		if (f > 0.0f) {
+			ResetControlLayout();
+		}
 	}
 
 	// Force JIT setting to a valid value for the current system configuration.
diff --git a/Core/Config.h b/Core/Config.h
index 31b4216a67..cb82528598 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -286,6 +286,9 @@ public:
 	int iAltSpeedVolume;
 	int iAchievementSoundVolume;
 
+	// Newer volume settings, 0-100
+	int iUIVolume;
+
 	bool bExtraAudioBuffering;  // For bluetooth
 	std::string sAudioDevice;
 	bool bAutoAudioDevice;
diff --git a/Core/ConfigValues.h b/Core/ConfigValues.h
index e2f2fff204..7f743298d5 100644
--- a/Core/ConfigValues.h
+++ b/Core/ConfigValues.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <cstdint>
+#include <cmath>
 #include <string>
 #ifndef _MSC_VER
 #include <strings.h>
@@ -30,6 +31,24 @@ constexpr int PSP_MODEL_SLIM = 1;
 constexpr int PSP_DEFAULT_FIRMWARE = 660;
 constexpr int VOLUME_OFF = 0;
 constexpr int VOLUME_FULL = 10;
+constexpr int VOLUMEHI_FULL = 100;  // for newer volume params. will convert them all later
+
+// This matches exactly the old shift-based curve.
+inline float Volume10ToMultiplier(int volume) {
+	// Allow muting entirely.
+	if (volume <= 0) {
+		return 0.0f;
+	}
+	return powf(2.0f, (float)(volume - 10));
+}
+
+inline float Volume100ToMultiplier(int volume) {
+	// Allow muting entirely.
+	if (volume <= 0) {
+		return 0.0f;
+	}
+	return powf(2.0f, (float)(volume - 100) * 0.1f);
+}
 
 struct ConfigTouchPos {
 	float x;
diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp
index e417ea67c4..19e389ad0b 100644
--- a/Core/HLE/__sceAudio.cpp
+++ b/Core/HLE/__sceAudio.cpp
@@ -414,23 +414,15 @@ void __AudioUpdate(bool resetRecording) {
 	}
 
 	if (g_Config.bEnableSound) {
-		int vol = g_Config.iGlobalVolume;
+		float multiplier = Volume10ToMultiplier(std::clamp(g_Config.iGameVolume, 0, VOLUME_FULL));
 		if (PSP_CoreParameter().fpsLimit != FPSLimit::NORMAL || PSP_CoreParameter().fastForward) {
 			if (g_Config.iAltSpeedVolume != -1) {
-				vol = g_Config.iAltSpeedVolume;
+				// Multiply in the alt speed volume instead of replacing like before.
+				multiplier *= Volume100ToMultiplier(g_Config.iAltSpeedVolume);
 			}
 		}
 
-		vol = std::clamp(vol, 0, VOLUME_FULL);
-
-		// 12-bit volume. So far this isn't any better than the shift, but stay tuned.
-		int volume;
-		if (vol != 0) {
-			volume = 4096 >> (VOLUME_FULL - vol);
-		} else {
-			volume = 0;
-		}
-		System_AudioPushSamples(mixBuffer, hwBlockSize, volume);
+		System_AudioPushSamples(mixBuffer, hwBlockSize, multiplier);
 
 #ifndef MOBILE_DEVICE
 		if (g_Config.bSaveLoadResetsAVdumping && resetRecording) {
diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
index 11d364a327..9817f0e504 100644
--- a/Core/HW/StereoResampler.cpp
+++ b/Core/HW/StereoResampler.cpp
@@ -248,7 +248,7 @@ unsigned int StereoResampler::Mix(short* samples, unsigned int numSamples, bool
 }
 
 // Executes on the emulator thread, pushing sound into the buffer.
-void StereoResampler::PushSamples(const s32 *samples, unsigned int numSamples, int volume) {
+void StereoResampler::PushSamples(const s32 *samples, unsigned int numSamples, float multiplier) {
 	inputSampleCount_ += numSamples;
 
 	UpdateBufferSize();
@@ -274,6 +274,9 @@ void StereoResampler::PushSamples(const s32 *samples, unsigned int numSamples, i
 		return;
 	}
 
+	// 12-bit volume.
+	int volume = (int)(multiplier * 4096.0f);
+
 	// Check if we need to roll over to the start of the buffer during the copy.
 	unsigned int indexW_left_samples = m_maxBufsize * 2 - (indexW & INDEX_MASK);
 	if (numSamples * 2 > indexW_left_samples) {
diff --git a/Core/HW/StereoResampler.h b/Core/HW/StereoResampler.h
index ae1267cc9d..10bc5a9fe6 100644
--- a/Core/HW/StereoResampler.h
+++ b/Core/HW/StereoResampler.h
@@ -36,8 +36,8 @@ public:
 
 	// Called from main thread
 	// This clamps the samples to 16-bit before starting to work on them.
-	// Volume is a 12-bit fixed point multiplier.
-	void PushSamples(const s32* samples, unsigned int num_samples, int volume);
+	// Volume is a multiplier from 0.0f to 1.0f.
+	void PushSamples(const s32* samples, unsigned int num_samples, float volume);
 
 	void Clear();
 
diff --git a/UI/AudioCommon.cpp b/UI/AudioCommon.cpp
index e09a51f0c2..73ee0254e1 100644
--- a/UI/AudioCommon.cpp
+++ b/UI/AudioCommon.cpp
@@ -28,7 +28,7 @@ void System_AudioClear() {
 	g_resampler.Clear();
 }
 
-void System_AudioPushSamples(const int32_t *audio, int numSamples, int volume) {
+void System_AudioPushSamples(const int32_t *audio, int numSamples, float volume) {
 	if (audio) {
 		g_resampler.PushSamples(audio, numSamples, volume);
 	} else {
diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp
index 8912006d35..8dc33b8797 100644
--- a/UI/BackgroundAudio.cpp
+++ b/UI/BackgroundAudio.cpp
@@ -321,7 +321,7 @@ bool BackgroundAudio::Play() {
 	std::lock_guard<std::mutex> lock(mutex_);
 
 	// Immediately stop the sound if it is turned off while playing.
-	if (!g_Config.bEnableSound) {
+	if (g_Config.iUIVolume <= 0) {
 		Clear(true);
 		System_AudioClear();
 		return true;
@@ -332,17 +332,20 @@ bool BackgroundAudio::Play() {
 	if (lastPlaybackTime_ > 0.0 && lastPlaybackTime_ <= now) {
 		sz = (int)((now - lastPlaybackTime_) * 44100);
 	}
+
 	sz = std::min(BUFSIZE / 2, sz);
 	if (at3Reader_) {
 		if (at3Reader_->Read(buffer, sz)) {
 			if (fadingOut_) {
-                float vol = volume_;
-				for (int i = 0; i < sz*2; i += 2) {
-					buffer[i] = (int)((float)buffer[i] * vol);
-					buffer[i + 1] = (int)((float)buffer[i + 1] * vol);
+				float vol = volume_;
+				// TODO: This isn't optimized. But hardly matters...
+				for (int i = 0; i < sz * 2; i += 2) {
+					const float v = vol;
+					buffer[i] = (int)((float)buffer[i] * v);
+					buffer[i + 1] = (int)((float)buffer[i + 1] * v);
 					vol += delta_;
 				}
-                volume_ = vol;
+				volume_ = vol;
 			}
 		}
 	} else {
@@ -352,15 +355,8 @@ bool BackgroundAudio::Play() {
 		}
 	}
 
-	int vol = std::clamp(g_Config.iGlobalVolume, 0, VOLUME_FULL);
-	// 12-bit volume. So far this isn't any better than the shift, but stay tuned.
-	int volume;
-	if (vol != 0) {
-		volume = 4096 >> (VOLUME_FULL - vol);
-	} else {
-		volume = 0;
-	}
-	System_AudioPushSamples(buffer, sz, volume);
+	float multiplier = Volume100ToMultiplier(g_Config.iUIVolume);
+	System_AudioPushSamples(buffer, sz, multiplier);
 
 	if (at3Reader_ && fadingOut_ && volume_ <= 0.0f) {
 		Clear(true);
@@ -554,6 +550,7 @@ void SoundEffectMixer::UpdateSample(UI::UISound sound, Sample *sample) {
 
 void SoundEffectMixer::LoadDefaultSample(UI::UISound sound) {
 	const char *filename = nullptr;
+
 	switch (sound) {
 	case UI::UISound::BACK: filename = "sfx_back.wav"; break;
 	case UI::UISound::SELECT: filename = "sfx_select.wav"; break;
@@ -565,6 +562,7 @@ void SoundEffectMixer::LoadDefaultSample(UI::UISound sound) {
 	default:
 		return;
 	}
+
 	Sample *sample = Sample::Load(filename);
 	if (!sample) {
 		ERROR_LOG(Log::Audio, "Failed to load the default sample for UI sound %d", (int)sound);
@@ -589,12 +587,16 @@ private:
 
 void SoundEffectMixer::Init() {
 	samples_.resize((size_t)UI::UISound::COUNT);
-	UI::SetSoundCallback([](UI::UISound sound, float volume) {
-		g_BackgroundAudio.SFX().Play(sound, volume);
+
+	// Setup UI sound callback. For navigation sounds only.
+	UI::SetSoundCallback([](UI::UISound sound) {
+		if (g_Config.bUISound) {
+			float volume = Volume100ToMultiplier(g_Config.iUIVolume);
+			g_BackgroundAudio.SFX().Play(sound, volume);
+		}
 	});
 
 	// Load samples in the background.
-
 	g_threadManager.EnqueueTask(new SampleLoadTask(this));
 }
 
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 695305a085..b2d409e898 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -630,13 +630,13 @@ void EmuScreen::sendMessage(UIMessage message, const char *value) {
 		}
 	} else if (message == UIMessage::REQUEST_PLAY_SOUND) {
 		if (g_Config.bAchievementsSoundEffects && g_Config.bEnableSound) {
-			float achievementVolume = g_Config.iAchievementSoundVolume * 0.1f;
+			float achievementVolume = Volume10ToMultiplier(g_Config.iAchievementSoundVolume) * Volume100ToMultiplier(g_Config.iGameVolume);
 			// TODO: Handle this some nicer way.
 			if (!strcmp(value, "achievement_unlocked")) {
-				g_BackgroundAudio.SFX().Play(UI::UISound::ACHIEVEMENT_UNLOCKED, achievementVolume * 1.0f);
+				g_BackgroundAudio.SFX().Play(UI::UISound::ACHIEVEMENT_UNLOCKED, achievementVolume);
 			}
 			if (!strcmp(value, "leaderboard_submitted")) {
-				g_BackgroundAudio.SFX().Play(UI::UISound::LEADERBOARD_SUBMITTED, achievementVolume * 1.0f);
+				g_BackgroundAudio.SFX().Play(UI::UISound::LEADERBOARD_SUBMITTED, achievementVolume);
 			}
 		}
 	}
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index f35cabbc35..409b825cf5 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -636,9 +636,6 @@ void GameSettingsScreen::CreateAudioSettings(UI::ViewGroup *audioSettings) {
 	auto ac = GetI18NCategory(I18NCat::ACHIEVEMENTS);
 	auto ms = GetI18NCategory(I18NCat::MAINSETTINGS);
 
-	audioSettings->Add(new ItemHeader(ms->T("Audio")));
-	CheckBox *enableSound = audioSettings->Add(new CheckBox(&g_Config.bEnableSound,a->T("Enable Sound")));
-
 #if PPSSPP_PLATFORM(IOS)
 	CheckBox *respectSilentMode = audioSettings->Add(new CheckBox(&g_Config.bAudioRespectSilentMode, a->T("Respect silent mode")));
 	respectSilentMode->OnClick.Add([=](EventParams &e) {
@@ -654,22 +651,37 @@ void GameSettingsScreen::CreateAudioSettings(UI::ViewGroup *audioSettings) {
 	mixWithOthers->SetEnabledPtr(&g_Config.bEnableSound);
 #endif
 
-	PopupSliderChoice *volume = audioSettings->Add(new PopupSliderChoice(&g_Config.iGameVolume, VOLUME_OFF, VOLUME_FULL, VOLUME_FULL, a->T("Global volume"), screenManager()));
+	audioSettings->Add(new ItemHeader(a->T("Game volume")));
+
+	// This is here because it now only applies to in-game. Muting the menu sounds is separate.
+	CheckBox *enableSound = audioSettings->Add(new CheckBox(&g_Config.bEnableSound, a->T("Enable Sound")));
+
+	PopupSliderChoice *volume = audioSettings->Add(new PopupSliderChoice(&g_Config.iGameVolume, VOLUME_OFF, VOLUME_FULL, VOLUME_FULL, a->T("Game volume"), screenManager()));
 	volume->SetEnabledPtr(&g_Config.bEnableSound);
 	volume->SetZeroLabel(a->T("Mute"));
 
-	PopupSliderChoice *altVolume = audioSettings->Add(new PopupSliderChoice(&g_Config.iAltSpeedVolume, VOLUME_OFF, VOLUME_FULL, NO_DEFAULT_INT, a->T("Alternate speed volume"), screenManager()));
-	altVolume->SetEnabledPtr(&g_Config.bEnableSound);
-	altVolume->SetZeroLabel(a->T("Mute"));
-
 	PopupSliderChoice *reverbVolume = audioSettings->Add(new PopupSliderChoice(&g_Config.iReverbVolume, VOLUME_OFF, 2 * VOLUME_FULL, VOLUME_FULL, a->T("Reverb volume"), screenManager()));
 	reverbVolume->SetEnabledPtr(&g_Config.bEnableSound);
 	reverbVolume->SetZeroLabel(a->T("Disabled"));
 
+	PopupSliderChoice *altVolume = audioSettings->Add(new PopupSliderChoice(&g_Config.iAltSpeedVolume, VOLUME_OFF, VOLUMEHI_FULL, NO_DEFAULT_INT, a->T("Alternate speed volume"), screenManager()));
+	altVolume->SetFormat("%d%%");
+	altVolume->SetEnabledPtr(&g_Config.bEnableSound);
+	altVolume->SetZeroLabel(a->T("Mute"));
+
 	PopupSliderChoice *achievementVolume = audioSettings->Add(new PopupSliderChoice(&g_Config.iAchievementSoundVolume, VOLUME_OFF, VOLUME_FULL, VOLUME_FULL, ac->T("Achievement sound volume"), screenManager()));
 	achievementVolume->SetEnabledPtr(&g_Config.bEnableSound);
 	achievementVolume->SetZeroLabel(a->T("Mute"));
 
+	audioSettings->Add(new ItemHeader(a->T("UI sound")));
+
+	audioSettings->Add(new CheckBox(&g_Config.bUISound, a->T("UI sound")));
+	PopupSliderChoice *uiVolume = audioSettings->Add(new PopupSliderChoice(&g_Config.iUIVolume, 0, VOLUMEHI_FULL, VOLUMEHI_FULL, ac->T("UI volume"), screenManager()));
+	uiVolume->SetFormat("%d%%");
+	uiVolume->SetZeroLabel(a->T("Mute"));
+
+	audioSettings->Add(new ItemHeader(a->T("Audio backend")));
+
 	// Hide the backend selector in UWP builds (we only support XAudio2 there).
 #if PPSSPP_PLATFORM(WINDOWS) && !PPSSPP_PLATFORM(UWP)
 	if (IsVistaOrHigher()) {
@@ -1098,7 +1110,6 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 	});
 #endif
 
-	systemSettings->Add(new CheckBox(&g_Config.bUISound, sy->T("UI Sound")));
 	const Path bgPng = GetSysDirectory(DIRECTORY_SYSTEM) / "background.png";
 	const Path bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) / "background.jpg";
 	if (File::Exists(bgPng) || File::Exists(bgJpg)) {
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 7c26bb348e..bcc5705f8e 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -1031,8 +1031,6 @@ void NativeFrame(GraphicsContext *graphicsContext) {
 
 	g_OSD.Update();
 
-	UI::SetSoundEnabled(g_Config.bUISound);
-
 	_dbg_assert_(graphicsContext != nullptr);
 	_dbg_assert_(g_screenManager != nullptr);
 
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
index 8007bae710..897c49696b 100644
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@@ -86,6 +86,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = كتم
 Respect silent mode = Respect silent mode
 Reverb volume = تردد الصوت
+UI sound = UI sound
 Use new audio devices automatically = استعمل اجهزة الصوت الجديده تلقائيا
 WASAPI (fast) = ‎WASAPI (سريع)
 
@@ -1403,7 +1404,6 @@ Time Format = ‎صيغة الوقت
 Transparent UI background = Transparent UI background
 UI = اجهة
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = ‎إستخدم  صيغة الفيديو الأقل تأثيراً (FFV1)
diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
index f6e68ef864..4d3f4f4bb4 100644
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = Time format
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
index 8c1b63479d..ed2e38d36d 100644
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = Час
 Transparent UI background = Transparent UI background
 UI = Потребителски интерфейс
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
index c4d3609c01..ae1ed763be 100644
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Silenciar
 Respect silent mode = Respect silent mode
 Reverb volume = Volum de reverberació
+UI sound = UI sound
 Use new audio devices automatically = Canviar a dispositiu d'àudio nou
 WASAPI (fast) = WASAPI (ràpid)
 
@@ -1395,7 +1396,6 @@ Time Format = Time format
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
index 96c40309f9..c20c6e1bdb 100644
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (rychlé)
 
@@ -1395,7 +1396,6 @@ Time Format = Formát času
 Transparent UI background = Transparent UI background
 UI = Uživatelské rozhraní
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
index c90c352b10..3e423878c3 100644
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (hurtig)
 
@@ -1395,7 +1396,6 @@ Time Format = Tidsformat
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Brug tabsfri Video Codec (FFV1)
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index 7e82976ada..4702680efd 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Stumm
 Respect silent mode = Respect silent mode
 Reverb volume = Hall Lautstärke
+UI sound = Menüsound
 Use new audio devices automatically = Neues Tonausgabegerät anschalten
 WASAPI (fast) = WASAPI (schnell)
 
@@ -1395,7 +1396,6 @@ Time Format = Zeitformat
 Transparent UI background = Menü Hintergrund transparent
 UI = Benutzeroberfläche
 UI background animation = Menü Hintergrundanimation
-UI Sound = Menüsound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Benutze verlustfreien Videocodec (FFV1)
diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
index a1543a12e1..fa322ea739 100644
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = Matumbai to wattu?
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
index 38b66e2eb3..2b2ba18a22 100644
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@@ -102,6 +102,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1406,7 +1407,6 @@ Swipe twice to switch app (indicator stays visible) = Swipe twice to switch app
 Time Format = Time format
 Transparent UI background = Transparent UI background
 UI = UI
-UI Sound = UI sound
 UI background animation = UI background animation
 undo %c = backup %c
 USB = USB
diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
index b480f516c4..eebde67fbb 100644
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Silenciar
 Respect silent mode = Respect silent mode
 Reverb volume = Volumen de reverberación
+UI sound = Sonido de interfaz
 Use new audio devices automatically = Cambiar a dispositivo de audio nuevo
 WASAPI (fast) = WASAPI (rápido)
 
@@ -1396,7 +1397,6 @@ Time Format = Formato de hora
 Transparent UI background = Fondo transparente
 UI = Interfaz de usuario
 UI background animation = Animación de fondo
-UI Sound = Sonido de interfaz
 undo %c = Restaurar %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Usar codec de vídeo sin pérdida (FFV1)
diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
index 3f7c01cd91..298140857a 100644
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Silenciar
 Respect silent mode = Respect silent mode
 Reverb volume =  Efecto de profundidad espacial de sonido añadiendo reverberación al volumen
+UI sound = Sonido de interfaz
 Use new audio devices automatically = Usar/cambiar a nuevos dispositivos de audio automaticamente
 WASAPI (fast) = WASAPI (rápido)
 
@@ -1397,7 +1398,6 @@ Time Format = Formato de hora
 Transparent UI background = Transparent UI background
 UI = Interfaz de usuario
 UI background animation = Animación del fondo de UI
-UI Sound = Sonido de interfaz
 undo %c = Restaurar %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Usar codec de vídeo sin pérdida (FFV1)
diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
index 1ff6a3bd21..c2495c95f2 100644
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = میکس صدا با برنامه‌های دیگر
 Mute = بی‌صدا
 Respect silent mode = احترام به حالت بی‌صدا
 Reverb volume = حجم صدا
+UI sound = صدای رابط کاربری
 Use new audio devices automatically = استفاده از دستگاه‌های صوتی جدید به صورت خودکار
 WASAPI (fast) = ‎WASAPI (سریع)
 
@@ -1395,7 +1396,6 @@ Time Format = ‎فرمت زمان
 Transparent UI background = پس‌زمینه شفاف
 UI = ‎زبان برنامه
 UI background animation = پس‌زمینه زنده
-UI Sound = صدای رابط کاربری
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
index 274b5261e7..a7566969c8 100644
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mykistä
 Respect silent mode = Respect silent mode
 Reverb volume = Kaikuefektin voimakkuus
+UI sound = Käyttöliittymän äänet
 Use new audio devices automatically = Käytä uusia äänilaitteita automaattisesti
 WASAPI (fast) = WASAPI (nopea)
 
@@ -1395,7 +1396,6 @@ Time Format = Ajan muoto
 Transparent UI background = Läpinäkyvä käyttöliittymän tausta
 UI = Käyttöliittymä
 UI background animation = Käyttöliittymän taustan animaatio
-UI Sound = Käyttöliittymän äänet
 undo %c = peruuta %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Käytä häviöttömän videon koodekkia (FFV1)
diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
index 8f774c2832..17c30276db 100644
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Muet
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = Sons de l'interface utilisateur
 Use new audio devices automatically = Basculer sur le nouveau périphérique de sortie
 WASAPI (fast) = WASAPI (rapide)
 
@@ -1386,7 +1387,6 @@ Time Format = Format de l'heure
 Transparent UI background = Transparent UI background
 UI = Interface utilisateur
 UI background animation = UI background animation
-UI Sound = Sons de l'interface utilisateur
 undo %c = secours %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Utiliser un codec vidéo sans perte (FFV1)
diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
index c9995fc4af..d09b406736 100644
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (rápido)
 
@@ -1395,7 +1396,6 @@ Time Format = Formato de hora
 Transparent UI background = Transparent UI background
 UI = Interfaz de usuario
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
index de4afa9b10..b68beaa09a 100644
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Σίγαση
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Ενεργοποίηση νέας συσκευής ήχου
 WASAPI (fast) = WASAPI (γρήγορο)
 
@@ -1395,7 +1396,6 @@ Time Format = Μορφή Ώρας
 Transparent UI background = Transparent UI background
 UI = Διεπαφή χρήστη
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Χρήση μη απολεστικού κωδικοποιητή (FFV1)
diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
index 9c5f6a13df..21cfdb1911 100644
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = תבנית זמן
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
index a89928bc14..f4d2207f2f 100644
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = ןמז תינבת
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
index a485d3a720..d7be2ac4fe 100644
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Priguši
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = Felhasználói felület hangja
 Use new audio devices automatically = Promijeni trenutni uređaj
 WASAPI (fast) = WASAPI (brzo)
 
@@ -1395,7 +1396,6 @@ Time Format = Format vremena
 Transparent UI background = Transparent UI background
 UI = Felhasználói felület
 UI background animation = UI background animation
-UI Sound = Felhasználói felület hangja
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Koristi neizgubiv Video Codec (FFV1)
diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
index 809b9dc697..086a866091 100644
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Audió vegyítése más alkalmazásokkal
 Mute = Némítás
 Respect silent mode = Néma üzemmód betartása
 Reverb volume = Visszhang hangerő
+UI sound = Kezelőfelület hangok
 Use new audio devices automatically = Új eszköz észlelésekor átváltás rá
 WASAPI (fast) = WASAPI (gyors)
 
@@ -1395,7 +1396,6 @@ Time Format = Idő formátuma
 Transparent UI background = Áttetsző háttér
 UI = Felhasználói felület
 UI background animation = Háttér animáció
-UI Sound = Kezelőfelület hangok
 undo %c = visszavon %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Veszteségmentes videó codec használata (FFV1)
diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
index 2463b646a9..9e2dba11f7 100644
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Campur audio dengan aplikasi lain
 Mute = Tidak bersuara
 Respect silent mode = Hargai mode senyap
 Reverb volume = Volume gema
+UI sound = Suara UI
 Use new audio devices automatically = Gunakan perangkat audio baru secara otomatis
 WASAPI (fast) = WASAPI (cepat)
 
@@ -1395,7 +1396,6 @@ Time Format = Format waktu
 Transparent UI background = Latar belakang UI transparan
 UI = Antarmuka pengguna
 UI background animation = Animasi latar belakang UI
-UI Sound = Suara UI
 undo %c = Cadangan %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Gunakan kompresi video (FFV1)
diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
index 2913d4128f..c525e933f7 100644
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio con altre app
 Mute = Muto
 Respect silent mode = Rispetta la modalità silenziosa
 Reverb volume = Riverb. volume
+UI sound = Suoni dell'Interfaccia
 Use new audio devices automatically = Usa nuovi dispositivi audio automaticamente.
 WASAPI (fast) = WASAPI (veloce)
 
@@ -1396,7 +1397,6 @@ Storage full = Spazio su disco pieno
 Sustained performance mode = Modalità prestazioni prolungate
 Time Format = Formato Data/Ora
 UI background animation = Animazione sfondo interfaccia
-UI Sound = Suoni dell'Interfaccia
 undo %c = annulla %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Usa Codec Video senza perdite (FFV1)
diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
index 25e2a093ee..7e809f976e 100644
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = ミュート
 Respect silent mode = Respect silent mode
 Reverb volume = リバーブボリューム
+UI sound = UI操作音
 Use new audio devices automatically = 新しいオーディオデバイスをオンにする
 WASAPI (fast) = WASAPI (高速)
 
@@ -1394,7 +1395,6 @@ Theme = UIのテーマ
 Time Format = 時刻の形式
 Transparent UI background = 透明なUI背景
 UI = ユーザーインターフェース
-UI Sound = UI操作音
 UI background animation = UIの背景アニメーション
 undo %c = backup %c
 USB = USB
diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
index c49b8fe700..455226a490 100644
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = Swara Antarmuka Panganggo
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (cepet)
 
@@ -1395,7 +1396,6 @@ Time Format = Format wektu
 Transparent UI background = Transparent UI background
 UI = Antarmuka Panganggo
 UI background animation = UI background animation
-UI Sound = Swara Antarmuka Panganggo
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
index 5af1f5374a..a087ee4471 100644
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = 다른 앱과 오디오 믹스
 Mute = 음소거
 Respect silent mode = 무음 모드 존중
 Reverb volume = 반향 볼륨
+UI sound = UI 사운드
 Use new audio devices automatically = 새 오디오 장치를 자동으로 사용
 WASAPI (fast) = WASAPI (빠름)
 
@@ -1382,7 +1383,6 @@ Swipe twice to switch app (indicator stays visible) = 두 번 밀어 앱 전환
 Time Format = 시간 형식
 Transparent UI background = 투명한 UI 배경
 UI = UI
-UI Sound = UI 사운드
 UI background animation = UI 배경 애니메이션
 undo %c = %c 백업
 USB = USB
diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini
index 70a281b706..216b0afad5 100644
--- a/assets/lang/ku_SO.ini
+++ b/assets/lang/ku_SO.ini
@@ -91,6 +91,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = بێدەنگ کردن
 Respect silent mode = Respect silent mode
 Reverb volume = ئاستی دەنگی گشت ئاڕاستە
+UI sound = UI دەنگی
 Use new audio devices automatically = بەکارهێنانی ئامێری دەنگی تازە بە شێوەیەکی ئۆتۆماتیکی
 WASAPI (fast) = WASAPI (خێرا)
 
@@ -1396,7 +1397,6 @@ Swipe twice to switch app (indicator stays visible) = Swipe twice to switch app
 Time Format = شێوازی کاتژمێر
 Transparent UI background = ڕوون(شەفاف) UI باکگراوندێکی
 UI = UI
-UI Sound = UI دەنگی
 UI background animation = UI ئەنیمەیشنی باکگراوندی
 undo %c = backup %c
 USB = USB
diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
index 25b3ccc00b..2b07669215 100644
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = ຮູບແບບເວລາ
 Transparent UI background = Transparent UI background
 UI = ການໂຕ້ຕອບຜູ້ໃຊ້
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use Lossless Video Codec (FFV1)
diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
index 1c410b1eff..5c2765d4fa 100644
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = Laiko formatas
 Transparent UI background = Transparent UI background
 UI = Vartotojo sąsaja
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
index fabaca9179..a5d3679f4e 100644
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = Format waktu
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
index 8c12848266..656b8b9cc2 100644
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (snel)
 
@@ -1395,7 +1396,6 @@ Time Format = Tijdweergave
 Transparent UI background = Transparent UI background
 UI = Gebruikersomgeving
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Lossless videocodec gebruiken (FFV1)
diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
index 08002332a4..9c88eb3a8f 100644
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (fast)
 
@@ -1395,7 +1396,6 @@ Time Format = Time format
 Transparent UI background = Transparent UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
index 050caa8f68..3ad8dd9750 100644
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Miksuj audio z innymi aplikacjami
 Mute = Wycisz
 Respect silent mode = Respect silent mode
 Reverb volume = Pogłos
+UI sound = Dźwięki interfejsu użytkownika
 Use new audio devices automatically = Automatycznie używaj nowego urządzenia audio
 WASAPI (fast) = WASAPI (szybki)
 
@@ -1400,7 +1401,6 @@ Time Format = Format czasu
 Transparent UI background = Przezroczyste tło interfejsu użytkownika
 UI = Interfejs użytkownika
 UI background animation = Animacja tła
-UI Sound = Dźwięki interfejsu użytkownika
 undo %c = kopia zapasowa %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Używaj stratnego kodeka wideo (FFV1)
diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
index f6352ef6d0..e520251f22 100644
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@@ -102,6 +102,7 @@ Mix audio with other apps = Misturar o áudio com os outros aplicativos
 Mute = Mudo
 Respect silent mode = Respeitar o modo silencioso
 Reverb volume = Reverberar volume
+UI sound = Som da interface do usuário
 Use new audio devices automatically = Usar novos dispositivos de áudio automaticamente
 WASAPI (fast) = WASAPI (rápido)
 
@@ -1406,7 +1407,6 @@ Swipe twice to switch app (indicator stays visible) = Deslize duas vezes pra tro
 Time Format = Formato da hora
 Transparent UI background = 2º plano transparente da interface do usuário
 UI = Interface do usuário
-UI Sound = Som da interface do usuário
 UI background animation = Animação do cenário de fundo da interface do usuário
 undo %c = Backup %c
 USB = USB
diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
index e95956d764..56725ee358 100644
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@@ -102,6 +102,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mudo
 Respect silent mode = Respect silent mode
 Reverb volume = Reverberar volume
+UI sound = Som da interface do usuário
 Use new audio devices automatically = Usar novos dispositivos de áudio automaticamente
 WASAPI (fast) = WASAPI (rápido)
 
@@ -1408,7 +1409,6 @@ Swipe twice to switch app (indicator stays visible) = Swipe twice to switch app
 Time Format = Formato da hora
 Transparent UI background = Cenário de fundo da interface do usuário transparente
 UI = Interface do usuário
-UI Sound = Som da interface do usuário
 UI background animation = Animação do cenário de fundo da interface do usuário
 undo %c = Backup %c
 USB = USB
diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
index 91ddf1ccd0..ea9f0104da 100644
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (rapid)
 
@@ -1396,7 +1397,6 @@ Time Format = Format timp
 Transparent UI background = Transparent UI background
 UI = Interfața cu utilizatorul
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
index 6f5bd25294..68014694e1 100644
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Микшировать аудио с другими
 Mute = Без звука
 Respect silent mode = Уважать бесшумный режим
 Reverb volume = Громкость реверберации
+UI sound = Звуки интерфейса
 Use new audio devices automatically = Переключаться на новые аудиоустройства автоматически
 WASAPI (fast) = WASAPI (быстрее)
 
@@ -1394,7 +1395,6 @@ Theme = Тема
 Time Format = Формат времени
 Transparent UI background = Прозрачный фон интерфейса
 UI = Интерфейс
-UI Sound = Звуки интерфейса
 UI background animation = Фоновая анимация интерфейса
 undo %c = резервная копия %c
 USB = USB
diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
index f2703dc265..d0871740e2 100644
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mixa ljud med andra appar
 Mute = Tysta
 Respect silent mode = Respektera tyst läge
 Reverb volume = Volym på reverb-effekt
+UI sound = Ljud i användargränssnittet
 Use new audio devices automatically = Byt automatiskt till senast inkopplad ljudenhet
 WASAPI (fast) = WASAPI (snabb)
 
@@ -1396,7 +1397,6 @@ Time Format = Tidsformat
 Transparent UI background = Genomskinlig UI-bakground
 UI = Användargränssnitt
 UI background animation = Bakgrundsanimering
-UI Sound = Ljud i användargränssnittet
 undo %c = ångra %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Använd förlust-fri video codec (FFV1)
diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
index 1a0b085103..f2c03b2cd2 100644
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Walang tunog
 Respect silent mode = Respect silent mode
 Reverb volume = Maugong na tunog
+UI sound = UI sound
 Use new audio devices automatically = Awtomatiko gamitin ang bagong tunog na kagamitan
 WASAPI (fast) = WASAPI (Mabilis)
 
@@ -1398,7 +1399,6 @@ Time Format = Pormat ng oras
 Transparent UI background = Transparent na UI background
 UI = UI
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Gumamit ng 'lossless video codec' (o FFV1)
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index 93ad8610f9..c3068d5164 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = ระบบเสียงผสมผสานร
 Mute = เงียบ
 Respect silent mode = โหมดเงียบงัน
 Reverb volume = ระดับเสียงก้อง
+UI sound = เสียงของอินเตอร์เฟซ
 Use new audio devices automatically = สลับไปใช้อุปกรณ์เสียงอันใหม่อัตโนมัติ
 WASAPI (fast) = WASAPI (เร็ว)
 
@@ -1433,7 +1434,6 @@ Time Format = รูปแบบเวลา
 Transparent UI background = พื้นหลังของอินเตอร์เฟซแบบโปร่งใส
 UI = หน้าจอผู้ใช้
 UI background animation = อนิเมชั่นพื้นหลังของอินเตอร์เฟซ
-UI Sound = เสียงของอินเตอร์เฟซ
 undo %c = สำรอง %c
 USB = USB
 Use Lossless Video Codec (FFV1) = ใช้โค้ด FFV1 บันทึกวีดีโอ เพื่อรักษาความคมชัด
diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini
index 15631e9195..087e31e1da 100644
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Sessiz
 Respect silent mode = Respect silent mode
 Reverb volume = Yankı sesi
+UI sound = Arayüz sesleri
 Use new audio devices automatically = Otomatik olarak yeni ses cihazlarını kullan
 WASAPI (fast) = WASAPI (hızlı)
 
@@ -1396,7 +1397,6 @@ Time Format = Zaman biçimi
 Transparent UI background = Şeffaf arayüz arkaplanı
 UI = Arayüz
 UI background animation = Arayüz arkaplan animasyonu
-UI Sound = Arayüz sesleri
 undo %c = %c 'yi yedekle
 USB = USB
 Use Lossless Video Codec (FFV1) = Kayıpsız video codec'i kullan (FFV1)
diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini
index a28de5aa2c..b7edf87efb 100644
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Змішати аудіо з іншими прогр
 Mute = Вимкнути звук
 Respect silent mode = дотримуватись беззвучного режиму
 Reverb volume = Гучність реверберації
+UI sound = Звук інтерфейсу
 Use new audio devices automatically = Увімкніть новий аудіопристрій
 WASAPI (fast) = WASAPI (швидко)
 
@@ -1395,7 +1396,6 @@ Time Format = Формат часу
 Transparent UI background = Прозорий фон інтерфейсу користувача
 UI = Користувацький інтерфейс
 UI background animation = Фонова анімація інтерфейсу
-UI Sound = Звук інтерфейсу
 undo %c = резервна копія %c
 USB = флешка
 Use Lossless Video Codec (FFV1) = Використовувати відеокодек без втрат (FFV1)
diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini
index 192fab3c5d..d0d15751d4 100644
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = Mix audio with other apps
 Mute = Mute
 Respect silent mode = Respect silent mode
 Reverb volume = Reverb volume
+UI sound = UI sound
 Use new audio devices automatically = Use new audio devices automatically
 WASAPI (fast) = WASAPI (nhanh)
 
@@ -1395,7 +1396,6 @@ Time Format = Chỉnh định dạng thời gian (12/24)
 Transparent UI background = Transparent UI background
 UI = Giao diện người dùng
 UI background animation = UI background animation
-UI Sound = UI sound
 undo %c = backup %c
 USB = USB
 Use Lossless Video Codec (FFV1) = Sử dụng codec video lossless (FFV1)
diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini
index 1452d0edaa..ad4b910920 100644
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = 允许其他APP同时播放音频
 Mute = 静音
 Respect silent mode = 跟随系统静音模式
 Reverb volume = 混响强度
+UI sound = 按键音效
 Use new audio devices automatically = 自动选择新的音频设备
 WASAPI (fast) = WASAPI (快)
 
@@ -1387,7 +1388,6 @@ Time Format = 时间格式
 Transparent UI background = 游戏中使用半透明UI
 UI = 用户界面
 UI background animation = 壁纸动效
-UI Sound = 按键音效
 undo %c = 备份%c
 USB = USB路径
 Use Lossless Video Codec (FFV1) = 使用无损视频编码器 (FFV1)
diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini
index 2663645cfe..b4ae5e29e6 100644
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@@ -78,6 +78,7 @@ Mix audio with other apps = 與其他應用程式混合音訊
 Mute = 靜音
 Respect silent mode = 尊重靜音模式
 Reverb volume = 混響裝置音量
+UI sound = UI 音效
 Use new audio devices automatically = 自動使用新音訊裝置
 WASAPI (fast) = WASAPI (快)
 
@@ -1382,7 +1383,6 @@ Swipe twice to switch app (indicator stays visible) = Swipe twice to switch app
 Time Format = 時間格式
 Transparent UI background = 透明 UI 背景
 UI = UI
-UI Sound = UI 音效
 UI background animation = UI 背景動畫
 undo %c = 備份 %c
 USB = USB
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index ce3fcf5e6d..e671293f99 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -115,7 +115,7 @@ void System_AskForPermission(SystemPermission permission) {}
 PermissionStatus System_GetPermissionStatus(SystemPermission permission) { return PERMISSION_STATUS_GRANTED; }
 void System_AudioGetDebugStats(char *buf, size_t bufSize) { if (buf) buf[0] = '\0'; }
 void System_AudioClear() {}
-void System_AudioPushSamples(const s32 *audio, int numSamples, int volume) {}
+void System_AudioPushSamples(const s32 *audio, int numSamples, float volume) {}
 
 // TODO: To avoid having to define these here, these should probably be turned into system "requests".
 bool NativeSaveSecret(std::string_view nameOfSecret, std::string_view data) { return false; }
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index ab9dd126d9..f31af7beeb 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -1924,7 +1924,7 @@ inline int16_t Clamp16(int32_t sample) {
    return sample;
 }
 
-void System_AudioPushSamples(const int32_t *audio, int numSamples, int volume) {
+void System_AudioPushSamples(const int32_t *audio, int numSamples, float volume) {
    // We ignore volume here, because it's handled by libretro presumably.
 
    // Convert to 16-bit audio for further processing.
diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp
index 04a4ef3a40..52a72f36fc 100644
--- a/unittest/UnitTest.cpp
+++ b/unittest/UnitTest.cpp
@@ -114,7 +114,7 @@ void System_Notify(SystemNotification notification) {}
 void System_PostUIMessage(UIMessage message, const std::string &param) {}
 void System_AudioGetDebugStats(char *buf, size_t bufSize) { if (buf) buf[0] = '\0'; }
 void System_AudioClear() {}
-void System_AudioPushSamples(const s32 *audio, int numSamples, int volume) {}
+void System_AudioPushSamples(const s32 *audio, int numSamples, float volume) {}
 
 // TODO: To avoid having to define these here, these should probably be turned into system "requests".
 // To clear the secret entirely, just save an empty string.