diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index 2a21ee9b5f9..3ebac53e8d1 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -5,6 +5,7 @@
 					<span class="top-nav-logo-background">
 						<img class="logo-icon" src="img/grafana_icon.svg"></img>
 					</span>
+					<i class="icon-gf icon-gf-grafana_wordmark"></i>
 					<i class="fa fa-caret-down"></i>
 				</a>
 			</div>
diff --git a/public/app/core/core_module.js b/public/app/core/core_module.js
deleted file mode 100644
index c073779ebaa..00000000000
--- a/public/app/core/core_module.js
+++ /dev/null
@@ -1,3 +0,0 @@
-///<reference path="../headers/common.d.ts" />
-var angular_1 = require('angular');
-exports["default"] = angular_1["default"].module('grafana.core', ['ngRoute']);
diff --git a/public/app/features/datasources/partials/list.html b/public/app/features/datasources/partials/list.html
index af77ca36ddb..a19cac7c142 100644
--- a/public/app/features/datasources/partials/list.html
+++ b/public/app/features/datasources/partials/list.html
@@ -1,5 +1,5 @@
-<topnav title="Data sources" icon="fa fa-fw fa-database" subnav="false">
-</topnav>
+<navbar title="Data sources" icon="fa fa-fw fa-database" subnav="false">
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide">
diff --git a/public/less/navbar.less b/public/less/navbar.less
index a1045a8e283..0fed300852a 100644
--- a/public/less/navbar.less
+++ b/public/less/navbar.less
@@ -65,6 +65,12 @@
     width: 30px;
     height: 30px;
   }
+  .icon-gf-grafana_wordmark {
+    position: relative;
+    top: 3px;
+    padding-left: 5px;
+    display: none;
+  }
 }
 
 .top-nav-dashboards-btn {
diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less
index 1e06a570346..18e4f6ea7ec 100644
--- a/public/less/sidemenu.less
+++ b/public/less/sidemenu.less
@@ -29,6 +29,7 @@
 .sidemenu-pinned {
   .sidemenu-wrapper {
     min-height: 100%;
+    top: 50px;
   }
   .main-view-container {
     padding-left: 210px;
@@ -36,6 +37,21 @@
   .page-container {
     padding-left: 210px;
   }
+  .top-nav-menu-btn {
+    a {
+      padding-right: 52px;
+      padding-left: 24px;
+    }
+    .icon-gf-grafana_wordmark  {
+      display: inline-block;
+    }
+    .fa {
+      display: none;
+    }
+  }
+  .sidemenu-org {
+    box-shadow: none;
+  }
 }
 
 .sidemenu {