diff --git a/services/web/app/views/project/editor/header.jade b/services/web/app/views/project/editor/header.jade
index 4b12c95ec8..914448fe05 100644
--- a/services/web/app/views/project/editor/header.jade
+++ b/services/web/app/views/project/editor/header.jade
@@ -134,17 +134,17 @@ div(sixpack-switch="editor-header")
 		ng-hide="state.loading"
 		sixpack-when="labels"
 	)
-		a.btn.btn-full-height(
-			href,
-			ng-click="ui.leftMenuShown = true"
-		)
-			i.fa.fa-fw.fa-bars
-			p.toolbar-label Menu
-		a(
-			href="/project"
-		)
-			i.fa.fa-fw.fa-level-up
-			p.toolbar-label Back
+		.toolbar-left
+			a.btn.btn-full-height(
+				href,
+				ng-click="ui.leftMenuShown = true"
+			)
+				i.fa.fa-fw.fa-bars
+				p.toolbar-label Menu
+			a(
+				href="/project"
+			)
+				i.fa.fa-fw.fa-level-up
 
 		span(ng-controller="PdfViewToggleController")
 			a(
@@ -234,7 +234,7 @@ div(sixpack-switch="editor-header")
 				ng-class="{ active: (ui.view == 'track-changes') }"
 			)
 				i.fa.fa-fw.fa-history
-				p.toolbar-label Changes
+				p.toolbar-label History
 			a.btn.btn-full-height(
 				href,
 				ng-class="{ active: ui.chatOpen }",
diff --git a/services/web/public/stylesheets/app/editor/toolbar.less b/services/web/public/stylesheets/app/editor/toolbar.less
index a05747a37a..2f088cf515 100644
--- a/services/web/public/stylesheets/app/editor/toolbar.less
+++ b/services/web/public/stylesheets/app/editor/toolbar.less
@@ -17,7 +17,9 @@
 		outline: none;
 	}
 
-	> a:not(.btn), .toolbar-right > a:not(.btn) {
+	> a:not(.btn),
+	.toolbar-left > a:not(.btn),
+	.toolbar-right > a:not(.btn) {
 		display: inline-block;
 		color: @gray-light;
 		padding: 4px 10px 5px;
@@ -64,6 +66,11 @@
 		}
 	}
 
+	.toolbar-left {
+		float: left;
+		text-align: center;
+	}
+
 	.toolbar-right {
 		float: right;
 		.btn-full-height {
@@ -131,26 +138,14 @@
 }
 
 .toolbar.toolbar-with-labels {
-	height: 50px;
-
-	.btn-full-height {
-		padding: 0 10px;
-	}
-
-	& ~ #ide-body {
-		top: 50px;
-	}
-
-	.project-name .name {
-		padding: 12px;
-	}
 }
 
 .toolbar-label {
-	margin: 0;
-	font-size: 0.6em;
+	display: inline-block;
+	margin: 0 4px;
+	font-size: 12px;
 	font-weight: normal;
-	min-width: 35px;
+	vertical-align: middle;
 }
 
 .editor-dark {