diff --git a/README.md b/README.md
index cb83ab61..98ce90d8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Maputnik [![Build Status](https://travis-ci.org/maputnik/editor.svg?branch=master)](https://travis-ci.org/maputnik/editor) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/anelbgv6jdb3qnh9/branch/master?svg=true)](https://ci.appveyor.com/project/lukasmartinelli/editor) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://tldrlegal.com/license/mit-license)
 
-<img width="200" align="right" alt="Maputnik" src="media/maputnik.png" />
+<img width="200" align="right" alt="Maputnik" src="src/img/maputnik.png" />
 
 A free and open visual editor for the [Mapbox GL styles](https://www.mapbox.com/mapbox-gl-style-spec/)
 targeted at developers and map designers. Creating your own custom map is easy with **Maputnik**.
diff --git a/media/demo.gif b/media/demo.gif
deleted file mode 100644
index 1703e791..00000000
Binary files a/media/demo.gif and /dev/null differ
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index e9d6c267..920ddce4 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -16,6 +16,7 @@ import HelpIcon from 'react-icons/lib/md/help-outline'
 import InspectionIcon from 'react-icons/lib/md/find-in-page'
 import AddIcon from 'react-icons/lib/md/add-circle-outline'
 
+import logoImage from '../img/maputnik.png'
 import AddModal from './modals/AddModal'
 import SettingsModal from './modals/SettingsModal'
 import SourcesModal from './modals/SourcesModal'
@@ -172,7 +173,7 @@ export default class Toolbar extends React.Component {
           padding: 5,
         }}
       >
-        <img src="https://github.com/maputnik/editor/raw/master/media/maputnik.png" alt="Maputnik" style={{width: 30, height: 30, paddingRight: 5, verticalAlign: 'middle'}}/>
+        <img src={logoImage} alt="Maputnik" style={{width: 30, height: 30, paddingRight: 5, verticalAlign: 'middle'}}/>
         <span style={{fontSize: 20, verticalAlign: 'middle' }}>Maputnik</span>
       </ToolbarLink>
       <ToolbarAction onClick={this.toggleModal.bind(this, 'open')}>
diff --git a/src/favicon.ico b/src/favicon.ico
new file mode 100644
index 00000000..f7aaa432
Binary files /dev/null and b/src/favicon.ico differ
diff --git a/media/maputnik.png b/src/img/maputnik.png
similarity index 100%
rename from media/maputnik.png
rename to src/img/maputnik.png
diff --git a/src/index.jsx b/src/index.jsx
index b28e1b39..5fc890fe 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
+import './favicon.ico'
 import './index.css'
 import App from './components/App';
 
diff --git a/webpack.config.js b/webpack.config.js
index aa0de92e..1e9da5a0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,16 +7,6 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 const HOST = process.env.HOST || "127.0.0.1";
 const PORT = process.env.PORT || "8888";
 
-// local scss modules
-loaders.push({
-  test: /[\/\\]src[\/\\].*\.scss/,
-  loaders: [
-    'style?sourceMap',
-    'css?modules&importLoaders=1&localIdentName=[path]___[name]__[local]___[hash:base64:5]',
-    'sass'
-  ]
-});
-
 module.exports = {
   target: 'web',
   entry: [
@@ -30,9 +20,6 @@ module.exports = {
     filename: 'bundle.js'
   },
   resolve: {
-    alias: {
-      'webworkify': 'webworkify-webpack'
-    },
     extensions: ['', '.js', '.jsx']
   },
   module: {
diff --git a/webpack.loaders.js b/webpack.loaders.js
index e902c3f8..242f6219 100644
--- a/webpack.loaders.js
+++ b/webpack.loaders.js
@@ -14,28 +14,16 @@ module.exports = [
     }
   },
   {
-    test: /\.(eot|svg|ttf|woff|woff2)$/,
+    test: /\.(eot|ttf|woff|woff2)$/,
     loader: 'file?name=fonts/[name].[ext]'
   },
   {
-    test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-    exclude: /(node_modules|bower_components)/,
-    loader: "url?limit=10000&mimetype=image/svg+xml"
+    test: /\.ico$/,
+    loader: 'file?name=[name].[ext]'
   },
   {
-    test: /\.gif/,
-    exclude: /(node_modules|bower_components)/,
-    loader: "url-loader?limit=10000&mimetype=image/gif"
-  },
-  {
-    test: /\.jpg/,
-    exclude: /(node_modules|bower_components)/,
-    loader: "url-loader?limit=10000&mimetype=image/jpg"
-  },
-  {
-    test: /\.png/,
-    exclude: /(node_modules|bower_components)/,
-    loader: "url-loader?limit=10000&mimetype=image/png"
+    test: /\.(svg|gif|jpg|png)$/,
+    loader: 'file?name=img/[name].[ext]'
   },
   {
     test: /\.json$/,
diff --git a/webpack.production.config.js b/webpack.production.config.js
index 0848a7a0..60edb6d5 100644
--- a/webpack.production.config.js
+++ b/webpack.production.config.js
@@ -6,12 +6,6 @@ var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var WebpackCleanupPlugin = require('webpack-cleanup-plugin');
 
-// local scss modules
-loaders.push({
-  test: /[\/\\]src[\/\\].*\.scss/,
-  loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]', 'sass')
-});
-
 module.exports = {
   entry: {
     app: './src/index.jsx',
@@ -45,9 +39,6 @@ module.exports = {
     chunkFilename: '[chunkhash].js'
   },
   resolve: {
-    alias: {
-      'webworkify': 'webworkify-webpack',
-    },
     extensions: ['', '.js', '.jsx']
   },
   module: {