diff --git a/data/tokens/components/button.json b/data/tokens/components/button.json
index 760eea4f..1ccf3faf 100644
--- a/data/tokens/components/button.json
+++ b/data/tokens/components/button.json
@@ -20,6 +20,12 @@
         "value": "{global.size.macro.L}",
         "type": "sizing",
         "description": "min-height on L Buttons"
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "space": {
diff --git a/data/tokens/components/container.json b/data/tokens/components/container.json
index 7b230473..bcebe9ea 100644
--- a/data/tokens/components/container.json
+++ b/data/tokens/components/container.json
@@ -320,6 +320,12 @@
           "type": "sizing",
           "description": "tooltip arrow height"
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "radius": {
diff --git a/data/tokens/components/feedback.json b/data/tokens/components/feedback.json
index 0e00bbe8..15dae832 100644
--- a/data/tokens/components/feedback.json
+++ b/data/tokens/components/feedback.json
@@ -332,6 +332,12 @@
             "description": "message and toast icon container width"
           }
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "radius": {
diff --git a/data/tokens/components/form.json b/data/tokens/components/form.json
index 0aff406c..c765e3e5 100644
--- a/data/tokens/components/form.json
+++ b/data/tokens/components/form.json
@@ -230,11 +230,6 @@
         "value": "{origin.dimension.0}",
         "type": "sizing"
       },
-      "icon": {
-        "value": "{global.size.icon.M}",
-        "type": "sizing",
-        "description": "icon"
-      },
       "calendar": {
         "date": {
           "value": "{global.size.macro.M}",
@@ -368,6 +363,12 @@
           "type": "sizing",
           "description": "2px validation bar used on errors and warnings"
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "color": {
diff --git a/data/tokens/components/link.json b/data/tokens/components/link.json
index a4d1e3d0..85c62f96 100644
--- a/data/tokens/components/link.json
+++ b/data/tokens/components/link.json
@@ -89,6 +89,12 @@
           "value": "{global.size.macro.M}",
           "type": "sizing"
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "radius": {
diff --git a/data/tokens/components/nav.json b/data/tokens/components/nav.json
index 581f459c..798b155b 100644
--- a/data/tokens/components/nav.json
+++ b/data/tokens/components/nav.json
@@ -143,6 +143,12 @@
             "description": "Left nav collapsed parent container"
           }
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "radius": {
diff --git a/data/tokens/components/popover.json b/data/tokens/components/popover.json
index 49d0d95b..8fe9bbbc 100644
--- a/data/tokens/components/popover.json
+++ b/data/tokens/components/popover.json
@@ -50,6 +50,12 @@
           "type": "sizing",
           "description": "Large popover menu items"
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "radius": {
diff --git a/data/tokens/components/tab.json b/data/tokens/components/tab.json
index ab38d22a..032a5e2c 100644
--- a/data/tokens/components/tab.json
+++ b/data/tokens/components/tab.json
@@ -10,6 +10,12 @@
         "value": "{global.size.macro.L}",
         "type": "sizing",
         "description": "L tab"
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     },
     "space": {
diff --git a/data/tokens/components/table.json b/data/tokens/components/table.json
index 831fad52..35c9965a 100644
--- a/data/tokens/components/table.json
+++ b/data/tokens/components/table.json
@@ -304,6 +304,12 @@
             "type": "sizing"
           }
         }
+      },
+      "icon": {
+        "M": {
+          "value": "{global.size.icon.M}",
+          "type": "sizing"
+        }
       }
     }
   }