diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html
index 2d753d83dd9..9c52dda36f5 100644
--- a/public/app/features/alerting/partials/notifications_list.html
+++ b/public/app/features/alerting/partials/notifications_list.html
@@ -4,8 +4,7 @@
 	<div class="page-header">
     <page-h1 model="ctrl.navModel"></page-h1>
 
-    <a href="alerting/notification/new" class="btn btn-primary pull-right">
-      <i class="fa fa-plus"></i>
+    <a href="alerting/notification/new" class="btn btn-success pull-right">
       New Channel
     </a>
   </div>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 991949d65a9..c612ab95271 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -4,8 +4,7 @@
 	<div class="page-header">
 		<page-h1 model="ctrl.navModel"></page-h1>
 
-		<button class="btn btn-primary" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
-			<i class="fa fa-plus"></i>
+		<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
 			<span>{{ctrl.addUsersBtnName}}</span>
 		</button>
 
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index d734dbc49db..ae8c505db55 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -57,7 +57,7 @@
 						</plugin-component>
 					</rebuild-on-change>
 
-					<div ng-if="ctrl.testing" class="gf-form-group">
+					<div ng-if="ctrl.testing" class="gf-form-group section">
 						<h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
 						<div class="alert-{{ctrl.testing.status}} alert" ng-show="ctrl.testing.done">
 							<div class="alert-icon">
diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html
index b8e9969d3e3..b5e01e101b4 100644
--- a/public/app/features/plugins/partials/ds_list.html
+++ b/public/app/features/plugins/partials/ds_list.html
@@ -6,7 +6,6 @@
         <page-h1 model="ctrl.navModel"></page-h1>
 
         <a class="page-header__cta btn btn-success" href="datasources/new">
-          <i class="fa fa-plus"></i>
           Add data source
         </a>
       </div>