diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index 9ebf6d4ef67..269d4b0bada 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -29,7 +29,7 @@
 			<i class="fa fa-share-square-o"></i></a>
 		</button>
 
-		<button class="btn navbar-button navbar-button--save" ng-show="::ctrl.dashboard.meta.canSave" ng-click="ctrl.saveDashboard()" bs-tooltip="'Save dashboard <br> CTRL+S'" data-placement="bottom">
+		<button class="btn navbar-button navbar-button--save" ng-show="ctrl.dashboard.meta.canSave" ng-click="ctrl.saveDashboard()" bs-tooltip="'Save dashboard <br> CTRL+S'" data-placement="bottom">
 			<i class="fa fa-save"></i>
 		</button>
 
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 5518983ab2a..e68b771bcb2 100644
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/settings/settings.ts
@@ -69,8 +69,8 @@ export class SettingsCtrl {
 
     if (this.dashboard.meta.canMakeEditable) {
       this.sections.push({
-        title: 'Make Editable',
-        icon: 'fa fa-fw fa-edit',
+        title: 'General',
+        icon: 'gicon gicon-preferences',
         id: 'make_editable',
       });
     }
@@ -137,12 +137,6 @@ export class SettingsCtrl {
 
     const currentSection = _.find(this.sections, { id: this.viewId });
     this.$location.url(currentSection.url);
-    this.onRouteUpdated();
-
-    // Force dashboard reload after saving to update view
-    appEvents.on('dashboard-saved', () => {
-      window.location.href = window.location.href;
-    });
   }
 
   deleteDashboard() {