diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp
index 216002f1cb..dc0d6006da 100644
--- a/Common/VR/PPSSPPVR.cpp
+++ b/Common/VR/PPSSPPVR.cpp
@@ -388,15 +388,9 @@ void UpdateVRInput(bool haptics, float dp_xscale, float dp_yscale) {
 						g_Config.fCameraHeight = clampFloat(g_Config.fCameraHeight, -150.0f, 150.0f);
 						break;
 					case JOYSTICK_AXIS_Z:
-						if (g_Config.bEnableVR) {
-							if (axis.second < -0.75f) g_Config.fHeadUpDisplayScale -= 0.01f;
-							if (axis.second > 0.75f) g_Config.fHeadUpDisplayScale += 0.01f;
-							g_Config.fHeadUpDisplayScale = clampFloat(g_Config.fHeadUpDisplayScale, 0.0f, 1.5f);
-						} else {
-							if (axis.second < -0.75f) g_Config.fCanvas3DDistance += 0.1f;
-							if (axis.second > 0.75f) g_Config.fCanvas3DDistance -= 0.1f;
-							g_Config.fCanvas3DDistance = clampFloat(g_Config.fCanvas3DDistance, 1.0f, 15.0f);
-						}
+						if (axis.second < -0.75f) g_Config.fCameraPitch -= 0.5f;
+						if (axis.second > 0.75f) g_Config.fCameraPitch += 0.5f;
+						g_Config.fCameraPitch = clampFloat(g_Config.fCameraPitch, -90.0f, 90.0f);
 						break;
 					case JOYSTICK_AXIS_RZ:
 						if (axis.second > 0.75f) g_Config.fCameraDistance -= 0.1f;
@@ -539,11 +533,10 @@ bool UpdateVRKeys(const KeyInput &key) {
 
 	// Reset camera adjust
 	if (pspKeys[VIRTKEY_VR_CAMERA_ADJUST] && pspKeys[VIRTKEY_VR_CAMERA_RESET]) {
-		g_Config.fCanvas3DDistance = 3.0f;
 		g_Config.fCameraHeight = 0;
 		g_Config.fCameraSide = 0;
 		g_Config.fCameraDistance = 0;
-		g_Config.fHeadUpDisplayScale = 0.3f;
+		g_Config.fCameraPitch = 0;
 	}
 
 	//block keys by camera adjust
@@ -878,23 +871,13 @@ void UpdateVRViewMatrices() {
 		invView = XrPosef_Inverse(invView);
 	}
 
-	// apply camera pitch offset
-	float pitchOffset = 0;
+	// apply camera pitch
+	float s = sin(ToRadians(g_Config.fCameraPitch));
+	float c = cos(ToRadians(g_Config.fCameraPitch));
 	XrVector3f positionOffset = {g_Config.fCameraSide, g_Config.fCameraHeight, g_Config.fCameraDistance};
-	if (!flatScreen) {
-		switch (g_Config.iCameraPitch) {
-			case 1: //Top view -> First person
-				pitchOffset = 90;
-				positionOffset = {positionOffset.x, positionOffset.z, -positionOffset.y};
-				break;
-			case 2: //First person -> Top view
-				pitchOffset = -90;
-				positionOffset = {positionOffset.x, -positionOffset.z + 20, positionOffset.y};
-				break;
-		}
-		XrQuaternionf rotationOffset = XrQuaternionf_CreateFromVectorAngle({1, 0, 0}, ToRadians(pitchOffset));
-		invView.orientation = XrQuaternionf_Multiply(rotationOffset, invView.orientation);
-	}
+	positionOffset = {positionOffset.x, s * positionOffset.z + c * positionOffset.y, c * positionOffset.z - s * positionOffset.y};
+	XrQuaternionf rotationOffset = XrQuaternionf_CreateFromVectorAngle({1, 0, 0}, ToRadians(g_Config.fCameraPitch));
+	invView.orientation = XrQuaternionf_Multiply(rotationOffset, invView.orientation);
 
 	// decompose rotation
 	XrVector3f rotation = XrQuaternionf_ToEulerAngles(invView.orientation);
@@ -912,14 +895,14 @@ void UpdateVRViewMatrices() {
 	invView.orientation = XrQuaternionf_Multiply(roll, XrQuaternionf_Multiply(pitch, yaw));
 	if (!VR_GetConfig(VR_CONFIG_REPROJECTION)) {
         float axis = vrMirroring[VR_MIRRORING_PITCH] ? -1.0f : 1.0f;
-		invView.orientation = XrQuaternionf_CreateFromVectorAngle({axis, 0, 0}, ToRadians(pitchOffset));
+		invView.orientation = XrQuaternionf_CreateFromVectorAngle({axis, 0, 0}, ToRadians(g_Config.fCameraPitch));
 	}
 
 	float M[16];
 	XrQuaternionf_ToMatrix4f(&invView.orientation, M);
 
 	// Apply 6Dof head movement
-	if (g_Config.bEnable6DoF && !g_Config.bHeadRotationEnabled && (g_Config.iCameraPitch == 0)) {
+	if (g_Config.bEnable6DoF && !g_Config.bHeadRotationEnabled) {
 		M[3] -= vrView[0].pose.position.x * (vrMirroring[VR_MIRRORING_AXIS_X] ? -1.0f : 1.0f) * scale;
 		M[7] -= vrView[0].pose.position.y * (vrMirroring[VR_MIRRORING_AXIS_Y] ? -1.0f : 1.0f) * scale;
 		M[11] -= vrView[0].pose.position.z * (vrMirroring[VR_MIRRORING_AXIS_Z] ? -1.0f : 1.0f) * scale;
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 8c761b2809..20a12f3b59 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -965,7 +965,7 @@ static const ConfigSetting vrSettings[] = {
 	ConfigSetting("VRCameraDistance", &g_Config.fCameraDistance, 0.0f, CfgFlag::PER_GAME),
 	ConfigSetting("VRCameraHeight", &g_Config.fCameraHeight, 0.0f, CfgFlag::PER_GAME),
 	ConfigSetting("VRCameraSide", &g_Config.fCameraSide, 0.0f, CfgFlag::PER_GAME),
-	ConfigSetting("VRCameraPitch", &g_Config.iCameraPitch, 0, CfgFlag::PER_GAME),
+	ConfigSetting("VRCameraPitch", &g_Config.fCameraPitch, 0.0f, CfgFlag::PER_GAME),
 	ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 12.0f, CfgFlag::DEFAULT),
 	ConfigSetting("VRCanvas3DDistance", &g_Config.fCanvas3DDistance, 3.0f, CfgFlag::DEFAULT),
 	ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f, CfgFlag::PER_GAME),
diff --git a/Core/Config.h b/Core/Config.h
index dac19b61dd..90804c1f99 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -490,6 +490,7 @@ public:
 	float fCameraDistance;
 	float fCameraHeight;
 	float fCameraSide;
+	float fCameraPitch;
 	float fCanvasDistance;
 	float fCanvas3DDistance;
 	float fFieldOfViewPercentage;
@@ -498,7 +499,6 @@ public:
 	float fHeadRotationScale;
 	bool bHeadRotationEnabled;
 	bool bHeadRotationSmoothing;
-	int iCameraPitch;
 
 	// Debugger
 	int iDisasmWindowX;
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 2503ba6db5..f75e610de6 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1311,8 +1311,6 @@ void GameSettingsScreen::CreateVRSettings(UI::ViewGroup *vrSettings) {
 	vrSettings->Add(new CheckBox(&g_Config.bEnableMotions, vr->T("Map controller movements to keys")));
 	PopupSliderChoiceFloat *vrMotions = vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fMotionLength, 0.3f, 1.0f, 0.5f, vr->T("Motion needed to generate action"), 0.1f, screenManager(), vr->T("m")));
 	vrMotions->SetEnabledPtr(&g_Config.bEnableMotions);
-	static const char *cameraPitchModes[] = { "Disabled", "Top view -> First person", "First person -> Top view" };
-	vrSettings->Add(new PopupMultiChoice(&g_Config.iCameraPitch, vr->T("Camera type"), cameraPitchModes, 0, 3, I18NCat::NONE, screenManager()));
 }
 
 UI::EventReturn GameSettingsScreen::OnAutoFrameskip(UI::EventParams &e) {
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
index 79aae45269..64dbb04b07 100644
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@@ -1419,7 +1419,6 @@ New version of PPSSPP available = ‎تتوفر نسخة جديدة من الب
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = وضع الكاميرا
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
index 520716fef4..06917124d4 100644
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = New version of PPSSPP available
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
index 5dfd500b06..a511c12878 100644
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Налична е нова версия на P
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
index ce8a0924f6..04b0e44f01 100644
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Nova versió de PPSSPP disponible
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
index 0fcc4cfc05..cb7ab0d07c 100644
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Je dostupná nová verze PPSSPP
 % of native FoV = % výchozího FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
index a94d0c8df0..de7dde1d9a 100644
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Ny version af PPSSPP tilgængelig
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index 99815e7bc8..8df0181d98 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Neue PPSSPP Version verfügbar
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Kameratyp
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
index 30ff0674a6..575081a0c0 100644
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = New version of PPSSPP available
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
index 608ad6c1db..1fc72831a3 100644
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@@ -1448,7 +1448,6 @@ Heads-up display detection = Heads-up display detection
 Map controller movements to keys = Map controller movements to keys
 Map HMD rotations on keys instead of VR camera = Map HMD rotations on keys instead of VR camera
 Manual switching between flat screen and VR using SCREEN key = Manual switching between flat screen and VR using SCREEN key
-Camera type = Camera type
 Motion needed to generate action = Motion needed to generate action
 Stereoscopic vision (Experimental) = Stereoscopic vision (Experimental)
 Virtual reality = Virtual reality
diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
index 40cf55334f..8aaf460468 100644
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@@ -1413,7 +1413,6 @@ New version of PPSSPP available = Nueva versión de PPSSPP disponible
 % of native FoV = % de campo de visión nativo
 6DoF movement = Movimiento 6DoF
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distancia de los menús y escenas 2D
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
index b7694710e0..c01e62d445 100644
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@@ -1413,7 +1413,6 @@ New version of PPSSPP available = Nueva versión de PPSSPP disponible
 % of native FoV = % of native FoV
 6DoF movement = movimiento 6DoF 
 Anti-flickering flow = Anti-flickering flow
-Camera type = Tipo de cámara
 Distance to 2D menus and scenes = Distancia a menús y escenas 2D
 Distance to 3D scenes when VR disabled = Distancia a escenas 3D cuando la realidad virtual está desactivada
 Experts only = Solo expertos
diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
index 2899f1b39d..0641f3a7ea 100644
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available =  ورژن جدیدی از ppsspp موجود ا
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
index 06cc3d2074..ff54e578e4 100644
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Uusi PPSSPP-versio saatavilla
 % of native FoV = % of native FoV
 6DoF movement = 6DoF-liike (kuusi vapausastetta)
 Anti-flickering flow = Anti-flickering flow
-Camera type = Kameratyyppi
 Distance to 2D menus and scenes = Etäisyys 2D-valikkoihin ja kohtauksiin
 Distance to 3D scenes when VR disabled = Etäisyys 3D-kohtauksiin, kun VR on poistettu käytöstä
 Experts only = Vain asiantuntijoille
diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
index 60e8fb9959..486b9d6ed1 100644
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@@ -1402,7 +1402,6 @@ New version of PPSSPP available = Nouvelle version de PPSSPP disponible
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
index 77264f90a5..cfdeadf655 100644
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Nova versión de PPSSPP dispoñible
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
index d92754c353..b2c040a44a 100644
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Νέα διαθέσιμη έκδοση PPSSPP
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
index ca14aa5b37..d41d93f0d4 100644
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = New version of PPSSPP available
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
index a7a59b2d40..3062bd5e46 100644
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = New version of PPSSPP available
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
index 84ab5ab86f..b39fafecbc 100644
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Nova verzija PPSSPP-a je dostupna
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
index 6484f08db3..dff4f54ec1 100644
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Elérhető a PPSSPP egy újabb verziója
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
index 5879a29393..7f8b5b72d0 100644
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Versi baru PPSSPP tersedia
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
index a122d99995..9c7eec56dd 100644
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@@ -1413,7 +1413,6 @@ New version of PPSSPP available = È disponibile una nuova versione di PPSSPP
 % of native FoV = % del FoV nativo
 6DoF movement = Movimento 6DoF
 Anti-flickering flow = Anti-flickering flow
-Camera type = Tipo di telecamera
 Distance to 2D menus and scenes = Distanza dai menu e dalle scene 2D
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Solo per esperti
diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
index 90782e25be..1c52dc5017 100644
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = 新しいバージョンのPPSSPPを利用で
 % of native FoV = ネイティブ視野角(FoV)の %
 6DoF movement = 6DoF動作
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = 2Dメニューと空間までの距離
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
index 55dd64e166..64e4962368 100644
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Versi anyar PPSSPP mpun ono monggo di comot
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
index 7949ec8d91..2bca58f5d8 100644
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@@ -1424,7 +1424,6 @@ Heads-up display detection = 헤드업 디스플레이 감지
 Map controller movements to keys = 컨트롤러 이동을 키에 매핑
 Map HMD rotations on keys instead of VR camera = VR 카메라 대신 키에 HMD 회전 매핑하기
 Manual switching between flat screen and VR using SCREEN key = 화면 키를 사용하여 평면 화면과 VR 간 수동 전환
-Camera type = 카메라 유형
 Motion needed to generate action = 동작 생성에 필요한 동작
 Stereoscopic vision (Experimental) = 입체시 (실험적)
 Virtual reality = 가상 현실
diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini
index ea6061f330..8345d1c487 100644
--- a/assets/lang/ku_SO.ini
+++ b/assets/lang/ku_SO.ini
@@ -1438,7 +1438,6 @@ Heads-up display detection = Heads-up display detection
 Map controller movements to keys = Map controller movements to keys
 Map HMD rotations on keys instead of VR camera = Map HMD rotations on keys instead of VR camera
 Manual switching between flat screen and VR using SCREEN key = Manual switching between flat screen and VR using SCREEN key
-Camera type = Camera type
 Motion needed to generate action = Motion needed to generate action
 Stereoscopic vision (Experimental) = Stereoscopic vision (Experimental)
 Virtual reality = Virtual reality
diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
index 26a0f44628..9546e8a2ba 100644
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = ເວີຊັ່ນໃໝ່ຂອງ PPSSPP
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
index cadeb8d458..44120b9f61 100644
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Galima nauja "PPSSPP" versija
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
index dc302d2636..90edc776d0 100644
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Versi terbaru PPSSPP tersedia
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
index 888c08bb1b..6dfa9be5df 100644
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Er is een nieuwe versie van PPSSPP beschikbaar
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
index c606f1d6ea..f687f0a246 100644
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = New version of PPSSPP available
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
index 94b2763e75..e23fe88f00 100644
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@@ -1416,7 +1416,6 @@ New version of PPSSPP available = Dostępna jest nowa wersja PPSSPP!
 % of native FoV = % natywnego FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Typ kamery
 Distance to 2D menus and scenes = Dystans do elementów 2D
 Distance to 3D scenes when VR disabled = Dystans do scen 3D przy wyłączonym VR
 Experts only = Tylko dla ekspertów
diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
index c9a73694f5..106d0ee026 100644
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@@ -1448,7 +1448,6 @@ Heads-up display detection = Detecção do aviso antecipado da exibição
 Map controller movements to keys = Mapear os movimentos do controle nas teclas
 Map HMD rotations on keys instead of VR camera = Rotações HMD do mapa nas teclas ao invés da câmera da realidade virtual
 Manual switching between flat screen and VR using SCREEN key = Troca manual entre a tela plana e a realidade virtual usando a tecla da TELA
-Camera type = Tipo de câmera
 Motion needed to generate action = Movimento necessário pra gerar ação
 Stereoscopic vision (Experimental) = Visão estereoscópica (Experimental)
 Virtual reality = Realidade virtual
diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
index aab4f350f7..2c80428c3f 100644
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@@ -1438,7 +1438,6 @@ Screen representation = Representação da tela
 % of native FoV = % do campo de visão (FoV) nativo
 6DoF movement = Movimento 6DoF
 Anti-flickering flow = Anti-flickering flow
-Camera type = Tipo de câmera
 Distance to 2D menus and scenes = Distância aos menus e cenas 2D
 Distance to 3D scenes when VR disabled = Distância às cenas 3D quando a realidade virtual estiver desativada
 Experts only = Apenas programadores
diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
index 2cae6bca21..d26921018e 100644
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@@ -1412,7 +1412,6 @@ New version of PPSSPP available = Nouă versiune de PPSSPP disponibilă.
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
index ef30c0f692..0a5868db70 100644
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Доступна новая версия PPSSP
 % of native FoV = % стандартного угла обзора
 6DoF movement = Движение 6DoF
 Anti-flickering flow = Anti-flickering flow
-Camera type = Тип камеры
 Distance to 2D menus and scenes = Расстояние до 2D-меню и сцен
 Distance to 3D scenes when VR disabled = Расстояние до 3D-сцен при отключенной ВР
 Experts only = Только для экспертов
diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
index 242095757a..60b22a1cc9 100644
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@@ -1412,7 +1412,6 @@ New version of PPSSPP available = Ny version av PPSSPP tillgänglig
 % of native FoV = % of native FoV
 6DoF movement = 6DoF rörelse
 Anti-flickering flow = Anti-flickering flow
-Camera type = Kameratyp
 Distance to 2D menus and scenes = Avstånd till 2D-menyer och scener
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
index 0bf7d8cffe..35e170a1ce 100644
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@@ -1415,7 +1415,6 @@ New version of PPSSPP available = Meron nang bagong bersiyon ang PPSSPP
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Uri ng Camera
 Distance to 2D menus and scenes = Distansya sa mga 2D na menu at mga eksena
 Distance to 3D scenes when VR disabled = Distansya sa mga 3D na eksena noong hindi pinagana ang VR
 Experts only = Mga eksperto lamang
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index 3ae7d7d457..c49af8430e 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -1438,14 +1438,11 @@ New version of PPSSPP available = PPSSPP เวอร์ชั่นใหม่
 % of native FoV = % ของค่า FoV ดั้งเดิม
 6DoF movement = การเคลื่อนไหวแบบ 6DoF
 Anti-flickering flow = Anti-flickering flow
-Camera type = ปรับแต่งประเภทมุมกล้อง
-Disabled = ปิดการใช้งาน
 Distance to 2D menus and scenes = ระยะห่างจากเมนูสองมิติ และฉาก
 Distance to 3D scenes when VR disabled = ระยะห่างจากฉากสามมิติ เมื่อ VR ถูกปิดใช้งาน
 Enable passthrough = เปิดใช้งานการส่งผ่าน
 Experts only = สำหรับผู้เชี่ยวชาญเท่านั้น
 Field of view scale = สเกลของมุมมองพื้นที่รอบตัว
-First person -> Top view = มุมมองบุคคลที่หนึ่ง -> มุมมองจากด้านบน
 Force 72Hz update = บังคับรีเฟรชเรทไปที่ 72Hz
 Game camera rotation step per frame = สเต็ปการหมุนมุมกล้องเกมต่อเฟรม
 Game camera uses rotation smoothing = มุมกล้องเกมใช้การหมุนแบบนุ่มนวล
@@ -1456,7 +1453,6 @@ Map controller movements to keys = เซ็ตปุ่มควบคุมด
 Map HMD rotations on keys instead of VR camera = เซ็ตการควบคุมการหมุน HMD โดยใช้ปุ่มกด แทนการใช้กล้อง VR
 Motion needed to generate action = จำเป็นต้องขยับท่าทางเพื่อเซ็ตปุ่มที่ต้องการ
 Stereoscopic vision (Experimental) = มุมมองภาพแบบสามมิติ (ขั้นทดสอบ)
-Top view -> First person =  มุมมองจากด้านบน -> มุมมองบุคคลที่หนึ่ง
 Virtual reality = ความเป็นจริงเสมือน
 VR camera = มุมกล้อง VR
 VR controllers = จอยควบคุม VR
diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini
index d900347df3..096d54e316 100644
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@@ -1412,7 +1412,6 @@ New version of PPSSPP available = PPSSPP'nin yeni sürümü mevcut
 % of native FoV = % of native FoV
 6DoF movement = 6DoF hareketi
 Anti-flickering flow = Anti-flickering flow
-Camera type = Kamera türü
 Distance to 2D menus and scenes = 2D menülere ve sahnelere olan mesafe
 Distance to 3D scenes when VR disabled = VR devre dışı bırakıldığında 3D sahnelere olan mesafe
 Experts only = Yalnızca uzmanlar
diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini
index b781a426ec..2283e7489a 100644
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Доступна нова версія PPSSPP
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini
index b521dadcd6..e810f24979 100644
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@@ -1411,7 +1411,6 @@ New version of PPSSPP available = Đã có phiên bản mới của PPSSPP
 % of native FoV = % of native FoV
 6DoF movement = 6DoF movement
 Anti-flickering flow = Anti-flickering flow
-Camera type = Camera type
 Distance to 2D menus and scenes = Distance to 2D menus and scenes
 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled
 Experts only = Experts only
diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini
index cccad6e6f4..e7b0b0b7eb 100644
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@@ -1414,7 +1414,6 @@ Search term = 搜索关键词
 % of native FoV = 原生视角的%
 6DoF movement = 6自由度移动
 Anti-flickering flow = Anti-flickering flow
-Camera type = 相机类型
 Distance to 2D menus and scenes = 2D菜单和场景的距离
 Distance to 3D scenes when VR disabled = 3D场景的距离 (VR关闭时)
 Experts only = 专家模式
diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini
index 187a0310e4..106ecf498c 100644
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@@ -1412,7 +1412,6 @@ Screen representation = 螢幕呈現
 % of native FoV = % 於原生視野
 6DoF movement = 六自由度移動
 Anti-flickering flow = Anti-flickering flow
-Camera type = 相機類型
 Distance to 2D menus and scenes = 2D 選單及場景距離
 Distance to 3D scenes when VR disabled = VR 停用時的 3D 場景距離
 Experts only = 僅限專家