diff --git a/DeviceSettings/Android.bp b/DeviceSettings/Android.bp
index 5a9b7549..df4a0f23 100644
--- a/DeviceSettings/Android.bp
+++ b/DeviceSettings/Android.bp
@@ -19,7 +19,6 @@ android_app {
 
     static_libs: [
         "androidx.core_core",
-        "androidx.preference_preference",
         "org.lineageos.settings.resources",
     ],
 
diff --git a/DeviceSettings/AndroidManifest.xml b/DeviceSettings/AndroidManifest.xml
index d3fb5935..c4e3c20d 100644
--- a/DeviceSettings/AndroidManifest.xml
+++ b/DeviceSettings/AndroidManifest.xml
@@ -28,7 +28,7 @@
     <application
         android:label="@string/advanced_settings"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.SubSettingsBase">
         <receiver
             android:name=".BootReceiver"
             android:defaultToDeviceProtectedStorage="true"
diff --git a/DeviceSettings/res/values/styles.xml b/DeviceSettings/res/values/styles.xml
index 3527a8d4..9a7987d8 100644
--- a/DeviceSettings/res/values/styles.xml
+++ b/DeviceSettings/res/values/styles.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 <resources>
-  <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-      <item name="preferenceTheme">@style/PreferenceTheme</item>
-  </style>
-
-  <style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
 </resources>
diff --git a/DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java b/DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java
index 86fb8abd..cbe6f49a 100644
--- a/DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java
+++ b/DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java
@@ -16,35 +16,28 @@
 
 package org.lineageos.settings.device;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-public class DeviceSettingsActivity extends Activity {
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
+
+public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
+
+    private DeviceSettings deviceSettingsFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
-        DeviceSettings deviceSettingsFragment;
+        Fragment fragment = getFragmentManager().findFragmentById(R.id.content_frame);
         if (fragment == null) {
             deviceSettingsFragment = new DeviceSettings();
             getFragmentManager().beginTransaction()
-                    .add(android.R.id.content, deviceSettingsFragment)
+                    .add(R.id.content_frame, deviceSettingsFragment)
                     .commit();
         }
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
 }
diff --git a/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java b/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java
index 2d1413d4..fe732336 100644
--- a/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java
+++ b/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java
@@ -44,7 +44,6 @@ public class KCalSettings extends PreferenceFragment implements
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
     @Override
diff --git a/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java b/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
index 56175365..637b2724 100644
--- a/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
+++ b/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
@@ -16,16 +16,16 @@
 
 package org.lineageos.settings.device.kcal;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import org.lineageos.settings.device.R;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
 
-public class KCalSettingsActivity extends Activity implements Utils {
+public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implements Utils {
 
     private KCalSettings mKCalSettingsFragment;