diff --git a/css/style.css b/css/style.css
index 0638d2dd3..869219954 100644
--- a/css/style.css
+++ b/css/style.css
@@ -126,21 +126,26 @@ button:hover {
 	position: relative;
 	z-index: 120;
 	height: 44px;
+	display: flex;
+	align-items: center;
 }
 
 #board-header > * {
 	font-size: 14pt;
-	padding: 7px;
-	margin: 7px;
-	float: left;
 }
 
-#board-header > a {
-	background: url('/core/img/breadcrumb.svg?v=1');
-	background-repeat: no-repeat;
-	background-position: right center;
-	background-size: auto 24px;
-	padding-right: 24px;
+#board-header > h1 {
+	white-space: nowrap;
+}
+
+#board-header #home {
+	position: relative;
+	padding: 0px 12px;
+}
+
+#board-header #home a{
+	position: relative;
+	padding: 0px;
 }
 
 #board-actions {
@@ -161,6 +166,18 @@ button:hover {
 	cursor: pointer;
 }
 
+#board-header-controls {
+	display: flex;
+	align-items: center;
+	position: relative;
+}
+
+#board-header-controls .board-action-button,
+#board-header-controls .board-action-button * {
+	display: flex;
+	align-items: center;
+}
+
 .filter-select {
 	position: absolute;
 	right: auto;
@@ -192,22 +209,19 @@ button:hover {
 	background-color: transparent;
 }
 
-#board-header > .board-action-button {
-	float: right;
-}
-
 #stack-add {
 	background-color: rgba(240,240,240,.9);
 	border-radius: 3px;
-	padding: 0;
+	margin-right: 12px;
+}
+
+#stack-add > form {
+	display: flex;
 }
 
 #stack-add input {
-	padding: 7px;
-	margin: 0px;
+	padding: 4px 5px;
 	border: 0px none transparent;
-	display: table-cell;
-	vertical-align: middle;
 	min-height: initial;
 	background-color: rgba(240,240,240,.9);
 }
@@ -224,11 +238,6 @@ button:hover {
 	box-shadow:none;
 }
 
-#stack-add button {
-	display: table-cell;
-    vertical-align: middle;
-}
-
 .stack {
 	width: 320px;
 	margin-right: 10px;
@@ -321,7 +330,7 @@ button:hover {
 	opacity: 1;
 }
 
-.card .card-controls .space {
+.space {
 	width: 100%;
 	min-height: 16px;
 }
@@ -845,17 +854,11 @@ button:hover {
 
 @media (max-width: 480px) {
 	/* hide board actions on mobile */
-	#board-actions {
+	#board-header-controls {
 		display: none !important;
 	}
 }
 
-@media only screen and (max-width: 768px) {
-	#board-header h1 {
-		margin-left: 50px;
-	}
-}
-
 /**
  * Markdown rendering
  */
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 0cbaeea19..bc661d2b3 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -5,36 +5,39 @@
 		<p>{{ statusservice.text }}</p></div>
 </div>
 <div id="board-header">
-	<a href="#" title="<?php p($l->t('All Boards')); ?>">
-		<i class="icon icon-home"></i>
-	</a>
+	<div id="home" class="crumb svg last">
+		<a href="#" title="<?php p($l->t('All Boards')); ?>">
+			<img class="svg" src="../../../core/img/places/home.svg" alt="Home">
+		</a>
+	</div>
 	<h1 class="title" style="border-bottom: 2px solid #{{boardservice.getCurrent().color }};">
 		{{ boardservice.getCurrent().title }}
 	</h1>
-	<div class="board-action-button">
-		<a ui-sref="board.detail({ id: id })" title="<?php p($l->t('Board details')); ?>">
-			<i class="icon icon-details"></i>
-		</a>
-	</div>
-	<div class="board-action-button" ng-if="filter!='archive'">
-		<a ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>">
-			<i class="icon icon-archive"></i>
-		</a>
-	</div>
-	<div class="board-action-button" ng-if="filter=='archive'">
-		<a ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>">
-			<i class="icon icon-archive"></i>
-		</a>
-	</div>
-	<div id="stack-add" class="board-action-button" ng-if="boardservice.canEdit() && checkCanEdit()">
-		<form class="ng-pristine ng-valid" ng-submit="createStack()">
-			<input type="text" placeholder="Add a new stack"
-				ng-focus="status.addStack=true"
-				ng-blur="status.addStack=false"
-				ng-model="newStack.title" required
-				maxlength="100" />
-			<button class="icon icon-add" style="opacity: {{status.addStack ? 1: 0.5}};" type="submit"></button>
-		</form>
+	<div class="space"></div>
+	<div id="board-header-controls">
+		<div id="stack-add" ng-if="boardservice.canEdit() && checkCanEdit()">
+			<form class="ng-pristine ng-valid" ng-submit="createStack()">
+				<input type="text" placeholder="Add a new stack"
+					ng-focus="status.addStack=true"
+					ng-blur="status.addStack=false"
+					ng-model="newStack.title" required
+					maxlength="100" />
+				<button class="icon icon-add" style="opacity: {{status.addStack ? 1: 0.5}};" type="submit"></button>
+			</form>
+		</div>
+		<div class="board-action-button button" ng-if="filter!='archive'">
+			<a ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>"><span class="icon icon-archive"></span></a>
+		</div>
+		<div class="board-action-button button" ng-if="filter=='archive'">
+			<a ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>">
+				<i class="icon icon-archive"></i>
+			</a>
+		</div>
+		<div class="board-action-button button">
+			<a ui-sref="board.detail({ id: id })"  title="<?php p($l->t('Board details')); ?>">
+				<i class="icon icon-details"></i>
+			</a>
+		</div>
 	</div>
 </div>