diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index b66eeffdc36..e8e2179ce5c 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -72,8 +72,8 @@
 			Import
 		</a>
 
-		<a class="pull-right small muted" target="_blank" href="https://grafana.net/dashboards?utm_source=grafana_search">
-			Explore ready made dashboards on Grafana.net
+		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.net/dashboards?utm_source=grafana_search">
+      Find dashboards on
 		</a>
 
  		<div class="clearfix"></div>
diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html
index f4ee2b57815..c276faae93a 100644
--- a/public/app/features/plugins/partials/plugin_list.html
+++ b/public/app/features/plugins/partials/plugin_list.html
@@ -5,9 +5,9 @@
   <div class="page-header">
     <h1>Plugins</h1>
 
-		<a class="btn btn-inverse" href="https://grafana.net/plugins?utm_source=grafana_plugin_list" target="_blank">
-			Explore plugins on Grafana.net
-		</a>
+		<!-- <a class="btn btn&#45;inverse" href="https://grafana.net/plugins?utm_source=grafana_plugin_list" target="_blank"> -->
+		<!-- 	Explore plugins on Grafana.net -->
+		<!-- </a> -->
 
 		<div class="page-header-tabs">
 			<ul class="gf-tabs">
@@ -27,36 +27,40 @@
 					</a>
 				</li>
 			</ul>
-		</div>
-	</div>
 
-	<section class="card-section" layout-mode>
+      <a class="get-more-plugins-link" href="https://grafana.net/plugins?utm_source=grafana_plugin_list" target="_blank">
+        Find plugins on
+      </a>
+    </div>
+  </div>
+
+  <section class="card-section" layout-mode>
     <layout-selector></layout-selector>
 
-		<ol class="card-list" >
-			<li class="card-item-wrapper" ng-repeat="plugin in ctrl.plugins">
-				<a class="card-item" href="plugins/{{plugin.id}}/edit">
-					<div class="card-item-header">
-						<div class="card-item-type">
-							<i class="icon-gf icon-gf-{{plugin.type}}"></i>
-							{{plugin.type}}
-						</div>
-					  <div class="card-item-notice" ng-show="plugin.hasUpdate">
-							<span bs-tooltip="plugin.latestVersion">Update available!</span>
-						</div>
-					</div>
-					<div class="card-item-body">
-						<figure class="card-item-figure">
-							<img ng-src="{{plugin.info.logos.small}}">
-						</figure>
-						<div class="card-item-details">
-							<div class="card-item-name">{{plugin.name}}</div>
-							<div class="card-item-sub-name">By {{plugin.info.author.name}}</div>
-						</div>
-					</div>
-				</a>
-			</li>
-		</ol>
-	</section>
+    <ol class="card-list" >
+      <li class="card-item-wrapper" ng-repeat="plugin in ctrl.plugins">
+        <a class="card-item" href="plugins/{{plugin.id}}/edit">
+          <div class="card-item-header">
+            <div class="card-item-type">
+              <i class="icon-gf icon-gf-{{plugin.type}}"></i>
+              {{plugin.type}}
+            </div>
+            <div class="card-item-notice" ng-show="plugin.hasUpdate">
+              <span bs-tooltip="plugin.latestVersion">Update available!</span>
+            </div>
+          </div>
+          <div class="card-item-body">
+            <figure class="card-item-figure">
+              <img ng-src="{{plugin.info.logos.small}}">
+            </figure>
+            <div class="card-item-details">
+              <div class="card-item-name">{{plugin.name}}</div>
+              <div class="card-item-sub-name">By {{plugin.info.author.name}}</div>
+            </div>
+          </div>
+        </a>
+      </li>
+    </ol>
+  </section>
 
 </div>
diff --git a/public/img/grafana_net_logo.svg b/public/img/grafana_net_logo.svg
new file mode 100644
index 00000000000..d73b9b944a8
--- /dev/null
+++ b/public/img/grafana_net_logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="400" height="81" viewBox="0 0 400 81"><path d="M136.223 42.913c-.463 11.743-9.719 20.884-21.231 20.884-12.149 0-21.174-9.835-21.174-21.694 0-11.975 9.777-21.81 21.694-21.81 5.38 0 10.645 2.314 15.099 6.479l-3.471 4.281c-3.413-2.951-7.521-4.975-11.628-4.975-8.735 0-15.909 7.173-15.909 16.024 0 8.967 6.768 15.909 15.388 15.909 7.752 0 13.826-5.669 15.041-12.959h-17.586v-5.149h23.777v3.01zm20.187-2.834h-3.24a6.48 6.48 0 0 0-6.479 6.479V63.45h-5.785V34.525h4.744v2.43c1.562-1.562 4.05-2.43 6.826-2.43h6.248l-2.314 5.554zm31.526 23.371h-4.917v-3.645c-3.804 3.717-9.803 5.496-15.874 2.83-4.506-1.979-7.854-6.084-8.745-10.924-1.723-9.355 5.472-17.649 14.669-17.649 3.876 0 7.347 1.562 9.892 4.107v-3.644h4.975V63.45zm-5.917-12.382c1.365-5.879-3.086-11.221-8.892-11.221-5.033 0-9.082 4.107-9.082 9.083 0 5.627 4.947 9.982 10.701 9.002 3.545-.604 6.46-3.361 7.273-6.864zm17.578-18.163v1.62h9.198v5.091h-9.198V63.45h-5.727V33.079c0-6.364 4.57-10.124 10.297-10.124h6.942l-2.314 5.438h-4.628c-2.546 0-4.57 2.024-4.57 4.512zm39.857 30.545h-4.917v-3.645c-3.804 3.717-9.803 5.496-15.874 2.83-4.506-1.979-7.854-6.084-8.745-10.924-1.723-9.355 5.472-17.649 14.669-17.649 3.876 0 7.347 1.562 9.892 4.107v-3.644h4.975V63.45zm-5.917-12.382c1.365-5.879-3.086-11.221-8.892-11.221-5.033 0-9.082 4.107-9.082 9.083 0 5.627 4.947 9.982 10.701 9.002 3.545-.604 6.459-3.361 7.273-6.864zm36.818-4.742V63.45h-5.785V46.326c0-3.587-2.951-6.48-6.48-6.48-3.644 0-6.537 2.893-6.537 6.48V63.45h-5.785V34.525h4.801v2.487a11.743 11.743 0 0 1 7.752-2.95c6.712 0 12.034 5.496 12.034 12.264zm34.014 17.124h-4.917v-3.645c-3.804 3.717-9.803 5.496-15.874 2.83-4.506-1.979-7.854-6.084-8.745-10.924-1.723-9.355 5.472-17.649 14.669-17.649 3.876 0 7.347 1.562 9.892 4.107v-3.644h4.975V63.45zm-5.917-12.382c1.365-5.879-3.086-11.221-8.892-11.221-5.033 0-9.082 4.107-9.082 9.083 0 5.627 4.947 9.982 10.701 9.002 3.545-.604 6.46-3.361 7.273-6.864z" fill="#e6e7e8"/><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="312.934" y1="89.824" x2="312.934" y2="23.688"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M315.624 60.907c0 1.43-1.27 2.793-3.09 2.581-.912-.106-1.738-.711-2.085-1.561-.788-1.934.834-3.739 2.456-3.739 1.62.001 2.719 1.215 2.719 2.719z" fill="url(#a)"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="333.545" y1="89.824" x2="333.545" y2="23.688"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M345.636 46.484V63.51h-4.05V46.407c0-3.823-2.554-7.316-6.294-8.108-5.224-1.105-9.788 2.897-9.788 7.856V63.51h-4.049V34.585h3.587v3.066c2.861-2.86 7.191-4.251 11.589-3.153 5.387 1.345 9.005 6.432 9.005 11.986z" fill="url(#b)"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="365.193" y1="89.824" x2="365.193" y2="23.688"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M354.924 50.379c.868 5.669 5.323 9.487 10.587 9.487 4.049 0 7.462-2.256 9.545-4.512l2.487 3.066c-3.355 3.876-7.868 5.554-12.033 5.554-8.793 0-14.868-7.347-14.868-15.446 0-8.331 6.421-14.405 14.463-14.405 8.33 0 14.636 6.595 14.636 16.256h-24.817zm20.422-3.414c-.81-5.091-5.149-8.967-10.24-8.967-4.686 0-9.314 3.297-10.182 8.967h20.422z" fill="url(#c)"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="392.334" y1="89.824" x2="392.334" y2="23.688"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M398.843 63.511h-4.744c-5.38 0-9.43-3.992-9.43-9.43V25.387h4.05v9.199H400l-1.157 3.587h-10.124v15.909c0 2.959 2.421 5.38 5.38 5.38h4.744v4.049z" fill="url(#d)"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="38.25" y1="77.691" x2="38.25" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M36.916 72.962l-6.517 6.517a40.175 40.175 0 0 0 7.756 1.152l7.947-7.947a31.371 31.371 0 0 1-9.186.278z" fill="url(#e)"/><linearGradient id="f" gradientUnits="userSpaceOnUse" x1="28.542" y1="77.691" x2="28.542" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M28.02 70.598l-5.832 5.833a40.003 40.003 0 0 0 6.368 2.539l6.341-6.341a32.435 32.435 0 0 1-6.877-2.031z" fill="url(#f)"/><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="20.867" y1="77.691" x2="20.867" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M20.914 66.444l-5.608 5.608a40.166 40.166 0 0 0 5.341 3.566l5.781-5.781a33.48 33.48 0 0 1-5.514-3.393z" fill="url(#g)"/><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="14.578" y1="77.691" x2="14.578" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M17.316 63.358a32.616 32.616 0 0 1-2.171-2.404l-5.574 5.574a40.37 40.37 0 0 0 4.446 4.462l5.569-5.569a33.777 33.777 0 0 1-2.27-2.063z" fill="url(#h)"/><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="25.441" y1="77.691" x2="25.441" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M23.322 23.401c-3.03 3.03-5.048 6.702-6.09 10.594L33.65 17.577c-3.97 1.084-7.448 2.944-10.328 5.824z" fill="url(#i)"/><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="44.531" y1="77.691" x2="44.531" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M58.977 28.382l-31.88 31.879a24.264 24.264 0 0 0 5.937 2.97l28.93-28.93a23.934 23.934 0 0 0-2.987-5.919z" fill="url(#j)"/><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="30.273" y1="77.691" x2="30.273" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M34.762 41.337L21.329 54.77a24.154 24.154 0 0 0 2.116 2.459 25.933 25.933 0 0 0 2.308 2.024L39.216 45.79l-4.454-4.453z" fill="url(#k)"/><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="19.821" y1="77.691" x2="19.821" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M17.193 17.272c3.561-3.561 8.031-6.117 13.111-7.609L39.642.325c-3.607.047-7.097.57-10.415 1.508L1.508 29.552A40.196 40.196 0 0 0 0 39.967l9.128-9.128a32.032 32.032 0 0 1 8.065-13.567z" fill="url(#l)"/><linearGradient id="m" gradientUnits="userSpaceOnUse" x1="9.554" y1="77.691" x2="9.554" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M10.831 54.008l-5.866 5.866a40.231 40.231 0 0 0 3.549 5.358l5.628-5.628a32.395 32.395 0 0 1-3.311-5.596z" fill="url(#m)"/><linearGradient id="n" gradientUnits="userSpaceOnUse" x1="5.875" y1="77.691" x2="5.875" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M8.205 45.374l-6.558 6.558a39.87 39.87 0 0 0 2.512 6.396l5.942-5.942c-.903-2.271-1.518-4.625-1.896-7.012z" fill="url(#n)"/><linearGradient id="o" gradientUnits="userSpaceOnUse" x1="41.198" y1="77.691" x2="41.198" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M20.337 53.41l44.57-44.57a40.296 40.296 0 0 0-5.358-3.549l-42.06 42.06a23.847 23.847 0 0 0 2.848 6.059z" fill="url(#o)"/><linearGradient id="p" gradientUnits="userSpaceOnUse" x1="4.198" y1="77.691" x2="4.198" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M8.364 33.956L.033 42.287c.117 2.675.499 5.28 1.114 7.794l6.768-6.768a33.036 33.036 0 0 1 .449-9.357z" fill="url(#p)"/><linearGradient id="q" gradientUnits="userSpaceOnUse" x1="41.589" y1="77.691" x2="41.589" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M40.052 8.141l.02 3.015 9.684-9.684A40.155 40.155 0 0 0 41.962.358l-8.539 8.539a40.655 40.655 0 0 1 6.629-.756z" fill="url(#q)"/><linearGradient id="r" gradientUnits="userSpaceOnUse" x1="75.867" y1="77.691" x2="75.867" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M71.428 47.357l8.877-8.877a40.175 40.175 0 0 0-1.152-7.756l-7.404 7.404a31.82 31.82 0 0 1-.321 9.229z" fill="url(#r)"/><linearGradient id="s" gradientUnits="userSpaceOnUse" x1="74.039" y1="77.691" x2="74.039" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M71.471 36.055l7.174-7.173a39.864 39.864 0 0 0-2.539-6.369l-6.672 6.672a32.636 32.636 0 0 1 2.037 6.87z" fill="url(#s)"/><linearGradient id="t" gradientUnits="userSpaceOnUse" x1="65.308" y1="77.691" x2="65.308" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M63.096 19.295c.425.46.8.946 1.195 1.422l6.374-6.374a40.545 40.545 0 0 0-4.462-4.446L59.95 16.15l3.146 3.145z" fill="url(#t)"/><linearGradient id="u" gradientUnits="userSpaceOnUse" x1="70.32" y1="77.691" x2="70.32" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M68.714 27.552l6.579-6.579a40.264 40.264 0 0 0-3.566-5.341l-6.38 6.38a33.41 33.41 0 0 1 3.367 5.54z" fill="url(#u)"/><linearGradient id="v" gradientUnits="userSpaceOnUse" x1="66.036" y1="77.691" x2="66.036" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M77.809 54.588L54.262 78.135a40.295 40.295 0 0 0 23.547-23.547z" fill="url(#v)"/><linearGradient id="w" gradientUnits="userSpaceOnUse" x1="37.212" y1="77.691" x2="37.212" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M40.107 16.495c-1.188.086-2.33.241-3.451.429L16.648 36.932a24.133 24.133 0 0 0 .355 8.553l41-41a39.927 39.927 0 0 0-6.396-2.512l-11.52 11.519.02 3.003z" fill="url(#w)"/><linearGradient id="x" gradientUnits="userSpaceOnUse" x1="49.038" y1="77.691" x2="49.038" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M62.504 36.114L34.855 63.763c2.759.696 5.587.878 8.363.545l19.849-19.849a23.081 23.081 0 0 0-.563-8.345z" fill="url(#x)"/><linearGradient id="y" gradientUnits="userSpaceOnUse" x1="54.332" y1="77.691" x2="54.332" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M62.558 47.32l-16.45 16.45a22.72 22.72 0 0 0 10.493-5.989c3.036-3.037 5.002-6.654 5.957-10.461z" fill="url(#y)"/><linearGradient id="z" gradientUnits="userSpaceOnUse" x1="60.406" y1="77.691" x2="60.406" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M80.348 40.789l-9.641 9.641a31.326 31.326 0 0 1-7.98 13.479c-3.981 3.981-8.644 6.641-13.555 8.055l-8.71 8.71a40.205 40.205 0 0 0 10.329-1.422l28.133-28.133a40.089 40.089 0 0 0 1.424-10.33z" fill="url(#z)"/><linearGradient id="A" gradientUnits="userSpaceOnUse" x1="14.191" y1="77.691" x2="14.191" y2="-.557"><stop offset="0" stop-color="#fff200"/><stop offset="1" stop-color="#f15a29"/></linearGradient><path d="M2.684 26.025L25.699 3.01A40.292 40.292 0 0 0 2.684 26.025z" fill="url(#A)"/></svg>
\ No newline at end of file
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index ad48b29f512..563f89919e5 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -101,9 +101,24 @@
 
 .search-button-row {
   padding-top: 20px;
-  line-height: 2.5rem;
+
   button, a {
     margin-right: 10px;
   }
+
+  .search-button-row-explore-link {
+    color: $text-muted;
+    font-size: $font-size-sm;
+    padding-right: 7rem;
+    background: url(../img/grafana_net_logo.svg);
+    background-size: 6.5rem 3rem;
+    background-repeat: no-repeat;
+    background-position: right;
+    position: relative;
+    top: 0.8rem;
+    &:hover {
+      color: $link-hover-color;
+    }
+  }
 }
 
diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss
index 970d048cce3..f473a52ec94 100644
--- a/public/sass/pages/_plugins.scss
+++ b/public/sass/pages/_plugins.scss
@@ -63,28 +63,17 @@
   }
 }
 
-// .app-edit-logo-box {
-//   padding: 1.2rem;
-//   background: $panel-bg;
-//   text-align: center;
-//   img {
-//     max-width: 7rem;
-//   }
-//   margin-right: 2rem;
-// }
-//
-// .app-edit-links {
-//   list-style: none;
-//   margin: 0 0 0 2rem;
-//
-//   li {
-//     background: $panel-bg;
-//     margin-top: 4px;
-//     padding: 0.2rem 1rem;
-//   }
-// }
-//
-// .app-edit-description {
-//   font-style: italic;
-//   margin-bottom: 1.5rem;
-// }
+.get-more-plugins-link {
+  color: $text-muted;
+  font-size: $font-size-sm;
+  padding-right: 7rem;
+  background: url(../img/grafana_net_logo.svg);
+  background-size: 6.5rem 3rem;
+  background-repeat: no-repeat;
+  background-position: right;
+  position: relative;
+  top: 1.2rem;
+  &:hover {
+    color: $link-hover-color;
+  }
+}