diff --git a/Core/ControlMapper.cpp b/Core/ControlMapper.cpp
index 8f1096fdd6..86455c26f2 100644
--- a/Core/ControlMapper.cpp
+++ b/Core/ControlMapper.cpp
@@ -325,7 +325,7 @@ static bool IsSwappableVKey(uint32_t vkey) {
 }
 
 void ControlMapper::SwapMappingIfEnabled(uint32_t *vkey) {
-	if (swapAxes_) {
+	if (swapAxes_ || IsVirtKeyOn(VIRTKEY_AXIS_SWAP_HOLD)) {
 		switch (*vkey) {
 		case CTRL_UP: *vkey = VIRTKEY_AXIS_Y_MAX; break;
 		case VIRTKEY_AXIS_Y_MAX: *vkey = CTRL_UP; break;
@@ -509,6 +509,8 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
 
 			if (vkId == VIRTKEY_ANALOG_LIGHTLY) {
 				updateAnalogSticks = true;
+			} else if (vkId == VIRTKEY_AXIS_SWAP_HOLD) {
+				UpdateSwapAxes();
 			}
 		} else if (bPrevValue && !bValue) {
 			// INFO_LOG(Log::G3D, "vkeyoff %s", KeyMap::GetVirtKeyName(vkId));
@@ -517,6 +519,8 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
 
 			if (vkId == VIRTKEY_ANALOG_LIGHTLY) {
 				updateAnalogSticks = true;
+			} else if (vkId == VIRTKEY_AXIS_SWAP_HOLD) {
+				UpdateSwapAxes();
 			}
 		}
 	}
@@ -564,9 +568,12 @@ bool ControlMapper::Key(const KeyInput &key, bool *pauseTrigger) {
 
 void ControlMapper::ToggleSwapAxes() {
 	// Note: The lock is already locked here.
-
 	swapAxes_ = !swapAxes_;
 
+	UpdateSwapAxes();
+}
+
+void ControlMapper::UpdateSwapAxes() {
 	for (auto listener : listeners_) {
 		listener->UpdatePSPButtons(0, CTRL_LEFT | CTRL_RIGHT | CTRL_UP | CTRL_DOWN);
 	}
diff --git a/Core/ControlMapper.h b/Core/ControlMapper.h
index 8648662271..848cc49050 100644
--- a/Core/ControlMapper.h
+++ b/Core/ControlMapper.h
@@ -63,6 +63,7 @@ public:
 	};
 
 private:
+	void UpdateSwapAxes();
 	bool UpdatePSPState(const InputMapping &changedMapping, double now);
 	float MapAxisValue(float value, int vkId, const InputMapping &mapping, const InputMapping &changedMapping, bool *oppositeTouched);
 	void SwapMappingIfEnabled(uint32_t *vkey);
@@ -76,6 +77,14 @@ private:
 	void UpdateCurInputAxis(const InputMapping &mapping, float value, double timestamp);
 	float GetDeviceAxisThreshold(int device, const InputMapping &mapping);
 
+	bool IsVirtKeyOn(VirtKey key) const {
+		int index = key - VIRTKEY_FIRST;
+		if (index < 0 || index >= VIRTKEY_COUNT) {
+			return false;
+		}
+		return virtKeyOn_[index];
+	}
+
 	// To track mappable virtual keys. We can have as many as we want.
 	float virtKeys_[VIRTKEY_COUNT]{};
 	bool virtKeyOn_[VIRTKEY_COUNT]{};  // Track boolean output separaately since thresholds may differ.
diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp
index ff8282e2d5..032678226a 100644
--- a/Core/KeyMap.cpp
+++ b/Core/KeyMap.cpp
@@ -460,7 +460,8 @@ const KeyMap_IntStrPair psp_button_names[] = {
 	{VIRTKEY_ANALOG_ROTATE_CCW, "Rotate Analog (CCW)"},
 	{VIRTKEY_ANALOG_LIGHTLY, "Analog limiter"},
 	{VIRTKEY_RAPID_FIRE, "RapidFire"},
-	{VIRTKEY_AXIS_SWAP, "AxisSwap"},
+	{VIRTKEY_AXIS_SWAP_HOLD, "Axis swap (hold)"},
+	{VIRTKEY_AXIS_SWAP_TOGGLE, "Axis swap (toggle)"},
 
 	{VIRTKEY_FASTFORWARD, "Fast-forward"},
 	{VIRTKEY_PAUSE, "Pause"},
diff --git a/Core/KeyMap.h b/Core/KeyMap.h
index ebfe050ac1..7ba4c83e78 100644
--- a/Core/KeyMap.h
+++ b/Core/KeyMap.h
@@ -32,7 +32,7 @@
 #define KEYMAP_ERROR_UNKNOWN_KEY 0
 
 // Don't change any of these - it'll break backwards compatibility with configs.
-enum VirtKey {
+enum VirtKey : u32 {
 	VIRTKEY_FIRST = 0x40000001,
 	VIRTKEY_AXIS_X_MIN = 0x40000001,
 	VIRTKEY_AXIS_Y_MIN = 0x40000002,
@@ -52,7 +52,7 @@ enum VirtKey {
 	VIRTKEY_NEXT_SLOT = 0x40000010,
 	VIRTKEY_TOGGLE_FULLSCREEN = 0x40000011,
 	VIRTKEY_ANALOG_LIGHTLY = 0x40000012,
-	VIRTKEY_AXIS_SWAP = 0x40000013,
+	VIRTKEY_AXIS_SWAP_TOGGLE = 0x40000013,
 	VIRTKEY_DEVMENU = 0x40000014,
 	VIRTKEY_FRAME_ADVANCE = 0x40000015,
 	VIRTKEY_RECORD = 0x40000016,
@@ -81,6 +81,7 @@ enum VirtKey {
 	VIRTKEY_TOGGLE_DEBUGGER = 0x40000033,
 	VIRTKEY_PAUSE_NO_MENU = 0x40000034,
 	VIRTKEY_TOGGLE_TILT = 0x40000035,
+	VIRTKEY_AXIS_SWAP_HOLD = 0x40000036,
 	VIRTKEY_LAST,
 	VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
 };
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 91bf11b722..bc9e5dce45 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -863,7 +863,7 @@ void EmuScreen::ProcessVKey(VirtKey virtKey) {
 		}
 		break;
 
-	case VIRTKEY_AXIS_SWAP:
+	case VIRTKEY_AXIS_SWAP_TOGGLE:
 		g_controlMapper.ToggleSwapAxes();
 		g_OSD.Show(OSDType::MESSAGE_INFO, mc->T("AxisSwap"));  // best string we have.
 		break;
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
index 31ad5d04d9..865d9486d6 100644
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@@ -864,7 +864,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = ‎الدائرة
 Cross = ‎الأكس
 Custom %d = Custom %d
diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
index ff3f6454b2..e214c77b5d 100644
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@@ -858,7 +858,8 @@ Analog limiter = Analoq qısıtlayıcısı
 Analog speed = Analoq sürəti
 Analog Stick = Analoq çubuğu
 Audio/Video Recording = Səs/Görüntü yazılışı
-AxisSwap = Oxların dəyişimi
+Axis swap (hold) = Oxların dəyişimi (saxla)  # AI translated
+Axis swap (toggle) = Oxların dəyişimi (keçid)  # AI translated
 Circle = Dairə
 Cross = Xaç
 Custom %d = Özəl %d
diff --git a/assets/lang/be_BY.ini b/assets/lang/be_BY.ini
index 072458ad24..5a628530a0 100644
--- a/assets/lang/be_BY.ini
+++ b/assets/lang/be_BY.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Круг
 Cross = Крыж
 Custom %d = Custom %d
diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
index f815aad6bd..8312a4899b 100644
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@@ -856,7 +856,8 @@ Analog limiter = Аналогов лимитер
 Analog speed = Аналогова скорост
 Analog Stick = Аналогов стик
 Audio/Video Recording = Аудио/Видео запис
-AxisSwap = Размяна на оси
+Axis swap (hold) = Размяна на оси (задържане)  # AI translated
+Axis swap (toggle) = Размяна на оси (превключване)  # AI translated
 Circle = Кръг
 Cross = Кръст
 Custom %d = Custom %d
diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
index f57ea11847..6f08ed5ce1 100644
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
index e002978d23..3b97b9cd43 100644
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@@ -855,37 +855,38 @@ An.Up = Analog Nahoru
 Analog limiter = Analogový omezovač
 Analog speed = Analog speed
 Analog Stick = Analogová páčka
-Audio/Video Recording = Audio/Video recording
-AxisSwap = Výměna osy
+Audio/Video Recording = Audio/Video nahrávání
+Axis swap (hold) = Výměna osy (držet)
+Axis swap (toggle) = Výměna osy (přepínat)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
-D-pad down = D-pad down
-D-pad left = D-pad left
-D-pad right = D-pad right
-D-pad up = D-pad up
+D-pad down = D-pad dolů
+D-pad left = D-pad doleva
+D-pad right = D-pad doprava
+D-pad up = D-pad nahoru
 Dev-kit L2 = Dev-kit L2
 Dev-kit L3 = Dev-kit L3
 Dev-kit R2 = Dev-kit R2
 Dev-kit R3 = Dev-kit R3
 DevMenu = Menu pro vývojáře
-Display Landscape = Display Landscape
-Display Landscape Reversed = Display Landscape Reversed
-Display Portrait = Display Portrait
-Display Portrait Reversed = Display Portrait Reversed
-Double tap button = Double tap button
+Display Landscape = Zobrazení na šířku
+Display Landscape Reversed = Zobrazení na šířku obrácené
+Display Portrait = Zobrazení na výšku
+Display Portrait Reversed = Zobrazení na výšku obrácené
+Double tap button = Dvojité klepnutí na tlačítko
 Down = Dpad Dolů
 Dpad = Dpad
-Exit App = Exit App
-Frame Advance = Frame advance
-Hold = Hold
-Home = Home
+Exit App = Ukončit aplikaci
+Frame Advance = Posun snímku
+Hold = Držet
+Home = Domů
 L = L
 Left = Dpad Doleva
-Load State = Uložit stav
-Mute toggle = Mute toggle
+Load State = Načíst stav
+Mute toggle = Přepnutí ticha
 Next Slot = Další pozice
-None = None
+None = Žádný
 Note = Note
 OpenChat = Open chat
 Pause (no menu) = Pauza (no menu)
@@ -903,8 +904,8 @@ RightAn.Down = PravýAn.Dolů
 RightAn.Left = PravýAn.Doleva
 RightAn.Right = PravýAn.Doprava
 RightAn.Up = PravýAn.Nahoru
-Rotate Analog (CCW) = Rotate analog (CCW)
-Rotate Analog (CW) = Rotate analog (CW)
+Rotate Analog (CCW) = Otočit analogový stick (CCW)
+Rotate Analog (CW) = Otočit analogový stick (CW)
 Save State = Načíst stav
 Screen = Screen
 Screenshot = Screenshot
diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
index 2eaf10464b..a77fbeee61 100644
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog begrænser
 Analog speed = Analog speed
 Analog Stick = Analogstick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Ombyt akser
+Axis swap (hold) = Ombyt akser (nedholdt)
+Axis swap (toggle) = Ombyt akser (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index e2f15c9119..416045cdff 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -855,7 +855,8 @@ Analog limiter = Analogbegrenzer
 Analog speed = Analog-Geschwindigkeit
 Analog Stick = Analog-Stick
 Audio/Video Recording = Ton-/Videoaufnahme
-AxisSwap = Achsen invertieren
+Axis swap (hold) = Achsen invertieren (hold)
+Axis swap (toggle) = Achsen invertieren (toggle)
 Circle = Kreis
 Cross = Kreuz
 Custom %d = Benutzerdefiniert %d
diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
index 712473e891..0a3f6d92b4 100644
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
index 1ec813d9ee..ff9d02d653 100644
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@@ -857,7 +857,8 @@ Analog limiter = Limitador analógico
 Analog speed = Velocidad analógico
 Analog Stick = Stick analógico
 Audio/Video Recording = Grabación de audio/vídeo
-AxisSwap = Invertir ejes
+Axis swap (hold) = Invertir ejes (agarrar)  # AI translated
+Axis swap (toggle) = Invertir ejes (cambiar)  # AI translated
 Circle = Círculo
 Cross = Equis
 Custom %d = Personalizado %d
diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
index 525d768aad..96351d8a0b 100644
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@@ -856,7 +856,8 @@ Analog limiter = Limitador Analog
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Grabar audio/video
-AxisSwap = Invertir ejes
+Axis swap (hold) = Invertir ejes (agarrar)
+Axis swap (toggle) = Invertir ejes (alternar)
 Circle = ○
 Cross = ×
 Custom %d = Personal %d
diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
index b280d7973a..2f6c559635 100644
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
index 634573710c..95f202d205 100644
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@@ -857,7 +857,8 @@ Analog limiter = Analoginen rajoitin
 Analog speed = Analoginen nopeus
 Analog Stick = Analoginen sauva
 Audio/Video Recording = Ääni/video nauhoitus
-AxisSwap = Akselinvaihto
+Axis swap (hold) = Akselinvaihto (pidä)  # AI translated
+Axis swap (toggle) = Akselinvaihto (vaihda)  # AI translated
 Circle = Ympyrä
 Cross = Risti
 Custom %d = Mukautettu %d
diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
index c80cb94a4e..996c5fc81d 100644
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@@ -856,7 +856,8 @@ Analog limiter = Limiteur analogique
 Analog speed = Analog speed
 Analog Stick = Stick analogique
 Audio/Video Recording = Enreg. audio/vidéo
-AxisSwap = Inverser axes
+Axis swap (hold) = Inverser axes (maintenir)  # AI translated
+Axis swap (toggle) = Inverser axes (bascule)  # AI translated
 Circle = Rond
 Cross = Croix
 Custom %d = Custom %d
diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
index 42889ede3b..4a316429fc 100644
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@@ -856,7 +856,8 @@ Analog limiter = Limitador analóx.
 Analog speed = Analog speed
 Analog Stick = Stick analóxico
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Invertir eixes
+Axis swap (hold) = Invertir eixes (agarrar)  # AI translated
+Axis swap (toggle) = Invertir eixes (activar)  # AI translated
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
index 1a625feb19..4fbb708197 100644
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@@ -856,7 +856,8 @@ Analog limiter = Περιορισμός αναλογικού μοχλού
 Analog speed = Analog speed
 Analog Stick = Αναλογικός Μοχλός
 Audio/Video Recording = Εγγραφή Ήχου/Video
-AxisSwap = Ανταλλαγή αξόνων
+Axis swap (hold) = Ανταλλαγή αξόνων (κρατήστε)  # AI translated
+Axis swap (toggle) = Ανταλλαγή αξόνων (εναλλαγή)  # AI translated
 Circle = Ο
 Cross = X
 Custom %d = Custom %d
diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
index cefd311fba..56a01b67b0 100644
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
index a170237d95..a6a799c9ec 100644
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
index 21c9e24f63..a3970eea06 100644
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@@ -856,7 +856,8 @@ Analog limiter = Ograničenje gljivice
 Analog speed = Analog speed
 Analog Stick = Gljivica
 Audio/Video Recording = Snimanje Zvuka/Videa
-AxisSwap = Izmijena Osi
+Axis swap (hold) = Izmijena Osi (hold)
+Axis swap (toggle) = Izmijena Osi (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
index 7777df399a..96a6434fd5 100644
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@@ -856,7 +856,8 @@ Analog limiter = Analóg korlátozó
 Analog speed = Analóg sebesség
 Analog Stick = Analóg kar
 Audio/Video Recording = Audió/videó rögzítés
-AxisSwap = Tengely váltás
+Axis swap (hold) = Tengely váltás (nyomva tartás)  # AI translated
+Axis swap (toggle) = Tengely váltás (kapcsoló)  # AI translated
 Circle = Kör
 Cross = Kereszt
 Custom %d = Custom %d
diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
index c51b6dc10b..c0dc4f2a3c 100644
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@@ -856,7 +856,8 @@ Analog limiter = Pembatas analog
 Analog speed = Analog speed
 Analog Stick = Pengendali analog
 Audio/Video Recording = Perekam audio/video
-AxisSwap = Tukar sumbu
+Axis swap (hold) = Tukar sumbu (tahan)  # AI translated
+Axis swap (toggle) = Tukar sumbu (alihkan)  # AI translated
 Circle = Lingkaran
 Cross = Seberang
 Custom %d = Kustom %d
diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
index a4a1ebf309..fd968959e4 100644
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@@ -857,7 +857,8 @@ Analog limiter = Limitatore analogico
 Analog speed = Velocità analogico
 Analog Stick = Stick analogico
 Audio/Video Recording = Registrazione Audio/Video
-AxisSwap = Scambia Assi
+Axis swap (hold) = Scambia Assi (tenere premuto)  # AI translated
+Axis swap (toggle) = Scambia Assi (attiva/disattiva)  # AI translated
 Circle = Cerchio
 Cross = Croce
 Custom %d = A scelta %d
diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
index 622ebf6f7a..5c00532137 100644
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@@ -856,7 +856,8 @@ Analog limiter = パッドのリミッタ
 Analog speed = アンログ速度
 Analog Stick = アナログパッド
 Audio/Video Recording = オーディオ/ビデオの記録
-AxisSwap = 軸の入れ替え
+Axis swap (hold) = 軸の入れ替え (ホールド)  # AI translated
+Axis swap (toggle) = 軸の入れ替え (切り替え)  # AI translated
 Circle = 〇
 Cross = ✕
 Custom %d = カスタム %d
diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
index a668a03348..443a16b8fc 100644
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
index 86b62adeee..017e98e505 100644
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@@ -856,7 +856,8 @@ Analog limiter = 아날로그 리미터
 Analog speed = 아날로그 속도
 Analog Stick = 아날로그 스틱
 Audio/Video Recording = 오디오/비디오 녹화
-AxisSwap = 축 교체
+Axis swap (hold) = 축 교체 (잠금)  # AI translated
+Axis swap (toggle) = 축 교체 (토글)  # AI translated
 Circle = 동그라미
 Cross = 십자
 Custom %d = 커스텀 %d
diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini
index fd4f077cd9..bd0b659dc0 100644
--- a/assets/lang/ku_SO.ini
+++ b/assets/lang/ku_SO.ini
@@ -870,7 +870,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
index 752e99879e..dcfd07f765 100644
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@@ -856,7 +856,8 @@ Analog limiter = ໂຕຈຳກັດອະນາລ໋ອກ
 Analog speed = Analog speed
 Analog Stick = ປຸ່ມອະນາລ໋ອກ
 Audio/Video Recording = Audio/Video recording
-AxisSwap = ສະຫຼັບດ້ານແກນ
+Axis swap (hold) = ສະຫຼັບດ້ານແກນ (ກົດຄ່ອຍ)  # AI translated
+Axis swap (toggle) = ສະຫຼັບດ້ານແກນ (ເປີດ/ປິດ)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
index 5cae49aadd..7ce5d34a70 100644
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analoginė svirtelė
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
index b1c58da3be..8a1a6e2707 100644
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Kayu Analog
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
index 10f48e829b..026022fa33 100644
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@@ -856,7 +856,8 @@ Analog limiter = Analooglimiet
 Analog speed = Analog speed
 Analog Stick = Analoge stick
 Audio/Video Recording = Audio/video opnemen
-AxisSwap = Assen wisselen
+Axis swap (hold) = Assen wisselen (ingedrukt)  # AI translated
+Axis swap (toggle) = Assen wisselen (schakelaar)  # AI translated
 Circle = Cirkel
 Cross = Kruis
 Custom %d = Custom %d
diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
index c69eb617bf..a506fbac8e 100644
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@@ -856,7 +856,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog stick
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Axis swap
+Axis swap (hold) = Axis swap (hold)
+Axis swap (toggle) = Axis swap (toggle)
 Circle = Sirkel
 Cross = X
 Custom %d = Custom %d
diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
index cc5cc90b0f..c2a56edcb7 100644
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@@ -860,7 +860,8 @@ Analog limiter = Ogranicznik analoga
 Analog speed = Prędkość analoga
 Analog Stick = Gałka analogowa
 Audio/Video Recording = Nagrywanie audio/video
-AxisSwap = Zamiana osi
+Axis swap (hold) = Zamiana osi (przytrzymanie)  # AI translated
+Axis swap (toggle) = Zamiana osi (przełącznik)  # AI translated
 Circle = Kółko
 Cross = Krzyżyk
 Custom %d = Niestandardowe %d
diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
index fb76224731..69d8541e36 100644
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@@ -880,7 +880,8 @@ Analog limiter = Limitador do analógico
 Analog speed = Velocidade do analógico
 Analog Stick = Direcional analógico
 Audio/Video Recording = Gravação de Áudio/Vídeo
-AxisSwap = Trocar eixos
+Axis swap (hold) = Trocar eixos (segurar) # AI translated
+Axis swap (toggle) = Trocar eixos (alternar)  # AI translated
 Circle = Círculo
 Cross = Cruz
 Custom %d = Personalizar %d
diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
index a57cb95238..eabdb5856c 100644
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@@ -881,7 +881,8 @@ Analog limiter = Limitador do analógico
 Analog speed = Velocidade do analógico
 Analog Stick = Analógico
 Audio/Video Recording = Gravação de Áudio / Vídeo
-AxisSwap = Trocar Eixos
+Axis swap (hold) = Trocar Eixos (pressionar) # AI translated
+Axis swap (toggle) = Trocar Eixos (Alternar) # AI translated
 Circle = Círculo
 Cross = Cruz
 Custom %d = %d personalizado
diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
index bc7827fd15..772d225786 100644
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@@ -857,7 +857,8 @@ Analog limiter = Limitator analog
 Analog speed = Analog speed
 Analog Stick = Băț analog
 Audio/Video Recording = Audio/Video recording
-AxisSwap = Schimbare axe
+Axis swap (hold) = Schimbare axe
+Axis swap (toggle) = Schimbare axe
 Circle = Circle
 Cross = Cross
 Custom %d = Custom %d
diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
index d47b571c21..c440f29ac2 100644
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@@ -856,7 +856,8 @@ Analog limiter = Аналоговый ограничитель
 Analog speed = Аналоговая скорость
 Analog Stick = Аналоговый стик
 Audio/Video Recording = Запись аудио/видео
-AxisSwap = Смена осей
+Axis swap (hold) = Смена осей
+Axis swap (toggle) = Смена осей
 Circle = Кружок
 Cross = Крестик
 Custom %d = Пользовательская %d
diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
index 73adaba420..f242c96242 100644
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@@ -857,7 +857,8 @@ Analog limiter = Analog limiter
 Analog speed = Analog speed
 Analog Stick = Analog-sticka
 Audio/Video Recording = Audio/Video-inspelning
-AxisSwap = Byt axlar
+Axis swap (hold) = Byt axlar (håll)
+Axis swap (toggle) = Byt axlar (toggla)
 Circle = Cirkel
 Cross = Kryss
 Custom %d = Anpassad %d
@@ -879,24 +880,24 @@ Down = D-pad Ner
 Dpad = Riktningsknappar
 Exit App = Avsluta app
 Frame Advance = Stega bildruta
-Hold = Hold
-Home = Home
+Hold = Håll
+Home = Hem
 L = L
 Left = D-pad Vänster
 Load State = Läs in tillstånd
-Mute toggle = Mute toggle
+Mute toggle = Toggla ljud
 Next Slot = Nästa slot
 None = Ingen
 Note = Not
 OpenChat = Öppna chatt
 Pause (no menu) = Paus (utan meny)
 Pause = Paus
-Previous Slot = Previous Slot
+Previous Slot = Föregående slot
 R = R
 RapidFire = Rapid-fire
 Record = Spela in
 Remote hold = Remote hold
-Reset = Reset
+Reset = Återställ
 Rewind = Spola tillbaka
 Right = D-pad Höger
 Right Analog Stick = Analog-sticka höger
@@ -909,24 +910,24 @@ Rotate Analog (CW) = Rotera analog (CW)
 Save State = Spara tillstånd
 Screen = Skärm
 Screenshot = Skärmdump
-Select = Select
-SpeedToggle = Speed toggle
+Select = Välj
+SpeedToggle = Toggla hastighet
 Square = Kvadrat
 Start = Start
-Swipe Down = Swipe Down
-Swipe Left = Swipe Left
-Swipe Right = Swipe Right
-Swipe Up = Swipe Up
+Swipe Down = Svep ner
+Swipe Left = Svep vänster
+Swipe Right = Svep höger
+Swipe Up = Svep upp
 tap to customize = klicka för att anpassa
 Texture Dumping = Textur-dumpning
 Texture Replacement = Textur-ersättning
-Toggle Debugger = Toggle Debugger
-Toggle Fullscreen = Växla fullskärm
+Toggle Debugger = Toggla debugger
+Toggle Fullscreen = Toggla fullskärm
 Toggle mode = Toggla läge
-Toggle mouse input = Toggle mouse input
-Toggle tilt control = Toggle tilt control
-Toggle touch controls = Toggle touch controls
-Toggle WLAN = Toggle WLAN
+Toggle mouse input = Toggla musinmatning
+Toggle tilt control = Toggla tilt-kontroll
+Toggle touch controls = Toggla touch-kontroller
+Toggle WLAN = Toggla WLAN
 Triangle = Triangel
 Fast-forward = Snabbspola
 Up = Dpad Upp
diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
index 18a30e9d36..422bcb9a41 100644
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@@ -857,7 +857,8 @@ Analog limiter = Limiter ng Analog
 Analog speed = Bilis ng kilos ni Analog
 Analog Stick = Analog stick
 Audio/Video Recording = Pagre-rekord ng Audio/Video
-AxisSwap = Pagpapalitan ng axis
+Axis swap (hold) = Pagpapalitan ng axis (hold)
+Axis swap (toggle) = Pagpapalitan ng axis (toggle)
 Circle = Bilog
 Cross = Ekis
 Custom %d = Kustom na %d
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index bce5408623..b1006ff9b4 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -874,7 +874,8 @@ Analog limiter = ตัวจำกัดปุ่มอนาล็อก
 Analog speed = ความเร็วอนาล็อก
 Analog Stick = ปุ่มอนาล็อก
 Audio/Video Recording = อัดบันทึกวีดีโอ/เสียง
-AxisSwap = สลับด้านแกน
+Axis swap (hold) = สลับด้านแกน (กดค้าง)  # AI translated
+Axis swap (toggle) = สลับด้านแกน (กดสลับ)  # AI translated
 Circle = วงกลม
 Cross = กากบาท
 Custom %d = ปุ่มปรับแต่ง %d
diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini
index 50c037c75a..6753ea3be1 100644
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@@ -858,7 +858,8 @@ Analog limiter = Analog sınırlayıcı
 Analog speed = Analog speed
 Analog Stick = Analog çubuk
 Audio/Video Recording = Ses/Video kaydı
-AxisSwap = Eksenleri değiştir
+Axis swap (hold) = Eksenleri değiştir (hold)
+Axis swap (toggle) = Eksenleri değiştir (toggle)
 Circle = Daire (O)
 Cross = Çarpı (X)
 Custom %d = Özel %d
diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini
index 2ecfa1d2c8..628e828cf1 100644
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@@ -856,7 +856,8 @@ Analog limiter = Аналоговий обмежувач
 Analog speed = Аналогова швидкість
 Analog Stick = Аналоговий стік
 Audio/Video Recording = Запис аудіо / відео
-AxisSwap = Обмін осей
+Axis swap (hold) = Обмін осей (удержание)  # AI translated
+Axis swap (toggle) = Обмін осей (переключатель)  # AI translated
 Circle = Коло
 Cross = Хрестик
 Custom %d = Кастомний %d
diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini
index 2873ce1fd8..23c2345d79 100644
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@@ -856,7 +856,8 @@ Analog limiter = giới hạng Analog
 Analog speed = Analog speed
 Analog Stick = Cần Analog
 Audio/Video Recording = Ghi Audio/Video
-AxisSwap = Hoán đổi trục
+Axis swap (hold) = Hoán đổi trục (giữ)  # AI translated
+Axis swap (toggle) = Hoán đổi trục (chuyển đổi)  # AI translated
 Circle = Tròn
 Cross = Cross (chéo)
 Custom %d = Custom %d
diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini
index c1712e698e..55de3cb672 100644
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@@ -856,7 +856,8 @@ Analog limiter = 摇杆限制
 Analog speed = 摇杆控速
 Analog Stick = 左摇杆
 Audio/Video Recording = 录制音频视频
-AxisSwap = 摇杆/方向键互换
+Axis swap (hold) = 摇杆/方向键互换 (按住) # AI translated
+Axis swap (toggle) = 摇杆/方向键互换 (切换) # AI translated
 Circle = 圆圈键
 Cross = 叉键
 Custom %d = 自定义%d
diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini
index c827bd2bfb..0bcd603d30 100644
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@@ -856,7 +856,8 @@ Analog limiter = 類比限制器
 Analog speed = 類比速度
 Analog Stick = 類比搖桿
 Audio/Video Recording = 音訊/視訊錄製
-AxisSwap = 軸交換
+Axis swap (hold) = 軸交換 (按住) # AI translated
+Axis swap (toggle) = 軸交換 (切換) # AI translated
 Circle = ○
 Cross = ×
 Custom %d = 自訂 %d