diff --git a/package.json b/package.json
index 576a336..d52ad77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/design-language-system",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "type": "module",
   "module": "dist/index.js",
   "exports": {
diff --git a/tokens/$themes.json b/tokens/$themes.json
index 8efa24b..64b7acf 100644
--- a/tokens/$themes.json
+++ b/tokens/$themes.json
@@ -298,14 +298,13 @@
       "component.table.headerOutlined.border": "80baca34134b2d7fb69bd74d8e234695acf98ab0",
       "component.table.headerOutlined.text": "8b3e21f373e189824633fad8bd922e0847480165",
       "component.table.headerOutlined.icon": "c4e46c298c67628a69dfa74088dceec97181a825",
-      "component.table.row.icon": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b",
       "component.table.row.border": "7b93ce5e98c6b235d977a2cf7da00501726792ef",
       "component.table.row.background.default": "3e8fcc16b695b6123d30db73b4bf03b5f7c52b02",
       "component.table.row.background.zebra": "40bbff44ecca4178a88e774d7c44b7ad5ac50d75",
+      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.table.row.text.default": "ddd13e230dcf3675cc34e0c7972779fe02d08b23",
       "component.table.row.text.placeholder": "266bd5f9556661eade9081b5d74b8fcbbf1c2d1e",
       "component.table.row.text.link": "b9a9fb2da4e39e6d9b06ab692c5da0192c63ef33",
-      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.tab.default.text": "d5111a397f226fcd6ff903ed12c5a94caa1b6a2c",
       "component.tab.default.border": "81a7a5e7cd67fa9e84bb8e58bc57321a355602aa",
       "component.tab.hover.text": "7ebbcc4885f41433e65dba688d76f4479cbdef78",
@@ -331,19 +330,15 @@
       "component.switch.active.disabled.circle": "166b62d65a67dbc8e4fff26b722447676793c748",
       "component.switch.active.disabled.text": "469649142f645443908b56b50471912fc27482ca",
       "component.switch.inactive.default.background": "34760745a24f7ed7b9be5e67ed1fdaba9f2fb824",
-      "component.switch.inactive.default.icon": "81a57135d574c275911a84558acdc8c053e693c9",
       "component.switch.inactive.default.circle": "3901b2595482cbcc6928e03b0d49c3006f786d2e",
       "component.switch.inactive.default.text": "85c09e50760f03be0aafa241131297e4b1e7fe50",
       "component.switch.inactive.hover.background": "3a072e069cc4824f6392b5faf527004cdbc1aa7b",
-      "component.switch.inactive.hover.icon": "2041b2fd4a2cdaac98a8e60190f915281129488a",
       "component.switch.inactive.hover.circle": "80925647a1cbe61f321bd779c955e527035a38d7",
       "component.switch.inactive.hover.text": "c909520bccb679f18a24d28b5fb41111cfdc2bfb",
       "component.switch.inactive.focus.background": "b8d6f1e0213c33fd0f382f64c0e6e3a1479b3863",
-      "component.switch.inactive.focus.icon": "69e84709b069075d16986c015b905c75b94798d3",
       "component.switch.inactive.focus.circle": "3d05ff18ec3dde9b47f6299bdbe77f4ba543f910",
       "component.switch.inactive.focus.text": "3c0105d4f00c584be310ebeb5edbe23383bb74d2",
       "component.switch.inactive.disabled.background": "d4ddb0608d18fd90f52a52a12030aaf189fc595f",
-      "component.switch.inactive.disabled.icon": "1065b4415195dea941ecab4e0674783a926a3a10",
       "component.switch.inactive.disabled.circle": "78a4ef3a9c278028ded8cce5df9861940e8d630e",
       "component.switch.inactive.disabled.text": "2ea594ab01b39c808fb8252d8a2e4039dd1f370d",
       "component.stepper.horizontal.line": "2b5e767672a3b6ec2ffdc7bf8418f5310b04cab1",
@@ -1357,7 +1352,8 @@
       "global.spacing.50": "f6c9215142ffde6f9fd40c69af86baf84fa006e0",
       "global.spacing.60": "6666b8e43bf3acd2074fc625f082f833994c5ad7",
       "global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
-      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d"
+      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
+      "component.table.row.icon.default": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b"
     },
     "group": "CDS"
   },
@@ -1661,14 +1657,13 @@
       "component.table.headerOutlined.border": "80baca34134b2d7fb69bd74d8e234695acf98ab0",
       "component.table.headerOutlined.text": "8b3e21f373e189824633fad8bd922e0847480165",
       "component.table.headerOutlined.icon": "c4e46c298c67628a69dfa74088dceec97181a825",
-      "component.table.row.icon": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b",
       "component.table.row.border": "7b93ce5e98c6b235d977a2cf7da00501726792ef",
       "component.table.row.background.default": "3e8fcc16b695b6123d30db73b4bf03b5f7c52b02",
       "component.table.row.background.zebra": "40bbff44ecca4178a88e774d7c44b7ad5ac50d75",
+      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.table.row.text.default": "ddd13e230dcf3675cc34e0c7972779fe02d08b23",
       "component.table.row.text.placeholder": "266bd5f9556661eade9081b5d74b8fcbbf1c2d1e",
       "component.table.row.text.link": "b9a9fb2da4e39e6d9b06ab692c5da0192c63ef33",
-      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.tab.default.text": "d5111a397f226fcd6ff903ed12c5a94caa1b6a2c",
       "component.tab.default.border": "81a7a5e7cd67fa9e84bb8e58bc57321a355602aa",
       "component.tab.hover.text": "7ebbcc4885f41433e65dba688d76f4479cbdef78",
@@ -1694,19 +1689,15 @@
       "component.switch.active.disabled.circle": "166b62d65a67dbc8e4fff26b722447676793c748",
       "component.switch.active.disabled.text": "469649142f645443908b56b50471912fc27482ca",
       "component.switch.inactive.default.background": "34760745a24f7ed7b9be5e67ed1fdaba9f2fb824",
-      "component.switch.inactive.default.icon": "81a57135d574c275911a84558acdc8c053e693c9",
       "component.switch.inactive.default.circle": "3901b2595482cbcc6928e03b0d49c3006f786d2e",
       "component.switch.inactive.default.text": "85c09e50760f03be0aafa241131297e4b1e7fe50",
       "component.switch.inactive.hover.background": "3a072e069cc4824f6392b5faf527004cdbc1aa7b",
-      "component.switch.inactive.hover.icon": "2041b2fd4a2cdaac98a8e60190f915281129488a",
       "component.switch.inactive.hover.circle": "80925647a1cbe61f321bd779c955e527035a38d7",
       "component.switch.inactive.hover.text": "c909520bccb679f18a24d28b5fb41111cfdc2bfb",
       "component.switch.inactive.focus.background": "b8d6f1e0213c33fd0f382f64c0e6e3a1479b3863",
-      "component.switch.inactive.focus.icon": "69e84709b069075d16986c015b905c75b94798d3",
       "component.switch.inactive.focus.circle": "3d05ff18ec3dde9b47f6299bdbe77f4ba543f910",
       "component.switch.inactive.focus.text": "3c0105d4f00c584be310ebeb5edbe23383bb74d2",
       "component.switch.inactive.disabled.background": "d4ddb0608d18fd90f52a52a12030aaf189fc595f",
-      "component.switch.inactive.disabled.icon": "1065b4415195dea941ecab4e0674783a926a3a10",
       "component.switch.inactive.disabled.circle": "78a4ef3a9c278028ded8cce5df9861940e8d630e",
       "component.switch.inactive.disabled.text": "2ea594ab01b39c808fb8252d8a2e4039dd1f370d",
       "component.stepper.horizontal.line": "2b5e767672a3b6ec2ffdc7bf8418f5310b04cab1",
@@ -2720,7 +2711,8 @@
       "global.spacing.50": "f6c9215142ffde6f9fd40c69af86baf84fa006e0",
       "global.spacing.60": "6666b8e43bf3acd2074fc625f082f833994c5ad7",
       "global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
-      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d"
+      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
+      "component.table.row.icon.default": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b"
     },
     "group": "CDS"
   },
@@ -3024,14 +3016,13 @@
       "component.table.headerOutlined.border": "80baca34134b2d7fb69bd74d8e234695acf98ab0",
       "component.table.headerOutlined.text": "8b3e21f373e189824633fad8bd922e0847480165",
       "component.table.headerOutlined.icon": "c4e46c298c67628a69dfa74088dceec97181a825",
-      "component.table.row.icon": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b",
       "component.table.row.border": "7b93ce5e98c6b235d977a2cf7da00501726792ef",
       "component.table.row.background.default": "3e8fcc16b695b6123d30db73b4bf03b5f7c52b02",
       "component.table.row.background.zebra": "40bbff44ecca4178a88e774d7c44b7ad5ac50d75",
+      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.table.row.text.default": "ddd13e230dcf3675cc34e0c7972779fe02d08b23",
       "component.table.row.text.placeholder": "266bd5f9556661eade9081b5d74b8fcbbf1c2d1e",
       "component.table.row.text.link": "b9a9fb2da4e39e6d9b06ab692c5da0192c63ef33",
-      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.tab.default.text": "d5111a397f226fcd6ff903ed12c5a94caa1b6a2c",
       "component.tab.default.border": "81a7a5e7cd67fa9e84bb8e58bc57321a355602aa",
       "component.tab.hover.text": "7ebbcc4885f41433e65dba688d76f4479cbdef78",
@@ -3057,19 +3048,15 @@
       "component.switch.active.disabled.circle": "166b62d65a67dbc8e4fff26b722447676793c748",
       "component.switch.active.disabled.text": "469649142f645443908b56b50471912fc27482ca",
       "component.switch.inactive.default.background": "34760745a24f7ed7b9be5e67ed1fdaba9f2fb824",
-      "component.switch.inactive.default.icon": "81a57135d574c275911a84558acdc8c053e693c9",
       "component.switch.inactive.default.circle": "3901b2595482cbcc6928e03b0d49c3006f786d2e",
       "component.switch.inactive.default.text": "85c09e50760f03be0aafa241131297e4b1e7fe50",
       "component.switch.inactive.hover.background": "3a072e069cc4824f6392b5faf527004cdbc1aa7b",
-      "component.switch.inactive.hover.icon": "2041b2fd4a2cdaac98a8e60190f915281129488a",
       "component.switch.inactive.hover.circle": "80925647a1cbe61f321bd779c955e527035a38d7",
       "component.switch.inactive.hover.text": "c909520bccb679f18a24d28b5fb41111cfdc2bfb",
       "component.switch.inactive.focus.background": "b8d6f1e0213c33fd0f382f64c0e6e3a1479b3863",
-      "component.switch.inactive.focus.icon": "69e84709b069075d16986c015b905c75b94798d3",
       "component.switch.inactive.focus.circle": "3d05ff18ec3dde9b47f6299bdbe77f4ba543f910",
       "component.switch.inactive.focus.text": "3c0105d4f00c584be310ebeb5edbe23383bb74d2",
       "component.switch.inactive.disabled.background": "d4ddb0608d18fd90f52a52a12030aaf189fc595f",
-      "component.switch.inactive.disabled.icon": "1065b4415195dea941ecab4e0674783a926a3a10",
       "component.switch.inactive.disabled.circle": "78a4ef3a9c278028ded8cce5df9861940e8d630e",
       "component.switch.inactive.disabled.text": "2ea594ab01b39c808fb8252d8a2e4039dd1f370d",
       "component.stepper.horizontal.line": "2b5e767672a3b6ec2ffdc7bf8418f5310b04cab1",
@@ -4083,7 +4070,8 @@
       "global.spacing.50": "f6c9215142ffde6f9fd40c69af86baf84fa006e0",
       "global.spacing.60": "6666b8e43bf3acd2074fc625f082f833994c5ad7",
       "global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
-      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d"
+      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
+      "component.table.row.icon.default": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b"
     },
     "group": "CDS"
   },
@@ -4388,14 +4376,13 @@
       "component.table.headerOutlined.border": "80baca34134b2d7fb69bd74d8e234695acf98ab0",
       "component.table.headerOutlined.text": "8b3e21f373e189824633fad8bd922e0847480165",
       "component.table.headerOutlined.icon": "c4e46c298c67628a69dfa74088dceec97181a825",
-      "component.table.row.icon": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b",
       "component.table.row.border": "7b93ce5e98c6b235d977a2cf7da00501726792ef",
       "component.table.row.background.default": "3e8fcc16b695b6123d30db73b4bf03b5f7c52b02",
       "component.table.row.background.zebra": "40bbff44ecca4178a88e774d7c44b7ad5ac50d75",
+      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.table.row.text.default": "ddd13e230dcf3675cc34e0c7972779fe02d08b23",
       "component.table.row.text.placeholder": "266bd5f9556661eade9081b5d74b8fcbbf1c2d1e",
       "component.table.row.text.link": "b9a9fb2da4e39e6d9b06ab692c5da0192c63ef33",
-      "component.table.row.background.hover": "4440978a4c224be452714e6654182d6d5fe4080d",
       "component.tab.default.text": "d5111a397f226fcd6ff903ed12c5a94caa1b6a2c",
       "component.tab.default.border": "81a7a5e7cd67fa9e84bb8e58bc57321a355602aa",
       "component.tab.hover.text": "7ebbcc4885f41433e65dba688d76f4479cbdef78",
@@ -4421,19 +4408,15 @@
       "component.switch.active.disabled.circle": "166b62d65a67dbc8e4fff26b722447676793c748",
       "component.switch.active.disabled.text": "469649142f645443908b56b50471912fc27482ca",
       "component.switch.inactive.default.background": "34760745a24f7ed7b9be5e67ed1fdaba9f2fb824",
-      "component.switch.inactive.default.icon": "81a57135d574c275911a84558acdc8c053e693c9",
       "component.switch.inactive.default.circle": "3901b2595482cbcc6928e03b0d49c3006f786d2e",
       "component.switch.inactive.default.text": "85c09e50760f03be0aafa241131297e4b1e7fe50",
       "component.switch.inactive.hover.background": "3a072e069cc4824f6392b5faf527004cdbc1aa7b",
-      "component.switch.inactive.hover.icon": "2041b2fd4a2cdaac98a8e60190f915281129488a",
       "component.switch.inactive.hover.circle": "80925647a1cbe61f321bd779c955e527035a38d7",
       "component.switch.inactive.hover.text": "c909520bccb679f18a24d28b5fb41111cfdc2bfb",
       "component.switch.inactive.focus.background": "b8d6f1e0213c33fd0f382f64c0e6e3a1479b3863",
-      "component.switch.inactive.focus.icon": "69e84709b069075d16986c015b905c75b94798d3",
       "component.switch.inactive.focus.circle": "3d05ff18ec3dde9b47f6299bdbe77f4ba543f910",
       "component.switch.inactive.focus.text": "3c0105d4f00c584be310ebeb5edbe23383bb74d2",
       "component.switch.inactive.disabled.background": "d4ddb0608d18fd90f52a52a12030aaf189fc595f",
-      "component.switch.inactive.disabled.icon": "1065b4415195dea941ecab4e0674783a926a3a10",
       "component.switch.inactive.disabled.circle": "78a4ef3a9c278028ded8cce5df9861940e8d630e",
       "component.switch.inactive.disabled.text": "2ea594ab01b39c808fb8252d8a2e4039dd1f370d",
       "component.stepper.horizontal.line": "2b5e767672a3b6ec2ffdc7bf8418f5310b04cab1",
@@ -5447,7 +5430,8 @@
       "global.spacing.50": "f6c9215142ffde6f9fd40c69af86baf84fa006e0",
       "global.spacing.60": "6666b8e43bf3acd2074fc625f082f833994c5ad7",
       "global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
-      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d"
+      "global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
+      "component.table.row.icon.default": "e38c693bceab2ba83594f60b733b0f4f51c2fa7b"
     },
     "group": "CDS"
   }
diff --git a/tokens/components/groupSelect/groupSelect.json b/tokens/components/groupSelect/groupSelect.json
index 848d368..08150ed 100644
--- a/tokens/components/groupSelect/groupSelect.json
+++ b/tokens/components/groupSelect/groupSelect.json
@@ -22,6 +22,10 @@
           "hintText": {
             "value": "{alias.content.text.secondary.default}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         },
         "hover": {
@@ -44,6 +48,10 @@
           "hintText": {
             "value": "{alias.content.text.secondary.default}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         },
         "selected": {
@@ -66,6 +74,10 @@
           "hintText": {
             "value": "{alias.content.text.secondary.default}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         },
         "disabled": {
@@ -88,6 +100,10 @@
           "hintText": {
             "value": "{alias.content.text.secondary.default}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         },
         "readOnly": {
@@ -102,6 +118,10 @@
           "hintText": {
             "value": "{alias.content.text.secondary.default}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         },
         "error": {
@@ -124,6 +144,10 @@
           "hintText": {
             "value": "{alias.content.text.negative}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         },
         "focus": {
@@ -146,6 +170,10 @@
           "hintText": {
             "value": "{alias.content.text.secondary.default}",
             "type": "color"
+          },
+          "infoIcon": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
           }
         }
       },
diff --git a/tokens/components/select/select.json b/tokens/components/select/select.json
index 3616522..96344e8 100644
--- a/tokens/components/select/select.json
+++ b/tokens/components/select/select.json
@@ -21,6 +21,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "hover": {
@@ -43,6 +47,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "filled": {
@@ -65,6 +73,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "disabled": {
@@ -87,6 +99,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "error": {
@@ -109,6 +125,10 @@
         "hintText": {
           "value": "{alias.content.text.negative}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "focusEmpty": {
@@ -131,6 +151,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "focus": {
@@ -153,6 +177,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       }
     }
diff --git a/tokens/components/switch/switch.json b/tokens/components/switch/switch.json
index 0fb6cee..4df62e8 100644
--- a/tokens/components/switch/switch.json
+++ b/tokens/components/switch/switch.json
@@ -8,7 +8,7 @@
             "type": "color"
           },
           "icon": {
-            "value": "{alias.content.icon.base}",
+            "value": "{global.color.neutrals.white}",
             "type": "color"
           },
           "circle": {
@@ -26,7 +26,7 @@
             "type": "color"
           },
           "icon": {
-            "value": "{alias.content.icon.base}",
+            "value": "{global.color.neutrals.white}",
             "type": "color"
           },
           "circle": {
@@ -44,7 +44,7 @@
             "type": "color"
           },
           "icon": {
-            "value": "{alias.content.icon.base}",
+            "value": "{global.color.neutrals.white}",
             "type": "color"
           },
           "circle": {
@@ -81,10 +81,6 @@
             "value": "{alias.action.neutral}",
             "type": "color"
           },
-          "icon": {
-            "value": "{alias.content.icon.base}",
-            "type": "color"
-          },
           "circle": {
             "value": "{global.color.neutrals.white}",
             "type": "color"
@@ -99,10 +95,6 @@
             "value": "{global.color.neutrals.50}",
             "type": "color"
           },
-          "icon": {
-            "value": "{alias.content.icon.base}",
-            "type": "color"
-          },
           "circle": {
             "value": "{global.color.neutrals.white}",
             "type": "color"
@@ -117,10 +109,6 @@
             "value": "{alias.action.neutral}",
             "type": "color"
           },
-          "icon": {
-            "value": "{alias.content.icon.base}",
-            "type": "color"
-          },
           "circle": {
             "value": "{global.color.neutrals.white}",
             "type": "color"
@@ -135,10 +123,6 @@
             "value": "{alias.action.primary.disabled}",
             "type": "color"
           },
-          "icon": {
-            "value": "{alias.content.icon.primary.disabled}",
-            "type": "color"
-          },
           "circle": {
             "value": "{alias.action.white50}",
             "type": "color"
diff --git a/tokens/components/table/table.json b/tokens/components/table/table.json
index 90781da..5a6246c 100644
--- a/tokens/components/table/table.json
+++ b/tokens/components/table/table.json
@@ -30,14 +30,24 @@
         }
       },
       "row": {
-        "icon": {
-          "value": "{alias.content.icon.primary.default}",
-          "type": "color"
-        },
         "border": {
           "value": "{alias.border.normal}",
           "type": "color"
         },
+        "icon": {
+          "default": {
+            "value": "{alias.content.icon.primary.default}",
+            "type": "color"
+          },
+          "disabled": {
+            "value": "{alias.content.icon.primary.disabled}",
+            "type": "color"
+          },
+          "hover": {
+            "value": "{alias.content.icon.primary.hover}",
+            "type": "color"
+          }
+        },
         "background": {
           "default": {
             "value": "{alias.background.normal}",
diff --git a/tokens/components/textArea/textArea.json b/tokens/components/textArea/textArea.json
index 34ecc36..50d4e76 100644
--- a/tokens/components/textArea/textArea.json
+++ b/tokens/components/textArea/textArea.json
@@ -13,6 +13,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "placeholder": {
@@ -31,6 +35,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "hover": {
@@ -53,6 +61,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "hoverEmpty": {
@@ -71,6 +83,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "filled": {
@@ -90,6 +106,10 @@
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
@@ -121,6 +141,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "error": {
@@ -140,6 +164,10 @@
           "value": "{alias.content.text.negative}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
@@ -168,6 +196,10 @@
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
@@ -200,6 +232,10 @@
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
diff --git a/tokens/components/textField/textField.json b/tokens/components/textField/textField.json
index 52f00c8..34c3a1d 100644
--- a/tokens/components/textField/textField.json
+++ b/tokens/components/textField/textField.json
@@ -13,6 +13,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "placeholder": {
@@ -31,6 +35,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "hover": {
@@ -53,6 +61,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "hoverEmpty": {
@@ -71,6 +83,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "filled": {
@@ -90,6 +106,10 @@
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
@@ -121,6 +141,10 @@
         "hintText": {
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
+        },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
         }
       },
       "error": {
@@ -140,6 +164,10 @@
           "value": "{alias.content.text.negative}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
@@ -168,6 +196,10 @@
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",
@@ -200,6 +232,10 @@
           "value": "{alias.content.text.secondary.default}",
           "type": "color"
         },
+        "infoIcon": {
+          "value": "{alias.content.icon.primary.default}",
+          "type": "color"
+        },
         "icon": {
           "default": {
             "value": "{alias.content.icon.primary.default}",