diff --git a/public/app/core/services/search_srv.ts b/public/app/core/services/search_srv.ts
index 2151e2063a9..ae8c7d61cc7 100644
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -74,7 +74,7 @@ export class SearchSrv {
           score: -2,
           expanded: this.starredIsOpen,
           toggle: this.toggleStarred.bind(this),
-          items: this.transformToViewModel(result),
+          items: result.map(this.transformToViewModel),
         };
       }
     });
diff --git a/public/app/features/dashboard/partials/dashboardList.html b/public/app/features/dashboard/partials/dashboardList.html
index c9822efe561..449544aedc4 100644
--- a/public/app/features/dashboard/partials/dashboardList.html
+++ b/public/app/features/dashboard/partials/dashboardList.html
@@ -4,13 +4,13 @@
     <div class="page-header">
       <h1>Dashboards</h1>
 
-      <a class="btn btn-success" href="/dashboard/new">
-        <i class="fa fa-plus"></i>
-        Create Dashboard
+      <a class="btn btn-inverse" href="/dashboard/new">
+        <i class="gicon gicon-dashboard-new"></i>
+        Dashboard
       </a>
-      <a class="btn btn-success" href="/dashboard/new/?editview=new-folder">
-        <i class="fa fa-plus"></i>
-        Create Folder
+      <a class="btn btn-inverse" href="/dashboard/new/?editview=new-folder">
+        <i class="gicon gicon-folder-new"></i>
+        Folder
       </a>
     </div>
     <div class="gf-form-group">