diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f44b34..a41cef9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,8 @@ add_custom_command(OUTPUT laminar.capnp.c++ laminar.capnp.h
 
 # Zip and compile statically served resources
 generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js
-    tpl/home.html tpl/job.html tpl/run.html tpl/log.html tpl/browse.html)
+    tpl/home.html tpl/job.html tpl/run.html tpl/log.html tpl/browse.html
+    favicon.ico favicon-152.png icon.png)
 # Download 3rd-party frontend JS libs...
 file(DOWNLOAD https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js
         js/angular.min.js EXPECTED_MD5 b1137641dbb512a60e83d673f7e2d98f)
diff --git a/src/resources.cpp b/src/resources.cpp
index 54d91b2..bf452e0 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -28,6 +28,9 @@ Resources::Resources()
 {
     // TODO: Content-type
     INIT_RESOURCE("/", index_html);
+    INIT_RESOURCE("/favicon.ico", favicon_ico);
+    INIT_RESOURCE("/favicon-152.png", favicon_152_png);
+    INIT_RESOURCE("/icon.png", icon_png);
     INIT_RESOURCE("/js/app.js", js_app_js);
     INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js);
     INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js);
diff --git a/src/resources/favicon-152.png b/src/resources/favicon-152.png
new file mode 100644
index 0000000..efd46ad
Binary files /dev/null and b/src/resources/favicon-152.png differ
diff --git a/src/resources/favicon.ico b/src/resources/favicon.ico
new file mode 100644
index 0000000..587053f
Binary files /dev/null and b/src/resources/favicon.ico differ
diff --git a/src/resources/icon.png b/src/resources/icon.png
new file mode 100644
index 0000000..576a01b
Binary files /dev/null and b/src/resources/icon.png differ
diff --git a/src/resources/index.html b/src/resources/index.html
index f92f161..8384288 100644
--- a/src/resources/index.html
+++ b/src/resources/index.html
@@ -5,6 +5,7 @@
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="apple-touch-icon-precomposed" href="/favicon-152.png">
  <title>Laminar</title>
  <script src="/js/angular.min.js"></script>
  <script src="/js/angular-route.min.js"></script>
@@ -16,9 +17,11 @@
  <script src="/js/app.js"></script>
  <style>
   body, html { height: 100%; }
-  .navbar { margin-bottom: 0;  }
-  .navbar-brand { padding: 13px 15px; font-family: 'Cantarell';}
-  .navbar-inverse { border: 0; }
+  .navbar-brand { margin: 0 -15px; padding: 7px 15px }
+  a.navbar-btn { color: #9d9d9d; }
+  a.navbar-btn.active { color: #fff; }
+  a.navbar-btn:hover { color: #fff; text-decoration: none; }
+  a.navbar-btn:focus { color: #fff; }
   canvas {
    width: 100% !important;
    max-width: 800px;
@@ -33,10 +36,10 @@
 <body>
  <nav class="navbar navbar-inverse">
   <div class="container-fluid">
-    <a class="navbar-brand" href="/">laminar</a>
-   <ul class="nav navbar-nav">
-    <li ng-class="{active:active('/')}"><a href="/jobs">Jobs</a></li>
-   </ul>
+   <div>
+    <a class="navbar-brand" href="/"><img src="/icon.png"></a>
+    <a class="btn navbar-btn" href="/jobs">Jobs</a>
+   </div>
   </div>
  </nav>
  <div ng-view></div>
diff --git a/src/resources/js/app.js b/src/resources/js/app.js
index 841eef4..3646d93 100644
--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -146,9 +146,6 @@ angular.module('laminar',['ngRoute','ngSanitize'])
 			}
 		}
 	});
-	$scope.active = function(url) {
-		return false;
-	}
 	$scope.runIcon = Laminar.runIcon;
 	timeUpdater = $interval(function() {
 		$scope.jobsRunning.forEach(function(o){
