diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..a1a829b
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/favicon_dev.ico b/public/favicon_dev.ico
new file mode 100644
index 0000000..907b7ed
Binary files /dev/null and b/public/favicon_dev.ico differ
diff --git a/public/img/uillogo-inverse.png b/public/img/uillogo-inverse.png
new file mode 100644
index 0000000..99e299d
Binary files /dev/null and b/public/img/uillogo-inverse.png differ
diff --git a/public/img/uillogo.png b/public/img/uillogo.png
new file mode 100644
index 0000000..114fac5
Binary files /dev/null and b/public/img/uillogo.png differ
diff --git a/public/index.html b/public/index.html
index 34cfc6d..5193948 100644
--- a/public/index.html
+++ b/public/index.html
@@ -48,6 +48,7 @@
     <!-- @@template__app_templates_head__context__app_main -->
     <!-- @@remove_ -->
     <title>app/main/index</title>
+    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
     <!--<script src="/lib/modernizr/modernizr.min.js" type="text/javascript" charset="utf-8"></script>-->
     <link href="/lib/bootstrap/bootstrap-combined.min.css" rel="stylesheet" type="text/css">
     <!--<link href="/lib/font-awesome/font-awesome.css" rel="stylesheet" type="text/css">-->
@@ -80,6 +81,8 @@
     <!-- ko stopBinding: true --><!-- isolate navigation viewModel, prevent main from interfering -->
     <div id="navigation" class="navbar navbar-inverse">
         <div class="navbar-inner">
+            <img class="brand" src="./img/uillogo-inverse.png"/>
+
             <div class="container">
                 <div class="nav dropdown" data-bind="template: {name: 'links_nav', foreach: links }"></div>
                 <script type="text/html" id="links_nav_sub">
diff --git a/public/style.less b/public/style.less
index f916a7b..7226d01 100644
--- a/public/style.less
+++ b/public/style.less
@@ -35,6 +35,13 @@ body {
     display: inline;
 }
 
+.navbar img.brand {
+  height: 32px;
+  padding-top: 5px;
+  padding-right: 10px;
+  padding-bottom: 5px;
+}
+
 @content-divider: 150px;
 
 #content {
diff --git a/public/templates/head.html b/public/templates/head.html
index 258b5b8..5a11ef3 100644
--- a/public/templates/head.html
+++ b/public/templates/head.html
@@ -1,4 +1,5 @@
 <title>[{{title}}]</title>
+<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
 <!--<script src="/lib/modernizr/modernizr.min.js"></script>-->
 <link href="/lib/bootstrap/bootstrap-combined.min.css" rel="stylesheet" type="text/css">
 <!--<link href="/lib/font-awesome/font-awesome.css" rel="stylesheet" type="text/css">-->
diff --git a/server.js b/server.js
index 3a17bfe..4149017 100644
--- a/server.js
+++ b/server.js
@@ -41,6 +41,7 @@ var config = {
 		importer: '/importer'
 	},
 	statics: {
+		dev_favicon_path: __dirname + '/public/favicon_dev.ico',
 		importer_path: __dirname + '/public',
 		public_path: __dirname + '/public',
 		markdown_client: __dirname + '/node_modules/markdown/lib',
@@ -51,6 +52,11 @@ var config = {
 
 var app = express();
 config.debug && app.use(connect.logger());
+if (!process.env.NODE_ENV) {
+	app.get('/favicon.ico', function (req, res, next) {
+		res.sendfile(config.statics.dev_favicon_path);
+	});
+}
 //noinspection JSUnresolvedFunction
 app.use(express.static(config.statics.public_path));
 //noinspection JSUnresolvedFunction