diff --git a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
index 8cc26c4a1f2..e5fb0da71fc 100644
--- a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
@@ -76,9 +76,7 @@ export class DashboardPermissions extends PureComponent<Props, State> {
               </div>
             </Tooltip>
             <div className="page-action-bar__spacer" />
-            <button className="btn btn-primary pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>
-              <i className="fa fa-plus" /> Add Permission
-            </button>
+            <button className="btn btn-primary pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>Add Permission</button>
           </div>
         </div>
         <SlideDown in={isAdding}>
diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx
index f8c59d82130..f564991f291 100644
--- a/public/app/features/folders/FolderPermissions.tsx
+++ b/public/app/features/folders/FolderPermissions.tsx
@@ -73,7 +73,13 @@ export class FolderPermissions extends PureComponent<Props, State> {
     const { isAdding } = this.state;
 
     if (folder.id === 0) {
-      return <Page navModel={navModel}><Page.Contents isLoading={true}><span></span></Page.Contents></Page>;
+      return (
+        <Page navModel={navModel}>
+          <Page.Contents isLoading={true}>
+            <span />
+          </Page.Contents>
+        </Page>
+      );
     }
 
     const folderInfo = { title: folder.title, url: folder.url, id: folder.id };
@@ -90,7 +96,7 @@ export class FolderPermissions extends PureComponent<Props, State> {
             </Tooltip>
             <div className="page-action-bar__spacer" />
             <button className="btn btn-primary pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>
-              <i className="fa fa-plus" /> Add Permission
+              Add Permission
             </button>
           </div>
           <SlideDown in={isAdding}>