diff --git a/services/web/app/views/project/editor/file-tree.pug b/services/web/app/views/project/editor/file-tree.pug
index fade8e0782..7b33509c9e 100644
--- a/services/web/app/views/project/editor/file-tree.pug
+++ b/services/web/app/views/project/editor/file-tree.pug
@@ -6,21 +6,21 @@ aside.file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected'
 			tooltip-html="'"+translate('new_file').replace(' ', '<br>')+"'",
 			tooltip-placement="bottom"
 		)
-			i.fa.fa-file
+			i.fa.fa-fw.fa-file
 		a(
 			href,
 			ng-click="openNewFolderModal()",
 			tooltip-html="'"+translate('new_folder').replace(' ', '<br>')+"'",
 			tooltip-placement="bottom"
 		)
-			i.fa.fa-folder
+			i.fa.fa-fw.fa-folder
 		a(
 			href,
 			ng-click="openUploadFileModal()",
 			tooltip=translate('upload'),
 			tooltip-placement="bottom"
 		)
-			i.fa.fa-upload
+			i.fa.fa-fw.fa-upload
 
 		.toolbar-right
 			a(
@@ -30,7 +30,7 @@ aside.file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected'
 				tooltip-placement="bottom",
 				ng-show="multiSelectedCount == 0"
 			)
-				i.fa.fa-pencil
+				i.fa.fa-fw.fa-pencil
 			a(
 				href,
 				ng-click="openDeleteModalForSelected()",
@@ -38,7 +38,7 @@ aside.file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected'
 				tooltip-placement="bottom",
 				tooltip-append-to-body="true"
 			)
-				i.fa.fa-trash-o
+				i.fa.fa-fw.fa-trash-o
 
 
 	.file-tree-inner(
diff --git a/services/web/app/views/project/editor/pdf.pug b/services/web/app/views/project/editor/pdf.pug
index 0175ca2844..a87b765cf2 100644
--- a/services/web/app/views/project/editor/pdf.pug
+++ b/services/web/app/views/project/editor/pdf.pug
@@ -65,7 +65,7 @@ div.full-size.pdf(ng-controller="PdfController")
 			tooltip=translate('stop_compile')
 			tooltip-placement="bottom"
 		)
-			i.fa.fa-stop()
+			i.fa.fa-fw.fa-stop()
 		a.log-btn(
 			href
 			ng-click="toggleLogs()"
@@ -73,7 +73,7 @@ div.full-size.pdf(ng-controller="PdfController")
 			tooltip=translate('logs_and_output_files')
 			tooltip-placement="bottom"
 		)
-			i.fa.fa-file-text-o
+			i.fa.fa-fw.fa-file-text-o
 			span.label(
 				ng-show="pdf.logEntries.warnings.length + pdf.logEntries.errors.length > 0"
 				ng-class="{\
@@ -89,7 +89,7 @@ div.full-size.pdf(ng-controller="PdfController")
 			tooltip=translate('download_pdf')
 			tooltip-placement="bottom"
 		)
-			i.fa.fa-download
+			i.fa.fa-fw.fa-download
 			
 		.toolbar-right
 			span.auto-compile-status.small(
diff --git a/services/web/public/stylesheets/app/editor/pdf.less b/services/web/public/stylesheets/app/editor/pdf.less
index 6fe6d90d81..ed9f40f10a 100644
--- a/services/web/public/stylesheets/app/editor/pdf.less
+++ b/services/web/public/stylesheets/app/editor/pdf.less
@@ -172,7 +172,6 @@
 				width: 16px;
 				height: 16px;
 				border: 1px solid @gray-light;
-				margin-top: 5px;
 			}
 
 			i.full-screen {
diff --git a/services/web/public/stylesheets/app/editor/toolbar.less b/services/web/public/stylesheets/app/editor/toolbar.less
index 8370e40959..3175aa3b29 100644
--- a/services/web/public/stylesheets/app/editor/toolbar.less
+++ b/services/web/public/stylesheets/app/editor/toolbar.less
@@ -25,7 +25,9 @@
 	.toolbar-right > a:not(.btn) {
 		display: inline-block;
 		color: @toolbar-icon-btn-color;
-		padding: 0 5px;
+		padding: 4px 2px;
+		line-height: 1;
+		height: 24px;
 		border-radius: @border-radius-small;
 		&.toolbar-header-back-projects {
 			padding: 5px 10px 4px;
@@ -49,6 +51,10 @@
 		}
 	}
 
+	&.toolbar-pdf > a:not(.btn) {
+		margin-right: 3px;
+	}
+
 	.btn-full-height {
 		border: none;
 		border-radius: 0;