diff --git a/css/style.css b/css/style.css
index 13c36867..8bee07d7 100755
--- a/css/style.css
+++ b/css/style.css
@@ -132,10 +132,12 @@
 }
 
 #odf-close{
+	margin-top:0;
 	float: right;
 }
 
 #odf-invite{
+	margin-top:0;
 	float: left;
 }
 
@@ -231,6 +233,7 @@
 }
 
 #toolbar {
+	top:30px !important;
 	border-bottom: none !important;
 	padding: 5px 0 0 !important;
 }
diff --git a/js/documents.js b/js/documents.js
index 8e32fc55..c27dec69 100644
--- a/js/documents.js
+++ b/js/documents.js
@@ -20,16 +20,17 @@ var documentsMain = {
 					'  <div id="document-title"><div>' +
 					'%title%' +
 			        '  </div></div>' +
+					'  <span id="toolbar" class="claro">' +
+					'  <button id="odf-invite" class="drop">' +
+						  t('documents', 'Share') +
+					'  </button>' +
 					'  <button id="odf-close">' +
 						t('documents', 'Close') +
 					'  </button>' +
 					'  <img id="saving-document" alt=""' +
 					'   src="' + OC.imagePath('core', 'loading.gif') + '"' +
 					'  />' +
-					'  <button id="odf-invite" class="drop">' +
-						  t('documents', 'Share') +
-					'  </button>' +
-					'  <span id="toolbar" class="claro"></span>' +
+					'</span>' +
 					'</div>',
 					
 		/* Editor wrapper HTML */