diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs
index faa4d54a..efce6144 100644
--- a/gui/app/pods/folder/index/template.hbs
+++ b/gui/app/pods/folder/index/template.hbs
@@ -4,6 +4,7 @@
 		permissions=model.permissions tab=tab onAddSpace=(action 'onAddSpace')}}
 	{{/layout/zone-sidebar}}
 	{{#layout/zone-content}}
+
 		{{folder/folder-heading folder=model.folder permissions=model.permissions}}
 
 		{{folder/folder-toolbar folders=model.folders folder=model.folder
@@ -11,6 +12,8 @@
 			onDeleteDocument=(action 'onDeleteDocument') onMoveDocument=(action 'onMoveDocument')
 			onDeleteSpace=(action 'onDeleteSpace')}}
 
+		<div class="margin-bottom-20 clearfix" />
+
 		{{folder/documents-list documents=model.documents folders=model.folders folder=model.folder templates=model.templates
 			permissions=model.permissions selectedDocuments=(mut selectedDocuments)
 			onDeleteSpace=(action 'onDeleteSpace') onImport=(action 'onImport')}}
diff --git a/gui/app/templates/components/folder/folder-heading.hbs b/gui/app/templates/components/folder/folder-heading.hbs
index ddf43013..fc0bbcfa 100644
--- a/gui/app/templates/components/folder/folder-heading.hbs
+++ b/gui/app/templates/components/folder/folder-heading.hbs
@@ -1,21 +1,23 @@
-{{#unless editMode}}
-	<div class="folder-heading {{if permissions.spaceOwner 'cursor-pointer'}}" onclick={{if permissions.spaceOwner (action 'toggleEdit')}}>
-		<h1 class="folder-title">{{folder.name}}</h1>
-	</div>
-{{else}}
-	<form {{action "onSave" on="submit"}}>
-		<div class="edit-folder-heading">
-			<div class="input-inline input-transparent edit-folder-title">
-				{{focus-input id="folder-name" type="text" value=folderName class=(if hasNameError 'error-inline') placeholder="Name" autocomplete="off"}}
-			</div>
-			<div>
-				<button type="submit" class="round-button-mono" {{action 'onSave'}}>
-					<i class="material-icons color-green">check</i>
-				</button>
-				<div class="round-button-mono" {{action 'onCancel'}}>
-					<i class="material-icons color-gray">close</i>
+<div class="pull-left width-80">
+	{{#unless editMode}}
+		<div class="folder-heading {{if permissions.spaceOwner 'cursor-pointer'}}" onclick={{if permissions.spaceOwner (action 'toggleEdit')}}>
+			<h1 class="folder-title">{{folder.name}}</h1>
+		</div>
+	{{else}}
+		<form {{action "onSave" on="submit"}}>
+			<div class="edit-folder-heading">
+				<div class="input-inline input-transparent edit-folder-title">
+					{{focus-input id="folder-name" type="text" value=folderName class=(if hasNameError 'error-inline') placeholder="Name" autocomplete="off"}}
+				</div>
+				<div>
+					<button type="submit" class="round-button-mono" {{action 'onSave'}}>
+						<i class="material-icons color-green">check</i>
+					</button>
+					<div class="round-button-mono" {{action 'onCancel'}}>
+						<i class="material-icons color-gray">close</i>
+					</div>
 				</div>
 			</div>
-		</div>
-	</form>
-{{/unless}}
+		</form>
+	{{/unless}}
+</div>
\ No newline at end of file
diff --git a/gui/app/templates/components/folder/folder-toolbar.hbs b/gui/app/templates/components/folder/folder-toolbar.hbs
index 7a8f68c9..926d2f18 100644
--- a/gui/app/templates/components/folder/folder-toolbar.hbs
+++ b/gui/app/templates/components/folder/folder-toolbar.hbs
@@ -5,6 +5,16 @@
 			<div class="round-button button-blue" id="move-documents-button" data-tooltip="Move documents" data-tooltip-position="top center">
 				<i class="material-icons">folder</i>
 			</div>
+		{{/if}}
+
+		{{#if permissions.documentDelete}}
+			<div class="button-gap"></div>
+			<div class="round-button button-red" id="delete-documents-button" data-tooltip="Delete documents" data-tooltip-position="top center">
+				<i class="material-icons">delete</i>
+			</div>
+		{{/if}}
+
+		{{#if permissions.documentMove}}
 			{{#dropdown-dialog target="move-documents-button" position="bottom right" button="Move" color="flat-blue" onAction=(action 'moveDocuments')}}
 				<p class="heading">Select destination space</p>
 				<ul class="move-document-options">
@@ -23,10 +33,6 @@
 		{{/if}}
 
 		{{#if permissions.documentDelete}}
-			<div class="button-gap"></div>
-			<div class="round-button button-red" id="delete-documents-button" data-tooltip="Delete documents" data-tooltip-position="top center">
-				<i class="material-icons">delete</i>
-			</div>
 			{{#dropdown-dialog target="delete-documents-button" position="bottom right" button="Delete" color="flat-red" onAction=(action 'deleteDocuments')}}
 				<p>Are you sure you want to delete selected documents?</p>
 				<p>There is no undo!</p>
@@ -84,5 +90,3 @@
 	{{/if}}
 </div>
 
-<div class="margin-top-35" />
-<div class="margin-bottom-20 clearfix" />