diff --git a/css/style.scss b/css/style.scss
index 8c8578ef4..c2414559e 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -269,6 +269,7 @@ input.input-inline {
 	margin: 3px;
 	display: flex;
 	align-content: center;
+	height: 34px;
 
 	> form {
 		display: flex;
diff --git a/templates/part.board.headerControls.php b/templates/part.board.headerControls.php
index 6ba94b47a..e41cd73d9 100644
--- a/templates/part.board.headerControls.php
+++ b/templates/part.board.headerControls.php
@@ -11,15 +11,15 @@
     </form>
 </div>
 
-<a class="button" ng-if="params.filter!='archive'" ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>">
+<button ng-if="params.filter!='archive'" ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>">
     <i class="icon icon-archive"></i>
     <span class="hidden-visually"><?php p($l->t('Show archived cards')); ?></span>
-</a>
-<a class="button" ng-if="params.filter=='archive'" ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>">
+</button>
+<button ng-if="params.filter=='archive'" ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>">
     <i class="icon icon-archive"></i>
     <span class="hidden-visually"><?php p($l->t('Hide archived cards')); ?></span>
-</a>
-<a class="button" ui-sref="board.detail({ id: id, tab: 0})"  title="<?php p($l->t('Board details')); ?>">
-    <i class="icon icon-details"></i>
+</button>
+<button ui-sref="board.detail({ id: id, tab: 0})"  title="<?php p($l->t('Board details')); ?>">
+    <i class="icon icon-settings"></i>
     <span class="hidden-visually"><?php p($l->t('Board details')); ?></span>
-</a>
+</button>