diff --git a/css/style.css b/css/style.css
index c14572b35..1c079462a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -25,8 +25,10 @@
  * General styles
  */
 
+button,
+.button,
 .app-deck .icon {
-	display: inline-block;
+	display: flex;
 }
 
 input.input-inline {
@@ -150,6 +152,7 @@ button.button-inline:hover {
 
 .board-header-controls {
 	margin-left: auto;
+	align-items: center;
 }
 
 .board-header-controls.app-popover-menu-utils {
diff --git a/templates/part.board.headerControls.php b/templates/part.board.headerControls.php
index df05998fe..7230a6c7a 100644
--- a/templates/part.board.headerControls.php
+++ b/templates/part.board.headerControls.php
@@ -9,12 +9,12 @@
     </form>
 </div>
 
-<a class="board-action-button button" ng-if="filter!='archive'" ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>">
+<a class="button" ng-if="filter!='archive'" ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>">
     <i class="icon icon-archive"></i>
 </a>
-<a class="board-action-button button" ng-if="filter=='archive'" ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>">
+<a class="button" ng-if="filter=='archive'" ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>">
     <i class="icon icon-archive"></i>
 </a>
-<a class="board-action-button button" ui-sref="board.detail({ id: id })"  title="<?php p($l->t('Board details')); ?>">
+<a class="button" ui-sref="board.detail({ id: id })"  title="<?php p($l->t('Board details')); ?>">
     <i class="icon icon-details"></i>
 </a>