diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index eb3a3daaaa..f7a52c6e34 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -50,9 +50,9 @@ const COPY_LIST = [
     ["res/home.html", "webapp"],
     ["res/home-status.html", "webapp"],
     ["res/home/**", "webapp/home"],
-    ["res/{media,vector-icons}/**", "webapp"],
-    ["res/flags/*", "webapp/flags/"],
-    ["src/skins/vector/{fonts,img,themes}/**", "webapp"],
+    ["res/vector-icons/**", "webapp"],
+    ["node_modules/matrix-react-sdk/res/{fonts,img,themes}/**", "webapp"],
+    ["res/themes/**", "webapp/themes"],
     ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
     ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
     ["./config.json", "webapp", { directwatch: 1 }],
diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js
index 71093a96c2..d0ee793489 100644
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)];
-const DEFAULT_LOGO_URI = "img/logos/riot-im-logo-" + i + ".svg";
+const DEFAULT_LOGO_URI = "themes/riot/img/logos/riot-im-logo-" + i + ".svg";
 
 module.exports = React.createClass({
     displayName: 'VectorLoginHeader',
diff --git a/webpack.config.js b/webpack.config.js
index b158c65fb2..d82d4bcc89 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 let og_image_url = process.env.RIOT_OG_IMAGE_URL;
-if (!og_image_url) og_image_url = 'https://riot.im/app/img/logos/riot-im-logo-1.png';
+if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-1.png';
 
 module.exports = {
     entry: {