diff --git a/src/components/Board/AddList.vue b/src/components/Board/AddList.vue
index 37887dc5..ffd99601 100644
--- a/src/components/Board/AddList.vue
+++ b/src/components/Board/AddList.vue
@@ -3,10 +3,11 @@
     v-b-modal="modalId"
     :title="$t('board.addList.title')"
     size="sm"
+    variant="light"
     v-b-tooltip.hover.left
     ref="addList"
   >
-    <icon name="plus" white />
+    <icon name="plus" />
 
     <b-modal
       :id="modalId"
@@ -19,6 +20,21 @@
       :footer-text-variant="nightMode ? 'white' : null"
       @show="reset"
     >
+      <template v-slot:modal-header="{ close }">
+        <modal-header
+          :title="$t('board.addList.title')"
+          header-class="border-0"
+        >
+          <b-button
+            variant="light"
+            size="sm"
+            @click="close"
+          >
+            <icon name="x" />
+          </b-button>
+        </modal-header>
+      </template>
+
       <form ref="addListForm" @submit.stop.prevent="submit">
         <b-form-input
           autofocus
diff --git a/src/components/Settings/BoardSettings.vue b/src/components/Settings/BoardSettings.vue
index d57a34be..212a0773 100644
--- a/src/components/Settings/BoardSettings.vue
+++ b/src/components/Settings/BoardSettings.vue
@@ -4,6 +4,7 @@
     v-b-tooltip.hover.left
     title="Board settings"
     class="mt-3"
+    variant="primary"
     size="sm"
     ref="addList"
   >
@@ -22,6 +23,21 @@
       @show="init"
       @hide="hide"
     >
+      <template v-slot:modal-header="{ close }">
+        <modal-header
+          title="Board settings"
+          header-class="border-0"
+        >
+          <b-button
+            variant="light"
+            size="sm"
+            @click="close"
+          >
+            <icon name="x" />
+          </b-button>
+        </modal-header>
+      </template>
+
       <form ref="boardSettingsForm" @submit.stop.prevent="submit">
         <b-form-group
           label="Board name"