diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 98ed0899316..27983b54114 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -3,7 +3,8 @@
 	<div class="login-box">
 
 		<div class="login-box-logo">
-			<img src="img/logo_transparent_200x75.png">
+			<img class="logo-icon" src="img/grafana_icon.svg"></img><br>
+			<i class="icon-gf icon-gf-grafana_wordmark"></i>
 		</div>
 
     <div class="login-inner-box">
diff --git a/public/less/login.less b/public/less/login.less
index e599bca1927..77213fa7301 100644
--- a/public/less/login.less
+++ b/public/less/login.less
@@ -9,15 +9,23 @@
 
 .login-box {
   width: 700px;
-  margin: 100px auto 0 auto;
+  margin: 70px auto 0 auto;
 }
 
 .login-box-logo {
   text-align: center;
-  padding-bottom: 50px;
+  img {
+    width: 125px;
+  }
+  .icon-gf-grafana_wordmark {
+    color: @linkColor;
+    position: relative;
+    top: -90px;
+    font-size: 3rem;
+    text-shadow: 3px 3px 5px black;
+  }
 }
 
-
 .login-inner-box {
   background: @grafanaPanelBackground;
 }