From d658f70bdfbe939065dd78eb97f7bbb894a95977 Mon Sep 17 00:00:00 2001
From: Bobby Wilkes <bwilkes@salesforce.com>
Date: Wed, 30 Aug 2017 17:04:45 -0400
Subject: [PATCH 1/2] add icon tokens

---
 tokens/fuelux/icon.json     | 28 ++++++++++++++++++++++++++++
 tokens/marketing-cloud.json |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tokens/fuelux/icon.json

diff --git a/tokens/fuelux/icon.json b/tokens/fuelux/icon.json
new file mode 100644
index 00000000..645a33bb
--- /dev/null
+++ b/tokens/fuelux/icon.json
@@ -0,0 +1,28 @@
+{
+  "imports": [
+    "./aliases.json"
+  ],
+  "props": {
+    "COLOR_TEXT_ICON_DEFAULT": {
+      "value": "{!BLUE_ROYALE}",
+      "type": "color",
+      "category": "icon-color",
+      "cssProperties": ["fill"],
+      "comment": "Default icons have a blue color."
+    },
+    "COLOR_TEXT_ICON_UTILITY": {
+      "value": "{!GRAY_80}",
+      "type": "color",
+      "category": "icon-color",
+      "cssProperties": ["fill"],
+      "comment": "Utility icons have a gray color."
+    },
+    "COLOR_TEXT_ICON_INVERSE": {
+      "value": "{!WHITE}",
+      "type": "color",
+      "category": "icon-color",
+      "cssProperties": ["fill"],
+      "comment": "Inverse icon color for dark backgrounds."
+    }
+  }
+}
diff --git a/tokens/marketing-cloud.json b/tokens/marketing-cloud.json
index 05b73d2e..bd87c33c 100644
--- a/tokens/marketing-cloud.json
+++ b/tokens/marketing-cloud.json
@@ -2,8 +2,9 @@
   "imports": [
     "./fuelux/background.json",
     "./fuelux/border.json",
+    "./fuelux/icon.json",
     "./fuelux/font.json",
     "./fuelux/spacing.json",
     "./fuelux/text.json"
   ]
-}
\ No newline at end of file
+}

From 6dcdd486fa2ac21f62708c67a12f3240d16de287 Mon Sep 17 00:00:00 2001
From: Bobby Wilkes <bwilkes@salesforce.com>
Date: Thu, 31 Aug 2017 10:20:08 -0400
Subject: [PATCH 2/2] use global property for icon styles

---
 tokens/fuelux/icon.json | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tokens/fuelux/icon.json b/tokens/fuelux/icon.json
index 645a33bb..9a16a526 100644
--- a/tokens/fuelux/icon.json
+++ b/tokens/fuelux/icon.json
@@ -1,27 +1,23 @@
 {
+  "global": {
+    "category": "icon-color",
+    "cssProperties": ["fill"],
+    "type": "color"
+  },
   "imports": [
     "./aliases.json"
   ],
   "props": {
     "COLOR_TEXT_ICON_DEFAULT": {
       "value": "{!BLUE_ROYALE}",
-      "type": "color",
-      "category": "icon-color",
-      "cssProperties": ["fill"],
       "comment": "Default icons have a blue color."
     },
     "COLOR_TEXT_ICON_UTILITY": {
       "value": "{!GRAY_80}",
-      "type": "color",
-      "category": "icon-color",
-      "cssProperties": ["fill"],
       "comment": "Utility icons have a gray color."
     },
     "COLOR_TEXT_ICON_INVERSE": {
       "value": "{!WHITE}",
-      "type": "color",
-      "category": "icon-color",
-      "cssProperties": ["fill"],
       "comment": "Inverse icon color for dark backgrounds."
     }
   }