diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index e482aa1..573e237 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -42,6 +42,7 @@
     <string name="about_summary">Learn more about CherishOS</string>
     <string name="device_part_title">Device features</string>
     <string name="qs_category">QS category</string>
+    <string name="navbar_title">Navigation bar</string>
 
     <!-- General strings -->
     <string name="ok">OK</string>
@@ -67,9 +68,6 @@
 	<!-- Status bar - icons -->
     <string name="status_bar_icons_title">Status bar icons</string>
 
-	<!-- Statusbar Clock -->
-	<string name="statusbar_items_title">Statusbar items</string>
-
 	<!-- Lock screen visualizer -->
 	<string name="visualizer_title">Display music visualizer</string>
 
@@ -150,4 +148,12 @@
     <!-- Wakeup options -->
     <string name="wakeup_when_plugged_unplugged_title">Wake up on charge</string>
     <string name="wakeup_when_plugged_unplugged_summary">Wake up device if charger is plugged/unplugged.</string>
+
+    <!-- Statusbar Tuner -->
+    <string name="status_bar_system_icons_title">System icons</string>
+    <string name="status_bar_system_icons_summary">Control which status bar icons are shown</string>
+    <string name="statusbar_items_title">Statusbar items</string>
+
+    <!-- Navbar tuner -->
+    <string name="navbar_tuner_title">Navbar buttons</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_button.xml b/res/xml/cherish_settings_button.xml
index 191beb9..7c89929 100644
--- a/res/xml/cherish_settings_button.xml
+++ b/res/xml/cherish_settings_button.xml
@@ -18,6 +18,19 @@
         android:title="@string/button_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <PreferenceCategory
+            android:key="navbar"
+            android:title="@string/navbar_title">
+
+   <Preference
+            android:title="@string/navbar_tuner_title" 
+            android:icon="@drawable/ic_shortcuts">
+            <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.systemui"
+                android:targetClass="com.android.systemui.tuner.NavBarActivity" />
+    </Preference>
+   </PreferenceCategory>
+
     <PreferenceScreen
         android:key="volume_key"
         android:fragment="com.cherish.settings.fragments.VolumeRockerSettings"
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 9f22076..562f399 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -14,4 +14,17 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/statusbar_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <PreferenceCategory
+            android:key="status_bar_icons"
+            android:title="@string/status_bar_system_icons_title">
+
+    <Preference
+            android:title="@string/statusbar_items_title" 
+	    android:icon="@drawable/ic_shortcuts">
+            <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.systemui"
+                android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
+    </Preference>
+</PreferenceCategory>
 </PreferenceScreen> 
\ No newline at end of file