diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 15ea694058c..b6db19d33aa 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -1,7 +1,10 @@
 <div class="navbar navbar-static-top">
 	<div class="navbar-inner">
 		<div class="container-fluid">
-			<span class="brand"><img src="img/small.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
+			<span class="brand">
+				<img class="logo-icon" src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"></img>
+				<span class="page-title">{{dashboard.title}}</span>
+			</span>
 			<ul class="nav pull-right" ng-controller='DashboardNavCtrl' ng-init="init()">
 
 				<li ng-show="dashboardViewState.fullscreen">
diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less
index d1bfbcf1154..ad9fe11e73d 100644
--- a/src/css/less/bootswatch.dark.less
+++ b/src/css/less/bootswatch.dark.less
@@ -56,7 +56,7 @@ hr {
 	}
 
 	.brand {
-		padding: 15px 20px 15px;
+		padding: 0px 15px;
 		color: @grayLighter;
 		font-weight: normal;
 		text-shadow: none;
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 3e52b7fc94c..da9f300b0e7 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -35,6 +35,19 @@
   }
 }
 
+.logo-icon {
+  width: 26px;
+  padding: 12px 11px 0 0;
+  display: block;
+  float: left;
+}
+
+.page-title {
+ padding: 15px 0;
+ display: block;
+ float: left;
+}
+
 .row-button {
   width: 24px;
 }
diff --git a/src/img/fav16.png b/src/img/fav16.png
new file mode 100644
index 00000000000..827cd972e4b
Binary files /dev/null and b/src/img/fav16.png differ
diff --git a/src/img/fav32.png b/src/img/fav32.png
new file mode 100644
index 00000000000..827cd972e4b
Binary files /dev/null and b/src/img/fav32.png differ
diff --git a/src/img/fav_dark_16.png b/src/img/fav_dark_16.png
new file mode 100644
index 00000000000..2f66c42db40
Binary files /dev/null and b/src/img/fav_dark_16.png differ
diff --git a/src/img/fav_dark_32.png b/src/img/fav_dark_32.png
new file mode 100644
index 00000000000..9248832f671
Binary files /dev/null and b/src/img/fav_dark_32.png differ
diff --git a/src/index.html b/src/index.html
index d47f9df9196..bf3a2179363 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,6 +9,7 @@
 
     <title>Grafana</title>
     <link rel="stylesheet" href="css/grafana.dark.min.css" title="Dark">
+    <link rel="icon" type="image/png" href="img/fav_dark_16.png">
 
     <!-- build:js app/app.js -->
     <script src="vendor/require/require.js"></script>