diff --git a/tokens/$themes.json b/tokens/$themes.json
index f75d6ee..30d5f44 100644
--- a/tokens/$themes.json
+++ b/tokens/$themes.json
@@ -2164,10 +2164,6 @@
       "input.base.size.minHeight.mobile.large": "bf5e59815a123ad3d02890721c07a5e69b12e422",
       "input.base.size.minHeight.mobile.medium": "2e0ea36052bb6dc57ce3db38d7af2cff09aa24f2",
       "input.base.size.minHeight.mobile.small": "9207ebd6aa3b9536a5744f6d626a4fb24757e430",
-      "iconButton.tertiary.borderWidth.positive.default": "838873797b22efb51916c4f22a55463b85614ee5",
-      "iconButton.tertiary.borderWidth.positive.hovered": "c712211fbf80e29c17ec97e672d654c7df62ce6d",
-      "iconButton.tertiary.borderWidth.positive.pressed": "db7493f007eed9a2ae70c5bdd50756b7aee60b11",
-      "iconButton.tertiary.borderWidth.positive.disabled": "13c80a1d4e165f9b65f00e8a2fd31363b5a286d9",
       "iconButton.tertiary.borderWidth.destructive.default": "c87825be37aec4e10bc0ae41babc1a4ccbfa5b0e",
       "iconButton.tertiary.borderWidth.destructive.hovered": "199baf2c3155082c6c92c0752b4b68016eb93ffb",
       "iconButton.tertiary.borderWidth.destructive.pressed": "bfd91ce5a1e4c4023d05d30f9b738f373704ac77",
@@ -2208,10 +2204,6 @@
       "iconButton.tertiary.color.warning.disabled.background": "24f19e34f968145fa11cadb9f7550c593e88540b",
       "iconButton.tertiary.color.warning.disabled.onBackground": "f8bfa3095859cd6a29d941c55d39ce41f782d93e",
       "iconButton.tertiary.color.warning.disabled.outline": "713ff0c42a500e77324e4fc4ad9f7cf373ef5f07",
-      "iconButton.secondary.borderWidth.positive.default": "b26cc068084d7d0ff10cb8da3b3611a266b55020",
-      "iconButton.secondary.borderWidth.positive.hovered": "6832087b6cbbddb66b7866b92dffd789329ccc16",
-      "iconButton.secondary.borderWidth.positive.pressed": "5353675c0494ac33c6b97e79603619722a406d28",
-      "iconButton.secondary.borderWidth.positive.disabled": "9b60f95253181d8f8147f2fc5d6963cf71075a6d",
       "iconButton.secondary.borderWidth.destructive.default": "acfda19368aab19767355491ee6c1d51e6d8f1a2",
       "iconButton.secondary.borderWidth.destructive.hovered": "cde765c83dfc9494f4eba0871d454c0d6b58914b",
       "iconButton.secondary.borderWidth.destructive.pressed": "c8278a4cc34434d898176df54ccc2b0b0f57d1a3",
@@ -2252,10 +2244,6 @@
       "iconButton.secondary.color.warning.disabled.background": "6e5461cf6f3f3f86e67a84a81c49f14ac0c24fbe",
       "iconButton.secondary.color.warning.disabled.onBackground": "04cca1d921fde7edf07bbe6bdeffb0b639eefb4d",
       "iconButton.secondary.color.warning.disabled.outline": "f1dda1f645b668c253fef53e26e2884583691a44",
-      "iconButton.primary.borderWidth.positive.default": "a51ad1a20ac57ea4795b390289979b66c4a17314",
-      "iconButton.primary.borderWidth.positive.hovered": "361736c8fb60b40b466faaddd7f3645da26f6495",
-      "iconButton.primary.borderWidth.positive.pressed": "7774aa617383354bb9bddb090d5129cc21219b22",
-      "iconButton.primary.borderWidth.positive.disabled": "03ed007893e6679624a2fd4a484e8533d4fbd126",
       "iconButton.primary.borderWidth.destructive.default": "df85a88f7ae640d64e84ee24e34ed8ce113b849b",
       "iconButton.primary.borderWidth.destructive.hovered": "9216b27d13c2e606e6b7f7ac93967695c0144106",
       "iconButton.primary.borderWidth.destructive.pressed": "f40b4da078e45860faf1e804950a6b21513a5ac1",
@@ -2296,24 +2284,12 @@
       "iconButton.primary.color.warning.disabled.background": "be52f202be2c852c3bf10f2a7aba1cffd5117350",
       "iconButton.primary.color.warning.disabled.onBackground": "e5dc8227bf60b3ec58d5b610f61ef49898a9f07a",
       "iconButton.primary.color.warning.disabled.outline": "1195dbc6dbc5a5426a5b14a34302ffa00d1dcd3b",
-      "iconButton.base.size.desktop.large": "db33c6389a3823b3254339e2b5db89ae9e90fd16",
-      "iconButton.base.size.desktop.medium": "21cc1e83971940eeb231169b3c8acd654c549b8f",
-      "iconButton.base.size.desktop.small": "33b3701bdf004f6d84cabd39c0488a4475a5698e",
       "iconButton.base.size.mobile.large": "73b38b6ce8b97c56fba7de0ca1a133bfc0b4acf8",
       "iconButton.base.size.mobile.medium": "0991ce9afb45b2a3c49737349cad70d281eac981",
       "iconButton.base.size.mobile.small": "4ca382ae0e04d320654b504c34532f5bfb1166d9",
-      "iconButton.base.borderRadius.desktop.large": "d3532d4a008f5883c1ba1ab7a9d7ed5e7f3c3288",
-      "iconButton.base.borderRadius.desktop.medium": "5f4a75945ede9a494bf33f0bddb02f90f6c8991c",
-      "iconButton.base.borderRadius.desktop.small": "116037c94189470adc206179ec750e16fe7286be",
       "iconButton.base.borderRadius.mobile.large": "f231da85ae71633376d5b7ecdc5739069df519b2",
       "iconButton.base.borderRadius.mobile.medium": "a3b904149feb285234e1bf69bb961d603ea9a982",
       "iconButton.base.borderRadius.mobile.small": "7e5e20e63ba7c87279e64ad90c7be8cf01eaa0a1",
-      "iconButton.base.spacing.desktop.small.left": "e80d1305abef418bb8b9fc55e69445c225e760d2",
-      "iconButton.base.spacing.desktop.small.right": "40b42eed09d726466fe3aacb8cd7f9a429721e22",
-      "iconButton.base.spacing.desktop.medium.left": "dca18dccf6af53fbf110e87f9aec586c79a8fc7b",
-      "iconButton.base.spacing.desktop.medium.right": "02707981d2d292a685eae37105474588439545dd",
-      "iconButton.base.spacing.desktop.large.left": "80b1ee7614db7435afd8933404cd4e7ff9208d9e",
-      "iconButton.base.spacing.desktop.large.right": "f74f61f1db0d66522bea75ae2e50e48ea79adfbc",
       "iconButton.base.spacing.mobile.small.left": "8a62df9b875df3556b717d99e6634133f3ba0377",
       "iconButton.base.spacing.mobile.small.right": "e04bb33ae35e005d7c835f0fd680a71af4bdaa6b",
       "iconButton.base.spacing.mobile.medium.left": "9995c70626b422a23d57b668e8401860d166867e",
@@ -3285,7 +3261,31 @@
       "segmentedControlGroup.secondary.color.disabled.onBackground": "3d2c6cb120b130f437ec4bdc81ca731572b63ec9",
       "segmentedControlGroup.secondary.color.disabled.outline": "cb4ad92529ff57b774c1156b2b01872b0fc9a582",
       "segmentedControlGroup.color.background": "78ee1c80b09804ae01fdddaabe8388eaa986cd75",
-      "segmentedControlGroup.color.outline": "379fd7278a3b331f272304819a323ac595fe3cbd"
+      "segmentedControlGroup.color.outline": "379fd7278a3b331f272304819a323ac595fe3cbd",
+      "iconButton.base.borderRadius.large": "d3532d4a008f5883c1ba1ab7a9d7ed5e7f3c3288",
+      "iconButton.base.borderRadius.medium": "5f4a75945ede9a494bf33f0bddb02f90f6c8991c",
+      "iconButton.base.borderRadius.small": "116037c94189470adc206179ec750e16fe7286be",
+      "iconButton.base.spacing.small.left": "e80d1305abef418bb8b9fc55e69445c225e760d2",
+      "iconButton.base.spacing.small.right": "40b42eed09d726466fe3aacb8cd7f9a429721e22",
+      "iconButton.base.spacing.medium.left": "dca18dccf6af53fbf110e87f9aec586c79a8fc7b",
+      "iconButton.base.spacing.medium.right": "02707981d2d292a685eae37105474588439545dd",
+      "iconButton.base.spacing.large.left": "80b1ee7614db7435afd8933404cd4e7ff9208d9e",
+      "iconButton.base.spacing.large.right": "f74f61f1db0d66522bea75ae2e50e48ea79adfbc",
+      "iconButton.base.size.large": "db33c6389a3823b3254339e2b5db89ae9e90fd16",
+      "iconButton.base.size.medium": "21cc1e83971940eeb231169b3c8acd654c549b8f",
+      "iconButton.base.size.small": "33b3701bdf004f6d84cabd39c0488a4475a5698e",
+      "iconButton.primary.borderWidth.default": "a51ad1a20ac57ea4795b390289979b66c4a17314",
+      "iconButton.primary.borderWidth.hovered": "361736c8fb60b40b466faaddd7f3645da26f6495",
+      "iconButton.primary.borderWidth.pressed": "7774aa617383354bb9bddb090d5129cc21219b22",
+      "iconButton.primary.borderWidth.disabled": "03ed007893e6679624a2fd4a484e8533d4fbd126",
+      "iconButton.secondary.borderWidth.default": "b26cc068084d7d0ff10cb8da3b3611a266b55020",
+      "iconButton.secondary.borderWidth.hovered": "6832087b6cbbddb66b7866b92dffd789329ccc16",
+      "iconButton.secondary.borderWidth.pressed": "5353675c0494ac33c6b97e79603619722a406d28",
+      "iconButton.secondary.borderWidth.disabled": "9b60f95253181d8f8147f2fc5d6963cf71075a6d",
+      "iconButton.tertiary.borderWidth.default": "838873797b22efb51916c4f22a55463b85614ee5",
+      "iconButton.tertiary.borderWidth.hovered": "c712211fbf80e29c17ec97e672d654c7df62ce6d",
+      "iconButton.tertiary.borderWidth.pressed": "db7493f007eed9a2ae70c5bdd50756b7aee60b11",
+      "iconButton.tertiary.borderWidth.disabled": "13c80a1d4e165f9b65f00e8a2fd31363b5a286d9"
     }
   },
   {
diff --git a/tokens/Component/Settle/IconButton/Base.json b/tokens/Component/Settle/IconButton/Base.json
index b42851c..bfbe9f7 100644
--- a/tokens/Component/Settle/IconButton/Base.json
+++ b/tokens/Component/Settle/IconButton/Base.json
@@ -2,128 +2,62 @@
   "iconButton": {
     "base": {
       "size": {
-        "desktop": {
-          "large": {
-            "value": "{theme.size.shape.desktop.large}",
-            "type": "sizing"
-          },
-          "medium": {
-            "value": "{theme.size.shape.desktop.medium}",
-            "type": "sizing"
-          },
-          "small": {
-            "value": "{theme.size.shape.desktop.small}",
-            "type": "sizing"
-          }
+        "large": {
+          "value": "{theme.size.shape.desktop.large}",
+          "type": "sizing"
         },
-        "mobile": {
-          "large": {
-            "value": "{theme.size.shape.mobile.large}",
-            "type": "sizing"
-          },
-          "medium": {
-            "value": "{theme.size.shape.mobile.medium}",
-            "type": "sizing"
-          },
-          "small": {
-            "value": "{theme.size.shape.mobile.small}",
-            "type": "sizing"
-          }
+        "medium": {
+          "value": "{theme.size.shape.desktop.medium}",
+          "type": "sizing"
+        },
+        "small": {
+          "value": "{theme.size.shape.desktop.small}",
+          "type": "sizing"
         }
       },
       "borderRadius": {
-        "desktop": {
-          "large": {
-            "value": "{theme.borderRadius.desktop.large}",
-            "type": "borderRadius"
-          },
-          "medium": {
-            "value": "{theme.borderRadius.desktop.medium}",
-            "type": "borderRadius"
-          },
-          "small": {
-            "value": "{theme.borderRadius.desktop.small}",
-            "type": "borderRadius"
-          }
+        "large": {
+          "value": "{theme.borderRadius.desktop.large}",
+          "type": "borderRadius"
         },
-        "mobile": {
-          "large": {
-            "value": "{theme.borderRadius.desktop.large}",
-            "type": "borderRadius"
-          },
-          "medium": {
-            "value": "{theme.borderRadius.mobile.medium}",
-            "type": "borderRadius"
-          },
-          "small": {
-            "value": "{theme.borderRadius.mobile.small}",
-            "type": "borderRadius"
-          }
+        "medium": {
+          "value": "{theme.borderRadius.desktop.medium}",
+          "type": "borderRadius"
+        },
+        "small": {
+          "value": "{theme.borderRadius.desktop.small}",
+          "type": "borderRadius"
         }
       },
       "spacing": {
-        "desktop": {
-          "small": {
-            "left": {
-              "value": "$basic.size.scale.desktop.50",
-              "type": "spacing"
-            },
-            "right": {
-              "value": "$basic.size.scale.desktop.50",
-              "type": "spacing"
-            }
-          },
-          "medium": {
-            "left": {
-              "value": "$basic.size.scale.desktop.100",
-              "type": "spacing"
-            },
-            "right": {
-              "value": "$basic.size.scale.desktop.100",
-              "type": "spacing"
-            }
+        "small": {
+          "left": {
+            "value": "$basic.size.scale.desktop.50",
+            "type": "spacing"
           },
-          "large": {
-            "left": {
-              "value": "$basic.size.scale.desktop.150",
-              "type": "spacing"
-            },
-            "right": {
-              "value": "$basic.size.scale.desktop.150",
-              "type": "spacing"
-            }
+          "right": {
+            "value": "$basic.size.scale.desktop.50",
+            "type": "spacing"
           }
         },
-        "mobile": {
-          "small": {
-            "left": {
-              "value": "$basic.size.scale.mobile.50",
-              "type": "spacing"
-            },
-            "right": {
-              "value": "$basic.size.scale.mobile.50",
-              "type": "spacing"
-            }
+        "medium": {
+          "left": {
+            "value": "$basic.size.scale.desktop.150",
+            "type": "spacing"
           },
-          "medium": {
-            "left": {
-              "value": "$basic.size.scale.mobile.100",
-              "type": "spacing"
-            },
-            "right": {
-              "value": "$basic.size.scale.mobile.100",
-              "type": "spacing"
-            }
+          "right": {
+            "value": "$basic.size.scale.desktop.150",
+            "type": "spacing"
+          }
+        },
+        "large": {
+          "left": {
+            "value": "$basic.size.scale.desktop.200",
+            "type": "spacing"
           },
-          "large": {
-            "left": {
-              "value": "$basic.size.scale.mobile.150",
-              "type": "spacing"
-            },
-            "right": {
-              "value": "$basic.size.scale.mobile.150",
-              "type": "spacing"
-            }
+          "right": {
+            "value": "$basic.size.scale.desktop.200",
+            "type": "spacing"
           }
         }
       }
diff --git a/tokens/Component/Settle/IconButton/Primary.json b/tokens/Component/Settle/IconButton/Primary.json
index cf3d2a0..69ea350 100644
--- a/tokens/Component/Settle/IconButton/Primary.json
+++ b/tokens/Component/Settle/IconButton/Primary.json
@@ -2,41 +2,21 @@
   "iconButton": {
     "primary": {
       "borderWidth": {
-        "positive": {
-          "default": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "hovered": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "pressed": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "disabled": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          }
+        "default": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
         },
-        "destructive": {
-          "default": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "hovered": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "pressed": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "disabled": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          }
+        "hovered": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
+        },
+        "pressed": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
+        },
+        "disabled": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
         }
       },
       "color": {
diff --git a/tokens/Component/Settle/IconButton/Secondary.json b/tokens/Component/Settle/IconButton/Secondary.json
index e8ab08a..d6a068d 100644
--- a/tokens/Component/Settle/IconButton/Secondary.json
+++ b/tokens/Component/Settle/IconButton/Secondary.json
@@ -2,41 +2,21 @@
   "iconButton": {
     "secondary": {
       "borderWidth": {
-        "positive": {
-          "default": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          },
-          "hovered": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          },
-          "pressed": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          },
-          "disabled": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          }
+        "default": {
+          "value": "{basic.borderWidth.100}",
+          "type": "borderWidth"
         },
-        "destructive": {
-          "default": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          },
-          "hovered": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          },
-          "pressed": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          },
-          "disabled": {
-            "value": "{basic.borderWidth.100}",
-            "type": "borderWidth"
-          }
+        "hovered": {
+          "value": "{basic.borderWidth.100}",
+          "type": "borderWidth"
+        },
+        "pressed": {
+          "value": "{basic.borderWidth.100}",
+          "type": "borderWidth"
+        },
+        "disabled": {
+          "value": "{basic.borderWidth.100}",
+          "type": "borderWidth"
         }
       },
       "color": {
diff --git a/tokens/Component/Settle/IconButton/Tertiary.json b/tokens/Component/Settle/IconButton/Tertiary.json
index a7b4361..7d9aed2 100644
--- a/tokens/Component/Settle/IconButton/Tertiary.json
+++ b/tokens/Component/Settle/IconButton/Tertiary.json
@@ -2,41 +2,21 @@
   "iconButton": {
     "tertiary": {
       "borderWidth": {
-        "positive": {
-          "default": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "hovered": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "pressed": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "disabled": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          }
+        "default": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
         },
-        "destructive": {
-          "default": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "hovered": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "pressed": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          },
-          "disabled": {
-            "value": "{basic.borderWidth.none}",
-            "type": "borderWidth"
-          }
+        "hovered": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
+        },
+        "pressed": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
+        },
+        "disabled": {
+          "value": "{basic.borderWidth.none}",
+          "type": "borderWidth"
         }
       },
       "color": {