diff --git a/res/xml/cherish_settings.xml b/res/xml/cherish_settings.xml
index 39982b0..a8807de 100644
--- a/res/xml/cherish_settings.xml
+++ b/res/xml/cherish_settings.xml
@@ -32,18 +32,11 @@
             android:icon="@drawable/ic_settings_quicksettings"/>
 
         <!-- Buttons -->
-        <Preference
-            android:key="buttonsettings_category"
-            android:title="@string/button_title"
-            android:fragment="com.cherish.settings.fragments.ButtonSettings"
-            android:icon="@drawable/ic_settings_buttons"/>
-
-        <!-- Navigation Bar -->
-        <Preference
-            android:key="navigationbar_category"
+		<Preference
+            android:key="button_settings"
             android:title="@string/navbar_title"
-            android:fragment="com.cherish.settings.fragments.NavbarSettings"
-            android:icon="@drawable/ic_settings_navbar"/>
+            android:icon="@drawable/ic_settings_buttons"
+            android:fragment="com.android.settings.custom.buttons.ButtonSettings"/>
 
         <!-- Lock Screen -->
         <Preference
diff --git a/res/xml/cherish_settings_button.xml b/res/xml/cherish_settings_button.xml
index a069738..9fc99bd 100644
--- a/res/xml/cherish_settings_button.xml
+++ b/res/xml/cherish_settings_button.xml
@@ -18,6 +18,12 @@
         android:title="@string/button_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+     <PreferenceScreen
+            android:key="button_settings"
+            android:title="@string/button_pref_title"
+            android:icon="@drawable/ic_button_settings"
+            android:fragment="com.android.settings.custom.buttons.ButtonSettings"/>
+
     <PreferenceScreen
         android:key="volume_key"
         android:fragment="com.cherish.settings.fragments.VolumeRockerSettings"