diff --git a/.gitignore b/.gitignore
index da0dac6d4..ae20d31e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 build
 node_modules
 /node_modules
+static/dist
 test-results.xml
 npm-debug.log
 webpack-stats.json
diff --git a/package.json b/package.json
index 9bf1b5802..529f61529 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "bundle-loader": "~0.5.0",
     "cache-manager": "^1.1.0",
     "classnames": "^2.1.2",
+    "clean-webpack-plugin": "^0.1.8",
     "compression": "^1.6.0",
     "cookie-parser": "^1.3.5",
     "copy-to-clipboard": "^1.0.4",
@@ -46,6 +47,7 @@
     "express-state": "^1.2.0",
     "express-useragent": "^0.2.0",
     "extract-text-webpack-plugin": "^0.8.0",
+    "file-loader": "^0.8.4",
     "html-webpack-plugin": "^1.4.0",
     "http-proxy": "^1.13.2",
     "humps": "^1.0.0",
@@ -90,7 +92,6 @@
     "superagent": "^1.2.0",
     "superagent-promise": "^1.0.3",
     "url": "^0.11.0",
-    "file-loader": "^0.8.4",
     "url-loader": "~0.5.5",
     "webpack": "^1.10.3",
     "webpack-isomorphic-tools": "^2.2.41",
diff --git a/webpack-isomorphic-tools-configuration.js b/webpack-isomorphic-tools-configuration.js
index 0c4069a0d..9407daf21 100644
--- a/webpack-isomorphic-tools-configuration.js
+++ b/webpack-isomorphic-tools-configuration.js
@@ -18,7 +18,8 @@ module.exports = {
         'jpeg',
         'jpg',
         'png',
-        'gif'
+        'gif',
+        'svg'
       ],
       parser: WebpackIsomorphicToolsPlugin.url_loader_parser
     },
@@ -31,10 +32,6 @@ module.exports = {
       ],
       parser: WebpackIsomorphicToolsPlugin.url_loader_parser
     },
-    svg: {
-      extension: 'svg',
-      parser: WebpackIsomorphicToolsPlugin.url_loader_parser
-    },
     // this whole "bootstrap" asset type is only used once in development mode.
     // the only place it's used is the Html.js file
     // where a <style/> tag is created with the contents of the
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
index 2bee21f2d..c90281c2f 100644
--- a/webpack.prod.config.js
+++ b/webpack.prod.config.js
@@ -1,8 +1,10 @@
 require('dotenv').config({path: (process.env.NODE_ENV || 'production') + '.env'});
+
 var path = require('path');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var path = require('path');
 var webpack = require('webpack');
+var CleanPlugin = require('clean-webpack-plugin');
 var IsomorphicPlugin = require('webpack-isomorphic-tools/plugin')
 var webpackIsomorphicToolsPlugin = new IsomorphicPlugin(require('./webpack-isomorphic-tools-configuration'));
 
@@ -57,11 +59,11 @@ module.exports = {
       { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&mimetype=application/font-woff" },
       { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&mimetype=application/octet-stream" },
       { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&mimetype=image/svg+xml" },
-      { test: webpackIsomorphicToolsPlugin.regular_expression('images'), loader: 'url-loader?limit=10240' }
+      { test: webpackIsomorphicToolsPlugin.regular_expression('images'), loader: 'url-loader?name=images/[name].[ext]&limit=10240' }
     ]
   },
   plugins: [
+    new CleanPlugin([relativeAssetsPath]),
     new webpack.NoErrorsPlugin(),
     new webpack.ProvidePlugin({
       $: "jquery",