diff --git a/script/bootstrap b/script/bootstrap
index 632ee812e2..de98f116f8 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -12,5 +12,8 @@ yarn install
 # Install bower web components. Allow to download the components as root since the user in docker is root.
 ./node_modules/.bin/bower install --allow-root
 
+# Generate all needed files.
+script/build_frontend
+
 # Build files that need to be generated to run development mode
 yarn dev
diff --git a/src/home-assistant.html b/src/home-assistant.html
index 00ca84221d..1ad3645920 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -103,13 +103,13 @@ class HomeAssistant extends Polymer.Element {
 
   loadIcons() {
     // If the import fails, we'll try to import again, must be a server glitch
-    // Since HTML imports only resolve once, we import another url.
+    // Since HTML imports only resolve once, in prod mode we import another url.
     const success = () => {
       this.iconsLoaded = true;
     };
 
     Polymer.importHref(
-      '/static/mdi-' + this.icons + '.html',
+      '/static/mdi' + this.icons + '.html',
       success,
       () => Polymer.importHref('/static/mdi.html', success, success),
       true /* true for async */