diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/LayoutSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/LayoutSwitchPatch.kt
index f4c8c6139..6758e0449 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/LayoutSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/LayoutSwitchPatch.kt
@@ -2,19 +2,22 @@ package app.revanced.patches.youtube.general.layoutswitch
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.general.layoutswitch.fingerprints.GetFormFactorFingerprint
+import app.revanced.patches.shared.fingerprints.CreatePlayerRequestBodyWithModelFingerprint
+import app.revanced.patches.youtube.general.layoutswitch.fingerprints.FormFactorEnumConstructorFingerprint
 import app.revanced.patches.youtube.general.layoutswitch.fingerprints.LayoutSwitchFingerprint
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
-import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
+import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL_PATH
 import app.revanced.patches.youtube.utils.settings.SettingsPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import app.revanced.util.patch.BaseBytecodePatch
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 @Suppress("unused")
 object LayoutSwitchPatch : BaseBytecodePatch(
@@ -23,52 +26,51 @@ object LayoutSwitchPatch : BaseBytecodePatch(
     dependencies = setOf(SettingsPatch::class),
     compatiblePackages = COMPATIBLE_PACKAGE,
     fingerprints = setOf(
-        GetFormFactorFingerprint,
+        CreatePlayerRequestBodyWithModelFingerprint,
+        FormFactorEnumConstructorFingerprint,
         LayoutSwitchFingerprint
     )
 ) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$GENERAL_PATH/LayoutSwitchPatch;"
+
     override fun execute(context: BytecodeContext) {
 
-        // region patch for enable tablet layout
+        val formFactorEnumClass = FormFactorEnumConstructorFingerprint
+            .resultOrThrow()
+            .mutableMethod
+            .definingClass
 
-        GetFormFactorFingerprint.resultOrThrow().let {
-            it.mutableMethod.apply {
-                val jumpIndex = indexOfFirstInstructionReversedOrThrow(Opcode.SGET_OBJECT)
-
-                addInstructionsWithLabels(
-                    0, """
-                        invoke-static { }, $GENERAL_CLASS_DESCRIPTOR->enableTabletLayout()Z
-                        move-result v0 # Free register
-                        if-nez v0, :is_large_form_factor
-                        """,
-                    ExternalLabel(
-                        "is_large_form_factor",
-                        getInstruction(jumpIndex)
-                    )
-                )
+        CreatePlayerRequestBodyWithModelFingerprint.resultOrThrow().mutableMethod.apply {
+            val index = indexOfFirstInstructionOrThrow {
+                val reference = getReference<FieldReference>()
+                opcode == Opcode.IGET &&
+                        reference?.definingClass == formFactorEnumClass &&
+                        reference.type == "I"
             }
+            val register = getInstruction<TwoRegisterInstruction>(index).registerA
+
+            addInstructions(
+                index + 1, """
+                    invoke-static {v$register}, $INTEGRATIONS_CLASS_DESCRIPTOR->getFormFactor(I)I
+                    move-result v$register
+                    """
+            )
         }
 
-        // endregion
-
-        // region patch for enable phone layout
-
         LayoutSwitchFingerprint.resultOrThrow().let {
             it.mutableMethod.apply {
-                val insertIndex = indexOfFirstInstructionReversedOrThrow(Opcode.IF_NEZ)
-                val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+                val index = indexOfFirstInstructionReversedOrThrow(Opcode.IF_NEZ)
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
 
                 addInstructions(
-                    insertIndex, """
-                        invoke-static {v$insertRegister}, $GENERAL_CLASS_DESCRIPTOR->enablePhoneLayout(I)I
-                        move-result v$insertRegister
+                    index, """
+                        invoke-static {v$register}, $INTEGRATIONS_CLASS_DESCRIPTOR->getWidthDp(I)I
+                        move-result v$register
                         """
                 )
             }
         }
 
-        // endregion
-
         /**
          * Add settings
          */
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/fingerprints/FormFactorEnumConstructorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/fingerprints/FormFactorEnumConstructorFingerprint.kt
new file mode 100644
index 000000000..2c2f41211
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/fingerprints/FormFactorEnumConstructorFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.general.layoutswitch.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object FormFactorEnumConstructorFingerprint : MethodFingerprint(
+    returnType = "V",
+    strings = listOf(
+        "UNKNOWN_FORM_FACTOR",
+        "SMALL_FORM_FACTOR",
+        "LARGE_FORM_FACTOR"
+    )
+)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/fingerprints/GetFormFactorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/fingerprints/GetFormFactorFingerprint.kt
deleted file mode 100644
index c3f22c424..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/general/layoutswitch/fingerprints/GetFormFactorFingerprint.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.patches.youtube.general.layoutswitch.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object GetFormFactorFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    returnType = "L",
-    parameters = listOf("Landroid/content/Context;", "Ljava/util/List;"),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.RETURN_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT
-    )
-)
\ No newline at end of file
diff --git a/src/main/resources/youtube/settings/host/values/arrays.xml b/src/main/resources/youtube/settings/host/values/arrays.xml
index 616c6bc4b..e5c6ba418 100644
--- a/src/main/resources/youtube/settings/host/values/arrays.xml
+++ b/src/main/resources/youtube/settings/host/values/arrays.xml
@@ -22,6 +22,20 @@
         <item>MIDDLE</item>
         <item>END</item>
     </string-array>
+    <string-array name="revanced_change_layout_entries">
+        <item>@string/revanced_change_layout_entry_1</item>
+        <item>@string/revanced_change_layout_entry_2</item>
+        <item>@string/revanced_change_layout_entry_3</item>
+        <item>@string/revanced_change_layout_entry_4</item>
+        <item>@string/revanced_change_layout_entry_5</item>
+    </string-array>
+    <string-array name="revanced_change_layout_entry_values">
+        <item>ORIGINAL</item>
+        <item>SMALL_FORM_FACTOR</item>
+        <item>SMALL_FORM_FACTOR_WIDTH_DP</item>
+        <item>LARGE_FORM_FACTOR</item>
+        <item>LARGE_FORM_FACTOR_WIDTH_DP</item>
+    </string-array>
     <string-array name="revanced_change_start_page_entries">
         <item>@string/revanced_change_start_page_entry_default</item>
         <item>@string/revanced_change_start_page_entry_search</item>
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index e466d7ab0..67b9161c1 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -364,10 +364,12 @@ Limitation: Back button on the toolbar may not work."</string>
     <string name="revanced_remove_viewer_discretion_dialog_summary">"Removes the viewer discretion dialog.
 This does not bypass the age restriction. It just accepts it automatically."</string>
 
-    <string name="revanced_enable_phone_layout_title">Enable phone layout</string>
-    <string name="revanced_enable_phone_layout_summary">Spoofs the dpi to use some phone layouts.</string>
-    <string name="revanced_enable_tablet_layout_title">Enable tablet layout</string>
-    <string name="revanced_enable_tablet_layout_summary">Spoofs the dpi to use some tablet layouts.</string>
+    <string name="revanced_change_layout_title">Change layout</string>
+    <string name="revanced_change_layout_entry_1">Original</string>
+    <string name="revanced_change_layout_entry_2">Phone</string>
+    <string name="revanced_change_layout_entry_3">Phone (Max 480 dip)</string>
+    <string name="revanced_change_layout_entry_4">Tablet</string>
+    <string name="revanced_change_layout_entry_5">Tablet (Min 600 dip)</string>
 
     <string name="revanced_spoof_app_version_title">Spoof app version</string>
     <string name="revanced_spoof_app_version_summary_on">Version spoofed</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 67047fead..832a693c9 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -256,8 +256,7 @@
         <PreferenceCategory android:title="@string/revanced_preference_category_experimental_flag" android:layout="@layout/revanced_settings_preferences_category"/>PREFERENCE_CATEGORY: GENERAL_EXPERIMENTAL_FLAGS -->
 
         <!-- SETTINGS: LAYOUT_SWITCH
-        <SwitchPreference android:title="@string/revanced_enable_phone_layout_title" android:key="revanced_enable_phone_layout" android:summary="@string/revanced_enable_phone_layout_summary" />
-        <SwitchPreference android:title="@string/revanced_enable_tablet_layout_title" android:key="revanced_enable_tablet_layout" android:summary="@string/revanced_enable_tablet_layout_summary" />SETTINGS: LAYOUT_SWITCH -->
+        <ListPreference android:entries="@array/revanced_change_layout_entries" android:title="@string/revanced_change_layout_title" android:key="revanced_change_layout" android:entryValues="@array/revanced_change_layout_entry_values" />SETTINGS: LAYOUT_SWITCH -->
 
         <!-- SETTINGS: SPOOF_APP_VERSION
         <SwitchPreference android:title="@string/revanced_spoof_app_version_title" android:key="revanced_spoof_app_version" android:summaryOn="@string/revanced_spoof_app_version_summary_on" android:summaryOff="@string/revanced_spoof_app_version_summary_off" />