diff --git a/ui/assets/images/favicon.ico b/ui/assets/images/favicon.ico
new file mode 100644
index 0000000000..cf55ea0326
Binary files /dev/null and b/ui/assets/images/favicon.ico differ
diff --git a/ui/webpack/devConfig.js b/ui/webpack/devConfig.js
index 99643e10f3..5d20f9f9be 100644
--- a/ui/webpack/devConfig.js
+++ b/ui/webpack/devConfig.js
@@ -46,7 +46,7 @@ module.exports = {
         loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss-loader'),
       },
       {
-        test   : /\.(png|jpg|ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+        test   : /\.(ico|png|jpg|ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
         loader : 'file',
       },
       {
@@ -73,6 +73,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       template: path.resolve(__dirname, '..', 'src', 'index.template.html'),
       inject: 'body',
+      favicon: 'assets/images/favicon.ico',
     }),
     new webpack.optimize.CommonsChunkPlugin({
       names: ['vendor', 'manifest'],
diff --git a/ui/webpack/prodConfig.js b/ui/webpack/prodConfig.js
index c2c12a76b1..4e1d8ca56f 100644
--- a/ui/webpack/prodConfig.js
+++ b/ui/webpack/prodConfig.js
@@ -48,7 +48,7 @@ var config = {
         loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss-loader'),
       },
       {
-        test   : /\.(png|jpg|ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+        test   : /\.(ico|png|jpg|ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
         loader : 'file',
       },
       {
@@ -81,6 +81,7 @@ var config = {
       template: path.resolve(__dirname, '..', 'src', 'index.template.html'),
       inject: 'body',
       chunksSortMode: 'dependency',
+      favicon: 'assets/images/favicon.ico',
     }),
     new webpack.optimize.UglifyJsPlugin({
       compress: {