diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html
index b40aed6faab..792ac38680b 100644
--- a/public/app/features/admin/partials/orgs.html
+++ b/public/app/features/admin/partials/orgs.html
@@ -4,8 +4,7 @@
   <div class="page-action-bar">
     <div class="page-action-bar__spacer"></div>
     <a class="page-header__cta btn btn-primary" href="org/new">
-      <i class="fa fa-plus"></i>
-      New Org
+      New org
     </a>
   </div>
 
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 08704dc0459..dd8c8c2c2ad 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -8,8 +8,7 @@
     </label>
     <div class="page-action-bar__spacer"></div>
     <a class="btn btn-primary" href="admin/users/create">
-      <i class="fa fa-plus"></i>
-      Add new user
+      New user
     </a>
   </div>
 
diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html
index ce4fea9ff49..66afa2513fa 100644
--- a/public/app/features/alerting/partials/notifications_list.html
+++ b/public/app/features/alerting/partials/notifications_list.html
@@ -8,7 +8,7 @@
       </div>
 
       <a href="alerting/notification/new" class="btn btn-primary">
-        New Channel
+        New channel
       </a>
     </div>
 
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 2627b1a6862..5eec9a078e0 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -200,7 +200,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
 
           <div className="page-action-bar__spacer" />
           <button className="btn btn-primary pull-right" onClick={this.onToggleAdding} disabled={isAdding}>
-            Add API Key
+            Add API key
           </button>
         </div>
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/template.html b/public/app/features/dashboard/components/DashboardSettings/template.html
index 99edc035bd5..4db390dc47a 100644
--- a/public/app/features/dashboard/components/DashboardSettings/template.html
+++ b/public/app/features/dashboard/components/DashboardSettings/template.html
@@ -11,14 +11,12 @@
 
 	<div class="dashboard-settings__aside-actions">
     <button class="btn btn-primary" ng-click="ctrl.saveDashboard()" ng-show="ctrl.canSave">
-			<i class="fa fa-save"></i> Save
+			Save
 		</button>
 		<button class="btn btn-inverse" ng-click="ctrl.openSaveAsModal()" ng-show="ctrl.canSaveAs">
-			<i class="fa fa-copy"></i>
 			Save As...
 		</button>
 		<button class="btn btn-danger" ng-click="ctrl.deleteDashboard()" ng-show="ctrl.canDelete">
-			<i class="fa fa-trash"></i>
 			Delete
 		</button>
 	</div>
@@ -101,7 +99,7 @@
 
   <div class="gf-form-button-row">
     <button class="btn btn-primary" ng-click="ctrl.saveDashboardJson()" ng-show="ctrl.canSave">
-      <i class="fa fa-save"></i> Save Changes
+      Save Changes
     </button>
   </div>
 </div>
diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx
index 322ca9e19aa..a4c2ee0f2d3 100644
--- a/public/app/features/folders/FolderSettingsPage.tsx
+++ b/public/app/features/folders/FolderSettingsPage.tsx
@@ -82,10 +82,10 @@ export class FolderSettingsPage extends PureComponent<Props, State> {
               </div>
               <div className="gf-form-button-row">
                 <button type="submit" className="btn btn-primary" disabled={!folder.canSave || !folder.hasChanged}>
-                  <i className="fa fa-save" /> Save
+                  Save
                 </button>
                 <button className="btn btn-danger" onClick={this.onDelete} disabled={!folder.canSave}>
-                  <i className="fa fa-trash" /> Delete
+                  Delete
                 </button>
               </div>
             </form>
diff --git a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
index cd6cdf4a032..e20273655b1 100644
--- a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
+++ b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
@@ -42,20 +42,14 @@ exports[`Render should enable save button 1`] = `
             disabled={false}
             type="submit"
           >
-            <i
-              className="fa fa-save"
-            />
-             Save
+            Save
           </button>
           <button
             className="btn btn-danger"
             disabled={false}
             onClick={[Function]}
           >
-            <i
-              className="fa fa-trash"
-            />
-             Delete
+            Delete
           </button>
         </div>
       </form>
@@ -106,20 +100,14 @@ exports[`Render should render component 1`] = `
             disabled={true}
             type="submit"
           >
-            <i
-              className="fa fa-save"
-            />
-             Save
+            Save
           </button>
           <button
             className="btn btn-danger"
             disabled={false}
             onClick={[Function]}
           >
-            <i
-              className="fa fa-trash"
-            />
-             Delete
+            Delete
           </button>
         </div>
       </form>
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index 22e41ac7104..64b26e86e5b 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -5,7 +5,7 @@
     <div class="page-action-bar">
       <div class="page-action-bar__spacer"></div>
       <a class="btn btn-primary pull-right" href="playlists/create">
-        New Playlist
+        New playlist
       </a>
     </div>
 
diff --git a/public/app/features/teams/TeamMembers.tsx b/public/app/features/teams/TeamMembers.tsx
index ab8d43cb1a3..f07097759dd 100644
--- a/public/app/features/teams/TeamMembers.tsx
+++ b/public/app/features/teams/TeamMembers.tsx
@@ -104,7 +104,7 @@ export class TeamMembers extends PureComponent<Props, State> {
           <div className="page-action-bar__spacer" />
 
           <button className="btn btn-primary pull-right" onClick={this.onToggleAdding} disabled={isAdding}>
-            <i className="fa fa-plus" /> Add a member
+            Add member
           </button>
         </div>
 
@@ -113,7 +113,7 @@ export class TeamMembers extends PureComponent<Props, State> {
             <button className="cta-form__close btn btn-transparent" onClick={this.onToggleAdding}>
               <i className="fa fa-close" />
             </button>
-            <h5>Add Team Member</h5>
+            <h5>Add team member</h5>
             <div className="gf-form-inline">
               <UserPicker onSelected={this.onUserSelected} className="min-width-30" />
               {this.state.newTeamMember && (
diff --git a/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
index 536102cb880..c5339cc7f6d 100644
--- a/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
@@ -31,10 +31,7 @@ exports[`Render should render component 1`] = `
       disabled={false}
       onClick={[Function]}
     >
-      <i
-        className="fa fa-plus"
-      />
-       Add a member
+      Add member
     </button>
   </div>
   <Component
@@ -52,7 +49,7 @@ exports[`Render should render component 1`] = `
         />
       </button>
       <h5>
-        Add Team Member
+        Add team member
       </h5>
       <div
         className="gf-form-inline"
@@ -125,10 +122,7 @@ exports[`Render should render team members 1`] = `
       disabled={false}
       onClick={[Function]}
     >
-      <i
-        className="fa fa-plus"
-      />
-       Add a member
+      Add member
     </button>
   </div>
   <Component
@@ -146,7 +140,7 @@ exports[`Render should render team members 1`] = `
         />
       </button>
       <h5>
-        Add Team Member
+        Add team member
       </h5>
       <div
         className="gf-form-inline"
@@ -345,10 +339,7 @@ exports[`Render should render team members when sync enabled 1`] = `
       disabled={false}
       onClick={[Function]}
     >
-      <i
-        className="fa fa-plus"
-      />
-       Add a member
+      Add member
     </button>
   </div>
   <Component
@@ -366,7 +357,7 @@ exports[`Render should render team members when sync enabled 1`] = `
         />
       </button>
       <h5>
-        Add Team Member
+        Add team member
       </h5>
       <div
         className="gf-form-inline"