diff --git a/res/drawable/ic_hardware_switch.xml b/res/drawable/ic_hardware_switch.xml
deleted file mode 100644
index ba19d31d4618c2a0452947b9ac589360aacf2b1a..0000000000000000000000000000000000000000
--- a/res/drawable/ic_hardware_switch.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?android:attr/colorControlNormal"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <group
-        android:pivotX="480"
-        android:pivotY="480"
-        android:rotation="90">
-        <path
-            android:fillColor="#d8ff4f"
-            android:pathData="M201,600q-53,0 -86.5,-33.5T81,480q0,-53 33.5,-86.5T201,360h558q53,0 86.5,33.5T879,480q0,53 -33.5,86.5T759,600L201,600ZM566,540h197q26,0 43,-17t17,-43q0,-34 -17,-47t-43,-13L566,420v120Z"
-            android:fillType="evenOdd"/>
-    </group>
-</vector>
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index d33f1bc1b6028ac360dfaea20a78c501e1eb620e..ded5ce87205617375c5af3796edc22f2e5d10d22 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -27,9 +27,4 @@
 
     <!-- OpenKeyChain -->
     <string name="openkeychain_title" translatable="false">OpenKeychain</string>
-
-    <!-- Hardware Switch -->
-    <string name="hardware_switch_category_title">Hardware switch</string>
-    <string name="hardware_switch_title">Hardware switch</string>
-    <string name="hardware_switch_summary">Configure the hardware switch</string>
 </resources>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 4b73731773b22957e07bc5da65b091e14272a8d2..d36131c06f69beaf3e0975b95eb06d558edf58d4 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -84,21 +84,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="hardware_switch_category"
-        android:title="@string/hardware_switch_category_title" >
-
-        <lineageos.preference.RemotePreference
-            android:key="hardware_switch"
-            android:title="@string/hardware_switch_title"
-            android:summary="@string/hardware_switch_summary"
-            android:icon="@drawable/ic_hardware_switch"
-            lineage:requiresAction="org.lineageos.settings.device.HARDWARE_SWITCH_SETTINGS">
-            <intent android:action="org.lineageos.settings.device.HARDWARE_SWITCH_SETTINGS" />
-        </lineageos.preference.RemotePreference>
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="power_key"
         android:title="@string/hardware_keys_power_key_title" >
diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java
index 464c82f11cc4f387bd6065e88cca2497b28a7e40..810c17b8f559ffd9892f54ae413233666b471dfd 100644
--- a/src/org/lineageos/lineageparts/input/ButtonSettings.java
+++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java
@@ -98,7 +98,6 @@ public class ButtonSettings extends SettingsPreferenceFragment
     private static final String KEY_SWAP_CAPACITIVE_KEYS = "swap_capacitive_keys";
     private static final String KEY_NAV_BAR_INVERSE = "sysui_nav_bar_inverse";
     private static final String KEY_ENABLE_TASKBAR = "enable_taskbar";
-    private static final String KEY_HARDWARE_SWITCH = "hardware_switch";
 
     private static final String CATEGORY_POWER = "power_key";
     private static final String CATEGORY_HOME = "home_key";
@@ -110,7 +109,6 @@ public class ButtonSettings extends SettingsPreferenceFragment
     private static final String CATEGORY_VOLUME = "volume_keys";
     private static final String CATEGORY_NAVBAR = "navigation_bar_category";
     private static final String CATEGORY_EXTRAS = "extras_category";
-    private static final String CATEGORY_HARDWARE_SWITCH = "hardware_switch_category";
 
     private ListPreference mBackLongPressAction;
     private ListPreference mHomeLongPressAction;
@@ -182,7 +180,6 @@ public class ButtonSettings extends SettingsPreferenceFragment
         final PreferenceCategory volumeCategory = prefScreen.findPreference(CATEGORY_VOLUME);
         final PreferenceCategory cameraCategory = prefScreen.findPreference(CATEGORY_CAMERA);
         final PreferenceCategory extrasCategory = prefScreen.findPreference(CATEGORY_EXTRAS);
-        final PreferenceCategory hardwareSwitchCategory = prefScreen.findPreference(CATEGORY_HARDWARE_SWITCH);
 
         // Power button ends calls.
         mPowerEndCall = findPreference(KEY_POWER_END_CALL);
@@ -205,12 +202,6 @@ public class ButtonSettings extends SettingsPreferenceFragment
 
         mNavigationPreferencesCat = findPreference(CATEGORY_NAVBAR);
 
-        Preference hardwareSwitchPref = findPreference(KEY_HARDWARE_SWITCH);
-        if (hardwareSwitchCategory != null
-                && (hardwareSwitchPref == null || !hardwareSwitchPref.isVisible())) {
-            prefScreen.removePreference(hardwareSwitchCategory);
-        }
-
         Action defaultBackLongPressAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_longPressOnBackBehavior));
         Action defaultHomeLongPressAction = Action.fromIntSafe(res.getInteger(