diff --git a/package.json b/package.json
index 86cb483961..d924c1223a 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "gulp": "gulp"
   },
   "dependencies": {
-    "@salesforce-ux/design-tokens": "2.0.4",
+    "@salesforce-ux/design-tokens": "2.0.5",
     "@salesforce-ux/icons": "3.4.0",
     "app-module-path": "1.0.5",
     "async": "1.5.2",
diff --git a/scripts/gulp/generate-icons.js b/scripts/gulp/generate-icons.js
index f31d9a70f5..9f2b1f474a 100644
--- a/scripts/gulp/generate-icons.js
+++ b/scripts/gulp/generate-icons.js
@@ -115,7 +115,7 @@ const generate = () => {
       const symbolName = path.basename(file.path, '.svg');
       const className = category.getClassName(
         spriteName,
-        symbolName.replace(/_/g, '-')
+        _.kebabCase(symbolName.toLowerCase())
       );
       const icon = {
         sprite: spriteName,