diff --git a/dist/custom_emojis/converse.png b/images/custom_emojis/converse.png
similarity index 100%
rename from dist/custom_emojis/converse.png
rename to images/custom_emojis/converse.png
diff --git a/dist/custom_emojis/xmpp.png b/images/custom_emojis/xmpp.png
similarity index 100%
rename from dist/custom_emojis/xmpp.png
rename to images/custom_emojis/xmpp.png
diff --git a/webpack.prod.js b/webpack.prod.js
index 0468fa80d..4ac5bdeb2 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -4,7 +4,7 @@ const merge = require("webpack-merge");
 const path = require('path');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CopyPlugin = require('copy-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const ASSET_PATH = process.env.ASSET_PATH || '/dist/'; // eslint-disable-line no-process-env
 
@@ -15,7 +15,11 @@ module.exports = merge(common, {
     },
     plugins: [
         new MiniCssExtractPlugin({filename: '../dist/converse.min.css'}),
-        new CopyPlugin([{from: 'images/favicon.ico'}]),
+        new CopyWebpackPlugin([
+            {from: 'images/favicon.ico'},
+            {from: 'images/custom_emojis', to: 'custom_emojis'},
+            {from: 'sass/webfonts', to: 'webfonts'}
+        ]),
         new webpack.DefinePlugin({ // This makes it possible for us to safely use env vars on our code
             'process.env.ASSET_PATH': JSON.stringify(ASSET_PATH)
         })