diff --git a/background.html b/background.html
index 4a3fa4f39..c355c5c6d 100644
--- a/background.html
+++ b/background.html
@@ -20,7 +20,7 @@
             style-src 'self' 'unsafe-inline';"
   >
   <title>Loki Messenger</title>
-  <link href='images/icon_128.png' rel='shortcut icon'>
+  <link href='images/loki/loki_icon_128.png' rel='shortcut icon'>
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
 
   <!--
@@ -29,7 +29,7 @@
 
   <script type='text/x-tmpl-mustache' id='app-loading-screen'>
     <div class='content'>
-      <img src='images/icon_128.png'>
+      <img src='images/loki/loki_icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
@@ -40,7 +40,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
     <div class='content'>
-      <img src='images/icon_128.png'>
+      <img src='images/loki/loki_icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
@@ -62,6 +62,9 @@
           <div class='new-contact contact hide'></div>
         </div>
       </div>
+      <div class='loki'>
+        <img src='images/loki/loki_icon_text.png'>
+      </div>
     </div>
     <div class='identity-key-placeholder'></div>
     <div class='underneathIdentityWrapper'>
@@ -70,7 +73,7 @@
           <div class='conversation-header'></div>
           <div class='container'>
             <div class='content'>
-              <img src='images/icon_128.png' />
+              <img src='images/loki/loki_icon_128.png' />
               <h3>{{ welcomeToSignal }}</h3>
               <p>{{ selectAContact }}</p>
             </div>
@@ -673,7 +676,7 @@
 <body>
   <div class='app-loading-screen'>
     <div class='content'>
-      <img src='images/icon_128.png'>
+      <img src='images/loki/loki_icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
diff --git a/images/loki/loki_icon.png b/images/loki/loki_icon.png
new file mode 100644
index 000000000..71e3de339
Binary files /dev/null and b/images/loki/loki_icon.png differ
diff --git a/images/loki/loki_icon_128.png b/images/loki/loki_icon_128.png
new file mode 100644
index 000000000..1940490eb
Binary files /dev/null and b/images/loki/loki_icon_128.png differ
diff --git a/images/loki/loki_icon_text.png b/images/loki/loki_icon_text.png
new file mode 100644
index 000000000..9d79d6091
Binary files /dev/null and b/images/loki/loki_icon_text.png differ
diff --git a/index.html b/index.html
index ab37abf6f..3e2e23df1 100644
--- a/index.html
+++ b/index.html
@@ -7,14 +7,14 @@
         <title>Signal</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href='/images/icon_128.png' rel='shortcut icon'>
+        <link href='/images/loki/loki_icon_128.png' rel='shortcut icon'>
         <link href="/stylesheets/manifest.css" rel="stylesheet" type="text/css" />
         <script type="text/javascript" src="js/chromium.js"></script>
     </head>
     <body id="signal-container" class='signal index'>
         <div class='app-loading-screen'>
             <div class='content'>
-              <img src='/images/icon_128.png'>
+              <img src='/images/loki/loki_icon_128.png'>
               <div class='container'>
                 <span class='dot'></span>
                 <span class='dot'></span>
diff --git a/js/background.js b/js/background.js
index a107388b2..112c048c0 100644
--- a/js/background.js
+++ b/js/background.js
@@ -72,7 +72,6 @@
     'hourglass_empty.svg',
     'hourglass_full.svg',
     'icon_1024.png',
-    'icon_128.png',
     'icon_16.png',
     'icon_250.png',
     'icon_256.png',
@@ -118,6 +117,8 @@
     'warning.svg',
     'x.svg',
     'x_white.svg',
+    'loki/loki_icon_text.png',
+    'loki/loki_icon_128.png',
   ]);
 
   // We add this to window here because the default Node context is erased at the end
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 1bb8b18e6..6a6212207 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -29,11 +29,32 @@
     border: 2px solid $color-gray-02;
   }
 
+  display: flex;
+  flex-direction: column;
   float: left;
   width: 300px;
+
+  .tool-bar {
+    margin-top: 8px;
+  }
+
   .content {
     overflow-y: scroll;
     max-height: calc(100% - 88px);
+    min-height: 0px;
+    flex: 1 1 auto;
+  }
+
+  .loki {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 70px;
+    background: $color-light-35;
+    img {
+      max-width: 60%;
+      max-height: 60%;
+    }
   }
 }
 .network-status-container {
diff --git a/test/index.html b/test/index.html
index 8e5796eb1..9dbcf2fa2 100644
--- a/test/index.html
+++ b/test/index.html
@@ -18,7 +18,7 @@
   </div>
   <script type='text/x-tmpl-mustache' id='app-loading-screen'>
     <div class='content'>
-      <img src='/images/icon_128.png'>
+      <img src='/images/loki/loki_icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
@@ -28,7 +28,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
     <div class='content'>
-      <img src='/images/icon_128.png'>
+      <img src='/images/loki/loki_icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
@@ -57,7 +57,7 @@
       <div class='conversation placeholder'>
         <div class='conversation-header'></div>
         <div class='content'>
-          <img src='/images/icon_128.png' />
+          <img src='/images/loki/loki_icon_128.png' />
           <h3>{{ welcomeToSignal }}</h3>
           <p>{{ selectAContact }}</p>
         </div>
