diff --git a/components/font_icon/index.cjsx b/components/font_icon/index.cjsx
index 095adfea..6a7b2216 100644
--- a/components/font_icon/index.cjsx
+++ b/components/font_icon/index.cjsx
@@ -1,11 +1,12 @@
-require './style'
+localCSS = require './style'
 
 module.exports = React.createClass
 
   # -- States & Properties
   propTypes:
-    value        : React.PropTypes.string
+    value : React.PropTypes.string
 
   # -- Render
   render: ->
-    <span data-component-fonticon className="icon #{@props.value}" />
+    className = "#{localCSS.root} #{@props.value}"
+    <span data-react-toolbox='icon' className={className} />
diff --git a/components/font_icon/style.styl b/components/font_icon/style.styl
index 2ae97c17..6dcf8509 100644
--- a/components/font_icon/style.styl
+++ b/components/font_icon/style.styl
@@ -1,7 +1,7 @@
 @import '../constants.styl'
 @import url('https://fonts.googleapis.com/icon?family=Material+Icons')
 
-[data-component-fonticon]
+:local(.root)
   display                       : inline-block
   font-family                   : 'Material Icons'
   font-weight                   : normal