diff --git a/AdvancedDisplay/AndroidManifest.xml b/AdvancedDisplay/AndroidManifest.xml
index 71b93b04..f5fd7c3d 100644
--- a/AdvancedDisplay/AndroidManifest.xml
+++ b/AdvancedDisplay/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <application
         android:label="@string/app_name"
-        android:theme="@style/Theme.Main">
+        android:theme="@style/Theme.SubSettingsBase">
         <receiver android:name="org.lineageos.settings.device.BootCompletedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java
index 92397c38..30189f46 100644
--- a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java
@@ -17,14 +17,16 @@
 package org.lineageos.settings.device;
 
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
 
-public class AdvancedDisplayActivity extends PreferenceActivity {
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
+
+public class AdvancedDisplayActivity extends CollapsingToolbarBaseActivity {
 
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getFragmentManager().beginTransaction().replace(android.R.id.content,
+        getFragmentManager().beginTransaction().replace(R.id.content_frame,
                 new AdvancedDisplayFragment()).commit();
     }
 }
diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
index 371a203b..54468608 100644
--- a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
@@ -16,10 +16,8 @@
 
 package org.lineageos.settings.device;
 
-import android.app.ActionBar;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.view.MenuItem;
 
 import androidx.preference.PreferenceFragment;
 
@@ -36,9 +34,6 @@ public class AdvancedDisplayFragment extends PreferenceFragment {
         addPreferencesFromResource(R.xml.screen_preferences);
         Resources res = getResources();
 
-        final ActionBar actionBar = getActivity().getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
         /* mDNIe */
         mmDNIeScenario = (mDNIeScenario) findPreference(Constants.KEY_MDNIE_SCENARIO);
         mmDNIeScenario.setEnabled(
@@ -48,13 +43,4 @@ public class AdvancedDisplayFragment extends PreferenceFragment {
         mmDNIeAccessibility.setEnabled(
                 FileUtils.isFileWritable(res.getString(R.string.mdnie_accessibility_sysfs_file)));
     }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            getActivity().onBackPressed();
-            return true;
-        }
-        return false;
-    }
 }