diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
new file mode 100644
index 0000000000..17cf4eaac7
Binary files /dev/null and b/docs/assets/favicon.ico differ
diff --git a/docs/client.js b/docs/client.js
index e3680ee13d..0fb9d754f5 100644
--- a/docs/client.js
+++ b/docs/client.js
@@ -4,15 +4,12 @@ import './assets/style.css';
 
 import './assets/carousel.png';
 import './assets/logo.png';
+import './assets/favicon.ico';
 
 import React from 'react';
 import Router from 'react-router';
 import routes from './src/Routes';
 
-// TODO: Move this to Webpack
-// For React devtools
-window.React = React;
-
 Router.run(routes, Router.RefreshLocation, Handler => {
   React.render(
     React.createElement(Handler, window.INITIAL_PROPS), document);
diff --git a/docs/src/Root.js b/docs/src/Root.js
index dd9624df95..86de7e0f71 100644
--- a/docs/src/Root.js
+++ b/docs/src/Root.js
@@ -66,6 +66,7 @@ const Root = React.createClass({
         <meta http-equiv='X-UA-Compatible' content='IE=edge' />
         <meta name='viewport' content='width=device-width, initial-scale=1.0' />
         <link href='assets/bundle.css' rel='stylesheet' />
+        <link href='assets/favicon.ico' type='image/x-icon' rel='icon' />
         <!--[if lt IE 9]>
         <script src='https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js'></script>
         <script src='https://oss.maxcdn.com/respond/1.4.2/respond.min.js'></script>
diff --git a/webpack/strategies/docs.js b/webpack/strategies/docs.js
index 27be46bc32..9801053a8c 100644
--- a/webpack/strategies/docs.js
+++ b/webpack/strategies/docs.js
@@ -39,7 +39,7 @@ export default (config, options) => {
             { test: /\.less$/, loader: ExtractTextPlugin.extract('style', `css${cssSourceMap}!less${cssSourceMap}`) },
             { test: /\.json$/, loader: 'json' },
 
-            { test: /\.jpe?g$|\.gif$|\.png$/, loader: 'file?name=[name].[ext]' },
+            { test: /\.jpe?g$|\.gif$|\.png|\.ico$/, loader: 'file?name=[name].[ext]' },
             { test: /\.eot$|\.ttf$|\.svg$|\.woff2?$/, loader: 'file?name=[name].[ext]' }
           ])
       },