diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a91c5856040..e194d35b5d5 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3957,6 +3957,18 @@ public boolean validate(String value) {
         public static final String NAV_BAR_DYNAMIC = "nav_bar_dynamic";
 
         /**
+         * Navbar Button Color Switch
+         * @hide
+         */
+        public static final String NAVBAR_TINT_SWITCH = "navbar_tint_switch";
+        
+         /**
+         * Navbar Button Color
+         * @hide
+         */
+        public static final String NAVBAR_BUTTON_COLOR= "navbar_button_color";
+
+        /*
          * Settings to backup. This is here so that it's in the same place as the settings
          * keys and easy to update.
          *
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 4313460919d..bf9ca1364b6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -335,6 +335,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             "system:" + Settings.System.STATUS_BAR_SHOW_CARRIER;
     private static final String NAV_BAR_DYNAMIC =
             "system:" + Settings.System.NAV_BAR_DYNAMIC;
+    private static final String NAVBAR_TINT_SWITCH =
+            "system:" + Settings.System.NAVBAR_TINT_SWITCH;
+    private static final String NAVBAR_BUTTON_COLOR =
+            "system:" + Settings.System.NAVBAR_BUTTON_COLOR;
 
     static {
         boolean onlyCoreApps;
@@ -814,7 +818,9 @@ public void start() {
                 QS_ROWS_LANDSCAPE,
                 QS_COLUMNS,
                 STATUS_BAR_SHOW_CARRIER,
-                NAV_BAR_DYNAMIC);
+                NAV_BAR_DYNAMIC,
+                NAVBAR_TINT_SWITCH,
+                NAVBAR_BUTTON_COLOR);
 
         // Lastly, call to the icon policy to install/update all the icons.
         mIconPolicy = new PhoneStatusBarPolicy(mContext, mIconController, mCastController,
@@ -5549,6 +5555,16 @@ public void onTuningChanged(String key, String newValue) {
                     mNavigationController.updateNavbarOverlay(mContext.getResources());
                 }
                 break;
+            case NAVBAR_TINT_SWITCH:
+                if (mNavigationController != null) {
+                    mNavigationController.updateNavbarOverlay(mContext.getResources());
+                }
+                break;
+            case NAVBAR_BUTTON_COLOR:
+                if (mNavigationController != null) {
+                    mNavigationController.updateNavbarOverlay(mContext.getResources());
+                }
+                break;
             default:
                 break;
         }