diff --git a/tokens/themes/dark.json b/tokens/themes/dark.json
index 593d2d9f..4a6c7683 100644
--- a/tokens/themes/dark.json
+++ b/tokens/themes/dark.json
@@ -2452,35 +2452,31 @@
                 "muted": {
                   "value": "{click.global.color.text.muted}",
                   "type": "color"
+                },
+                "disabled": {
+                  "value": "{click.sidebar.main.navigation.item.color.icon.disabled}",
+                  "type": "color"
                 }
               },
               "icon": {
                 "default": {
                   "value": "{click.global.color.text.muted}",
                   "type": "color"
+                },
+                "disabled": {
+                  "value": "{click.sidebar.sqlSidebar.navigation.item.color.text.disabled}",
+                  "type": "color"
                 }
               }
             }
           },
-          "title": {
-            "color": {
-              "default": {
-                "value": "{click.global.color.text.muted}",
-                "type": "color"
-              },
-              "hover": {
-                "value": "{click.global.color.text.muted}",
-                "type": "color"
-              },
-              "active": {
-                "value": "{click.global.color.text.muted}",
-                "type": "color"
-              }
-            }
-          },
           "subItem": {
             "color": {
               "text": {
+                "disabled": {
+                  "value": "{click.sidebar.main.navigation.item.color.icon.disabled}",
+                  "type": "color"
+                },
                 "default": {
                   "value": "{click.global.color.text.muted}",
                   "type": "color"
@@ -2510,6 +2506,22 @@
               }
             }
           },
+          "title": {
+            "color": {
+              "default": {
+                "value": "{click.global.color.text.muted}",
+                "type": "color"
+              },
+              "hover": {
+                "value": "{click.global.color.text.muted}",
+                "type": "color"
+              },
+              "active": {
+                "value": "{click.global.color.text.muted}",
+                "type": "color"
+              }
+            }
+          },
           "dragControl": {
             "separator": {
               "color": {
diff --git a/tokens/themes/light.json b/tokens/themes/light.json
index f372a14e..62ab70ec 100644
--- a/tokens/themes/light.json
+++ b/tokens/themes/light.json
@@ -2999,6 +2999,16 @@
                   "value": "{palette.utility.transparent}",
                   "type": "color"
                 }
+              },
+              "icon": {
+                "default": {
+                  "value": "{click.global.color.text.muted}",
+                  "type": "color"
+                },
+                "disabled": {
+                  "value": "{click.sidebar.main.navigation.item.color.text.disabled}",
+                  "type": "color"
+                }
               }
             }
           },
@@ -3015,23 +3025,31 @@
         }
       },
       "sqlSidebar": {
-        "color": {
-          "background": {
-            "default": {
-              "value": "{click.global.color.background.muted}",
-              "type": "color"
-            }
-          },
-          "stroke": {
-            "default": {
-              "value": "{click.global.color.stroke.default}",
-              "type": "color"
-            }
-          }
-        },
         "navigation": {
           "item": {
             "color": {
+              "text": {
+                "disabled": {
+                  "value": "{click.button.basic.color.danger.text.disabled}",
+                  "type": "color"
+                },
+                "default": {
+                  "value": "{click.global.color.text.default}",
+                  "type": "color"
+                },
+                "hover": {
+                  "value": "{click.global.color.text.default}",
+                  "type": "color"
+                },
+                "active": {
+                  "value": "{click.global.color.text.default}",
+                  "type": "color"
+                },
+                "muted": {
+                  "value": "{click.global.color.text.muted}",
+                  "type": "color"
+                }
+              },
               "background": {
                 "default": {
                   "value": "{palette.utility.transparent}",
@@ -3055,24 +3073,6 @@
                   "type": "color"
                 }
               },
-              "text": {
-                "default": {
-                  "value": "{click.global.color.text.default}",
-                  "type": "color"
-                },
-                "hover": {
-                  "value": "{click.global.color.text.default}",
-                  "type": "color"
-                },
-                "active": {
-                  "value": "{click.global.color.text.default}",
-                  "type": "color"
-                },
-                "muted": {
-                  "value": "{click.global.color.text.muted}",
-                  "type": "color"
-                }
-              },
               "icon": {
                 "default": {
                   "value": "{click.global.color.text.muted}",
@@ -3111,6 +3111,10 @@
                 "active": {
                   "value": "{click.global.color.text.default}",
                   "type": "color"
+                },
+                "disabled": {
+                  "value": "{click.sidebar.main.navigation.item.color.icon.disabled}",
+                  "type": "color"
                 }
               },
               "background": {
@@ -3139,6 +3143,20 @@
               }
             }
           }
+        },
+        "color": {
+          "background": {
+            "default": {
+              "value": "{click.global.color.background.muted}",
+              "type": "color"
+            }
+          },
+          "stroke": {
+            "default": {
+              "value": "{click.global.color.stroke.default}",
+              "type": "color"
+            }
+          }
         }
       }
     },