diff --git a/src/public/favicon.ico b/src/public/favicon.ico
index 6848441..d49da2f 100644
Binary files a/src/public/favicon.ico and b/src/public/favicon.ico differ
diff --git a/src/public/style.css b/src/public/style.css
index ed9e6c6..1401e85 100644
--- a/src/public/style.css
+++ b/src/public/style.css
@@ -149,7 +149,7 @@ input {
 
 .inputMessage{
   border: none;
-  border-top: 2px solid #ececec;
+  border-top: 1px solid #e7e7e7;
   bottom: 0;
   height: 60px;
   left: 0;
@@ -181,8 +181,7 @@ input {
 .chat .warning-sign {
   display: none;
   cursor: pointer;
-  color: red;
-  font-size: 24px;
+  width: 35px;
 }
 
 .inputMessage.encryption-disabled {
@@ -193,4 +192,16 @@ input {
   position: relative;
   top: 16px;
   text-align: center;
+}
+
+.navbar {
+  background: none;
+}
+
+.navbar-brand {
+  padding: 5px 15px;
+}
+
+.navbar-brand img {
+  width: 40px;
 }
\ No newline at end of file
diff --git a/src/views/index.mustache b/src/views/index.mustache
index a13d8c6..e215918 100644
--- a/src/views/index.mustache
+++ b/src/views/index.mustache
@@ -24,7 +24,9 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="javascript:void(0)">FattyChat</a>
+        <a class="navbar-brand" href="javascript:void(0)">
+          <img src="https://s3.amazonaws.com/fattychat/img/logo.png">
+        </a>
         <span class="participants">
           <span class="glyphicon glyphicon-user"></span>&nbsp;<span id="participants"></span>
         </span>
@@ -52,7 +54,7 @@
       </div>
       <input class="inputMessage" placeholder="Type here..."/>
       <div id="input-icons">
-        <span class="glyphicon glyphicon-warning-sign warning-sign"></span>        
+      <img src="https://s3.amazonaws.com/fattychat/img/warning-icon.png" class="warning-sign">
       </div>
     </li>
   </ul>