diff --git a/src/home-assistant.js b/src/home-assistant.js
index 5aca29d898..c7d0bf1401 100644
--- a/src/home-assistant.js
+++ b/src/home-assistant.js
@@ -72,10 +72,6 @@ export default new Polymer({
 
     startLocalStoragePreferencesSync();
 
-    // remove the HTML init message
-    const initMsg = document.getElementById('init');
-    initMsg.parentElement.removeChild(initMsg);
-
     this.loadIcons();
   },
 });
diff --git a/src/layouts/login-form.html b/src/layouts/login-form.html
index bfae4f4ee1..bc469665dc 100644
--- a/src/layouts/login-form.html
+++ b/src/layouts/login-form.html
@@ -51,7 +51,7 @@
 
   <template>
     <div class="layout vertical center center-center fit">
-      <img src="/static/splash.png" height="230" />
+      <img src="/static/favicon-192x192.png" height="192" />
       <a href="#" id="hideKeyboardOnFocus"></a>
       <div class='interact'>
         <div id='loginform' hidden$="[[showLoading]]">
diff --git a/src/layouts/login-form.js b/src/layouts/login-form.js
index 539ff4df3c..9c732e6af9 100644
--- a/src/layouts/login-form.js
+++ b/src/layouts/login-form.js
@@ -84,4 +84,10 @@ export default new Polymer({
 
     validateAuth(this.$.passwordInput.value, this.$.rememberLogin.checked);
   },
+
+  attached() {
+    // remove the HTML init message
+    const initMsg = document.getElementById('init');
+    initMsg.parentElement.removeChild(initMsg);
+  },
 });
diff --git a/src/layouts/partial-dev-info.html b/src/layouts/partial-dev-info.html
index d86900905f..b89d61d316 100644
--- a/src/layouts/partial-dev-info.html
+++ b/src/layouts/partial-dev-info.html
@@ -56,7 +56,8 @@
       <div class='content fit'>
         <div class='about'>
           <p class='version'>
-            <a href='https://home-assistant.io'><img src="/static/splash.png" height="230" /></a><br />
+            <a href='https://home-assistant.io'><img src="/static/favicon-192x192.png" height="192" /></a><br />
+            Home Assistant<br />
             [[hassVersion]]
           </p>
           <p class='develop'>