diff --git a/src/components/FontAwesome3.js b/src/components/FontAwesome3.js
index 26a8a4bf0..513df8414 100644
--- a/src/components/FontAwesome3.js
+++ b/src/components/FontAwesome3.js
@@ -88,7 +88,7 @@ export default React.createClass({
       spin && classNames.push(cssModule[prefix + '-spin'])
       pulse && classNames.push(cssModule[prefix + '-pulse'])
       border && classNames.push(cssModule[prefix + '-border'])
-      fixedWidth && classNames.push(cssModule[prefix + '-fixed-width'])
+      fixedWidth && classNames.push(cssModule[prefix + '-fw'])
       flip && classNames.push(cssModule[prefix + '-flip-' + flip])
       rotate && classNames.push(cssModule[prefix + '-rotate-' + rotate])
       stack && classNames.push(cssModule[prefix + '-stack-' + stack])
@@ -99,7 +99,7 @@ export default React.createClass({
       spin && classNames.push(prefix + '-spin')
       pulse && classNames.push(prefix + '-pulse')
       border && classNames.push(prefix + '-border')
-      fixedWidth && classNames.push(prefix + '-fixed-width')
+      fixedWidth && classNames.push(prefix + '-fw')
       flip && classNames.push(prefix + '-flip-' + flip)
       rotate && classNames.push(prefix + '-rotate-' + rotate)
       stack && classNames.push(prefix + '-stack-' + stack)
diff --git a/src/components/Icon.js b/src/components/Icon.js
index ffa82a281..ebb0a8ea5 100644
--- a/src/components/Icon.js
+++ b/src/components/Icon.js
@@ -1,11 +1,10 @@
 import React from 'react';
 import FontAwesome from 'react-fontawesome';
 import FontAwesome3 from './FontAwesome3.js';
-import omit from 'lodash.omit';
 
-const Icon = (props) => {
-  const newProps = omit(props, 'v');
-  return props.v === 3 ? <FontAwesome3 {...newProps} /> : <FontAwesome {...newProps} />;
+const Icon = props => {
+  const { v, ...newProps } = props;
+  return v === 3 ? <FontAwesome3 {...newProps} /> : <FontAwesome {...newProps} />;
 };
 
 Icon.displayName = 'Icon';