diff --git a/src/components/Board/CreateBoard.vue b/src/components/Board/CreateBoard.vue
index e51d0c8e..c2f37526 100644
--- a/src/components/Board/CreateBoard.vue
+++ b/src/components/Board/CreateBoard.vue
@@ -1,6 +1,6 @@
 <template lang="html">
   <b-button
-    variant="primary"
+    :variant="nightMode ? 'light' : 'primary'"
     v-b-modal:create-board
   >
     {{ $t('boards.create') }}
diff --git a/src/components/Board/EmptyBoard.vue b/src/components/Board/EmptyBoard.vue
index d173ecd0..be63570d 100644
--- a/src/components/Board/EmptyBoard.vue
+++ b/src/components/Board/EmptyBoard.vue
@@ -1,14 +1,31 @@
+<!-- TODO: translate -->
+
 <template lang="html">
-  <b-jumbotron class="empty-board w-100 text-center">
+  <b-jumbotron
+    class="empty-board w-100 text-center"
+    :bg-variant="nightMode ? 'dark' : ''"
+    :text-variant="nightMode ? 'white' : ''"
+    :border-variant="nightMode ? 'light' : ''"
+  >
     <p>This board is empty</p>
-    <b-button variant="primary" @click="openAddListModal">
+
+    <b-button
+      :variant="nightMode ? 'light' : 'primary'"
+      @click="openAddListModal"
+    >
       Add list
     </b-button>
   </b-jumbotron>
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+
 export default {
+  computed: {
+    ...mapGetters(['nightMode']),
+  },
+
   methods: {
     openAddListModal() {
       this.$bvModal.show('add-list');
diff --git a/src/components/Board/PlatformPicker.vue b/src/components/Board/PlatformPicker.vue
index 0156e681..ccf7885b 100644
--- a/src/components/Board/PlatformPicker.vue
+++ b/src/components/Board/PlatformPicker.vue
@@ -2,7 +2,6 @@
   <div class="platform-picker">
     <b-dropdown
       :text="dropdownLabel"
-      menu-class="platforms-dropdown"
       boundary="viewport"
     >
       <b-dropdown-item
@@ -68,9 +67,8 @@ export default {
 };
 </script>
 
-<style lang="scss" rel="stylesheet/scss">
-  .platforms-dropdown {
-    overflow: auto;
-    max-height: 300px;
+<style lang="scss" rel="stylesheet/scss" scoped>
+  .dropdown {
+    max-height: 50vh;
   }
 </style>