Merge branch 'master' into 1271_share_zero

public/app/containers/ManageDashboards/FolderSettings.tsx

@@ -143,7 +143,7 @@ export class FolderSettings extends React.Component<IContainerProps, any> {
                   className="btn btn-success"
                   className="btn btn-success"
                   disabled={!folder.folder.canSave || !folder.folder.hasChanged}
                   disabled={!folder.folder.canSave || !folder.folder.hasChanged}
                 >
                 >
-                  <i className="fa fa-trash" /> Save
+                  <i className="fa fa-save" /> Save
                 </button>
                 </button>
                 <button className="btn btn-danger" onClick={this.delete.bind(this)} disabled={!folder.folder.canSave}>
                 <button className="btn btn-danger" onClick={this.delete.bind(this)} disabled={!folder.folder.canSave}>
                   <i className="fa fa-trash" /> Delete
                   <i className="fa fa-trash" /> Delete

public/app/features/dashboard/partials/folder_settings.html

@@ -11,8 +11,7 @@
 			</div>
 			</div>
 			<div class="gf-form-button-row">
 			<div class="gf-form-button-row">
 				<button type="submit" class="btn btn-success" ng-disabled="!ctrl.canSave || !ctrl.hasChanged">
 				<button type="submit" class="btn btn-success" ng-disabled="!ctrl.canSave || !ctrl.hasChanged">
-					<i class="fa fa-trash"></i>
-					Save
+					<i class="fa fa-save"></i>Save
 				</button>
 				</button>
 				<button class="btn btn-danger" ng-click="ctrl.delete($event)" ng-disabled="!ctrl.canSave">
 				<button class="btn btn-danger" ng-click="ctrl.delete($event)" ng-disabled="!ctrl.canSave">
 					<i class="fa fa-trash"></i>
 					<i class="fa fa-trash"></i>