diff --git a/parts/res/xml/charge_settings.xml b/parts/res/xml/charge_settings.xml
index fa81b16..8e1433b 100644
--- a/parts/res/xml/charge_settings.xml
+++ b/parts/res/xml/charge_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="bypass_charge"
         android:title="@string/charge_bypass_title"
         android:summary="@string/charge_bypass_summary"
diff --git a/parts/res/xml/clear_speaker_settings.xml b/parts/res/xml/clear_speaker_settings.xml
index 8716efb..e3e13d7 100644
--- a/parts/res/xml/clear_speaker_settings.xml
+++ b/parts/res/xml/clear_speaker_settings.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/clear_speaker_title">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="clear_speaker_pref"
         android:title="@string/clear_speaker_title"
         android:icon="@drawable/ic_clear_speaker"
diff --git a/parts/res/xml/core_control_settings.xml b/parts/res/xml/core_control_settings.xml
index 15b10d5..03c9c18 100644
--- a/parts/res/xml/core_control_settings.xml
+++ b/parts/res/xml/core_control_settings.xml
@@ -2,35 +2,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/core_control_title">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_0"
         android:title="@string/core_0" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_1"
         android:title="@string/core_1" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_2"
         android:title="@string/core_2" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_3"
         android:title="@string/core_3" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_4"
         android:title="@string/core_4" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_5"
         android:title="@string/core_5" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_6"
         android:title="@string/core_6" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="core_7"
         android:title="@string/core_7" />
 
diff --git a/parts/res/xml/dcdimming_settings.xml b/parts/res/xml/dcdimming_settings.xml
index 8ca09c3..4c3187b 100644
--- a/parts/res/xml/dcdimming_settings.xml
+++ b/parts/res/xml/dcdimming_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/dc_dimming_enable_title">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="dc_dimming_enable"
         android:defaultValue="false"
         android:icon="@drawable/ic_dcdimming"
diff --git a/parts/res/xml/doze_settings.xml b/parts/res/xml/doze_settings.xml
index db6577a..1f42ee5 100644
--- a/parts/res/xml/doze_settings.xml
+++ b/parts/res/xml/doze_settings.xml
@@ -24,7 +24,7 @@
         android:key="doze_enable"
         android:title="@string/ambient_display_enable_title" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="always_on_display"
         android:disableDependentsState="true"
         android:icon="@drawable/ic_doze_aod"
diff --git a/parts/res/xml/gpu_manager_settings.xml b/parts/res/xml/gpu_manager_settings.xml
index 35f275d..7478380 100644
--- a/parts/res/xml/gpu_manager_settings.xml
+++ b/parts/res/xml/gpu_manager_settings.xml
@@ -42,23 +42,23 @@
 
     <!-- Power Settings -->
     <PreferenceCategory android:title="@string/gpu_power_title">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="gpu_force_clk_on"
             android:title="@string/gpu_force_clk_on_title"
             android:summary="@string/gpu_force_clk_on_summary" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="gpu_force_bus_on"
             android:title="@string/gpu_force_bus_on_title"
             android:summary="@string/gpu_force_bus_on_summary" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="gpu_force_rail_on"
             android:title="@string/gpu_force_rail_on_title"
             android:summary="@string/gpu_force_rail_on_summary" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="gpu_force_no_nap"
             android:title="@string/gpu_force_no_nap_title"
             android:summary="@string/gpu_force_no_nap_summary" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="gpu_bus_split"
             android:title="@string/gpu_bus_split_title"
             android:summary="@string/gpu_bus_split_summary" />
diff --git a/parts/res/xml/hbm_settings.xml b/parts/res/xml/hbm_settings.xml
index a513f82..2a059c5 100644
--- a/parts/res/xml/hbm_settings.xml
+++ b/parts/res/xml/hbm_settings.xml
@@ -20,13 +20,13 @@
 	android.title="@string/hbm_fragment_title">
 
     <PreferenceCategory>
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="hbm"
             android:title="@string/hbm_mode_title"
             android:summary="@string/hbm_mode_summary"
             android:defaultValue="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="auto_hbm"
             android:title="@string/auto_hbm_title"
             android:summary="@string/auto_hbm_summary" />
diff --git a/parts/src/org/lineageos/settings/charge/ChargeSettingsFragment.java b/parts/src/org/lineageos/settings/charge/ChargeSettingsFragment.java
index 8b6c6dd..25360b3 100644
--- a/parts/src/org/lineageos/settings/charge/ChargeSettingsFragment.java
+++ b/parts/src/org/lineageos/settings/charge/ChargeSettingsFragment.java
@@ -20,7 +20,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import org.lineageos.settings.R;
 
@@ -28,7 +28,7 @@ public class ChargeSettingsFragment extends PreferenceFragment
     implements Preference.OnPreferenceChangeListener {
 
     private static final String KEY_BYPASS_CHARGE = "bypass_charge";
-    private SwitchPreference mBypassChargePreference;
+    private SwitchPreferenceCompat mBypassChargePreference;
     private ChargeUtils mChargeUtils;
 
     @Override
@@ -36,7 +36,7 @@ public class ChargeSettingsFragment extends PreferenceFragment
         setPreferencesFromResource(R.xml.charge_settings, rootKey);
         
         mChargeUtils = new ChargeUtils(getActivity());
-        mBypassChargePreference = (SwitchPreference) findPreference(KEY_BYPASS_CHARGE);
+        mBypassChargePreference = (SwitchPreferenceCompat) findPreference(KEY_BYPASS_CHARGE);
 
         boolean bypassChargeSupported = mChargeUtils.isBypassChargeSupported();
 
diff --git a/parts/src/org/lineageos/settings/corecontrol/CoreControlFragment.java b/parts/src/org/lineageos/settings/corecontrol/CoreControlFragment.java
index 2adfc89..ac6b0a9 100644
--- a/parts/src/org/lineageos/settings/corecontrol/CoreControlFragment.java
+++ b/parts/src/org/lineageos/settings/corecontrol/CoreControlFragment.java
@@ -21,7 +21,7 @@ import android.util.Log;
 import android.widget.Toast;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import org.lineageos.settings.R;
 
@@ -31,7 +31,7 @@ public class CoreControlFragment extends PreferenceFragment implements Preferenc
     private static final String TAG = "CoreControlFragment";
     private static final int NUM_CORES = 8;
 
-    private SwitchPreference[] mCorePrefs = new SwitchPreference[NUM_CORES];
+    private SwitchPreferenceCompat[] mCorePrefs = new SwitchPreferenceCompat[NUM_CORES];
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -39,7 +39,7 @@ public class CoreControlFragment extends PreferenceFragment implements Preferenc
 
         for (int i = 0; i < NUM_CORES; i++) {
             String key = "core_" + i;
-            mCorePrefs[i] = (SwitchPreference) findPreference(key);
+            mCorePrefs[i] = (SwitchPreferenceCompat) findPreference(key);
             if (mCorePrefs[i] != null) {
                 mCorePrefs[i].setOnPreferenceChangeListener(this);
                 mCorePrefs[i].setChecked(isCoreOnline(i));
diff --git a/parts/src/org/lineageos/settings/display/DcDimmingSettingsFragment.java b/parts/src/org/lineageos/settings/display/DcDimmingSettingsFragment.java
index 8b6f83f..6fb7726 100644
--- a/parts/src/org/lineageos/settings/display/DcDimmingSettingsFragment.java
+++ b/parts/src/org/lineageos/settings/display/DcDimmingSettingsFragment.java
@@ -28,7 +28,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 import android.provider.Settings;
 
 import org.lineageos.settings.R;
@@ -39,7 +39,7 @@ import java.io.File;
 public class DcDimmingSettingsFragment extends PreferenceFragment implements
         OnPreferenceChangeListener {
 
-    private SwitchPreference mDcDimmingPreference;
+    private SwitchPreferenceCompat mDcDimmingPreference;
     private static final String DC_DIMMING_ENABLE_KEY = "dc_dimming_enable";
     private static final String DC_DIMMING_NODE = "/sys/devices/platform/soc/soc:qcom,dsi-display-primary/dimlayer_exposure";
     private static final String HBM = "/sys/devices/platform/soc/soc:qcom,dsi-display-primary/hbm";
diff --git a/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java
index 9373c80..9b71148 100644
--- a/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/parts/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -33,7 +33,7 @@ import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import com.android.settingslib.widget.MainSwitchPreference;
 
@@ -44,7 +44,7 @@ public class DozeSettingsFragment extends PreferenceFragment
         implements OnPreferenceChangeListener, OnCheckedChangeListener {
     private MainSwitchPreference mSwitchBar;
 
-    private SwitchPreference mAlwaysOnDisplayPreference;
+    private SwitchPreferenceCompat mAlwaysOnDisplayPreference;
     private ListPreference mDozeBrightnessPreference;
 
     private Handler mHandler = new Handler();
@@ -65,7 +65,7 @@ public class DozeSettingsFragment extends PreferenceFragment
         mSwitchBar.addOnSwitchChangeListener(this);
         mSwitchBar.setChecked(dozeEnabled);
 
-        mAlwaysOnDisplayPreference = (SwitchPreference) findPreference(DozeUtils.ALWAYS_ON_DISPLAY);
+        mAlwaysOnDisplayPreference = (SwitchPreferenceCompat) findPreference(DozeUtils.ALWAYS_ON_DISPLAY);
         mAlwaysOnDisplayPreference.setEnabled(dozeEnabled);
         mAlwaysOnDisplayPreference.setChecked(DozeUtils.isAlwaysOnEnabled(getActivity()));
         mAlwaysOnDisplayPreference.setOnPreferenceChangeListener(this);
diff --git a/parts/src/org/lineageos/settings/gpumanager/GpuManagerFragment.java b/parts/src/org/lineageos/settings/gpumanager/GpuManagerFragment.java
index 888458c..5415165 100644
--- a/parts/src/org/lineageos/settings/gpumanager/GpuManagerFragment.java
+++ b/parts/src/org/lineageos/settings/gpumanager/GpuManagerFragment.java
@@ -16,7 +16,7 @@ import android.widget.Toast;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 import org.lineageos.settings.R;
 
 public class GpuManagerFragment extends PreferenceFragment
@@ -50,11 +50,11 @@ public class GpuManagerFragment extends PreferenceFragment
     private Preference mGpuBusyPreference;
     private Preference mGpuTemperaturePreference;
     private Preference mThermalPowerLevelPreference;
-    private SwitchPreference mForceClkOnPreference;
-    private SwitchPreference mForceBusOnPreference;
-    private SwitchPreference mForceRailOnPreference;
-    private SwitchPreference mForceNoNapPreference;
-    private SwitchPreference mBusSplitPreference;
+    private SwitchPreferenceCompat mForceClkOnPreference;
+    private SwitchPreferenceCompat mForceBusOnPreference;
+    private SwitchPreferenceCompat mForceRailOnPreference;
+    private SwitchPreferenceCompat mForceNoNapPreference;
+    private SwitchPreferenceCompat mBusSplitPreference;
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -82,11 +82,11 @@ public class GpuManagerFragment extends PreferenceFragment
         mGpuBusyPreference = findPreference(KEY_GPU_BUSY_PERCENTAGE);
         mGpuTemperaturePreference = findPreference(KEY_GPU_TEMPERATURE);
         mThermalPowerLevelPreference = findPreference(KEY_GPU_THERMAL_PWRLEVEL);
-        mForceClkOnPreference = (SwitchPreference) findPreference(KEY_GPU_FORCE_CLK_ON);
-        mForceBusOnPreference = (SwitchPreference) findPreference(KEY_GPU_FORCE_BUS_ON);
-        mForceRailOnPreference = (SwitchPreference) findPreference(KEY_GPU_FORCE_RAIL_ON);
-        mForceNoNapPreference = (SwitchPreference) findPreference(KEY_GPU_FORCE_NO_NAP);
-        mBusSplitPreference = (SwitchPreference) findPreference(KEY_GPU_BUS_SPLIT);
+        mForceClkOnPreference = (SwitchPreferenceCompat) findPreference(KEY_GPU_FORCE_CLK_ON);
+        mForceBusOnPreference = (SwitchPreferenceCompat) findPreference(KEY_GPU_FORCE_BUS_ON);
+        mForceRailOnPreference = (SwitchPreferenceCompat) findPreference(KEY_GPU_FORCE_RAIL_ON);
+        mForceNoNapPreference = (SwitchPreferenceCompat) findPreference(KEY_GPU_FORCE_NO_NAP);
+        mBusSplitPreference = (SwitchPreferenceCompat) findPreference(KEY_GPU_BUS_SPLIT);
         
         // Set listeners
         if (mGovernorPreference != null) {
diff --git a/parts/src/org/lineageos/settings/speaker/ClearSpeakerFragment.java b/parts/src/org/lineageos/settings/speaker/ClearSpeakerFragment.java
index 4dad735..caeedad 100644
--- a/parts/src/org/lineageos/settings/speaker/ClearSpeakerFragment.java
+++ b/parts/src/org/lineageos/settings/speaker/ClearSpeakerFragment.java
@@ -29,7 +29,7 @@ import android.util.Log;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragment;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import org.lineageos.settings.R;
 
@@ -45,13 +45,13 @@ public class ClearSpeakerFragment extends PreferenceFragment implements
     private AudioManager mAudioManager;
     private Handler mHandler;
     private MediaPlayer mMediaPlayer;
-    private SwitchPreference mClearSpeakerPref;
+    private SwitchPreferenceCompat mClearSpeakerPref;
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.clear_speaker_settings);
 
-        mClearSpeakerPref = (SwitchPreference) findPreference(PREF_CLEAR_SPEAKER);
+        mClearSpeakerPref = (SwitchPreferenceCompat) findPreference(PREF_CLEAR_SPEAKER);
         mClearSpeakerPref.setOnPreferenceChangeListener(this);
 
         mHandler = new Handler();