diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 1b4be9ef..080ab4f2 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -342,18 +342,10 @@ export default class {
     /**
      * Wait for content to load
      * @param {String} content_id
-     * @return {Promise}
+     * @return {Promise => Content}
      */
     static waitForContent(content_id) {
-        return new Promise((resolve, reject) => {
-            const check = () => {
-                const content = this.getContentById(content_id);
-                if (content) return resolve(content);
-
-                setTimeout(check, 100);
-            };
-            check();
-        });
+        return Utils.until(() => this.getContentById(content_id), 100);
     }
 
 }
diff --git a/client/src/styles/partials/bdsettings/card.scss b/client/src/styles/partials/bdsettings/card.scss
index e997aa5f..aad5ac82 100644
--- a/client/src/styles/partials/bdsettings/card.scss
+++ b/client/src/styles/partials/bdsettings/card.scss
@@ -19,6 +19,7 @@
         .bd-card-icon {
             width: 30px;
             height: 30px;
+            background-size: cover;
         }
 
         > span {
diff --git a/client/src/styles/partials/generic/buttons.scss b/client/src/styles/partials/generic/buttons.scss
index ceb9d6fc..cffdf1ce 100644
--- a/client/src/styles/partials/generic/buttons.scss
+++ b/client/src/styles/partials/generic/buttons.scss
@@ -61,13 +61,14 @@
 
     .bd-button,
     .bd-material-button {
-
         &:first-of-type {
-            border-radius: 6px 0 0 6px;
+            border-top-left-radius: 6px;
+            border-bottom-left-radius: 6px;
         }
 
         &:last-of-type {
-            border-radius: 0 6px 6px 0;
+            border-top-right-radius: 6px;
+            border-bottom-right-radius: 6px;
         }
 
         &:not(:last-of-type) {
diff --git a/client/src/ui/components/bd/setting/File.vue b/client/src/ui/components/bd/setting/File.vue
index b0217971..4ccec7f1 100644
--- a/client/src/ui/components/bd/setting/File.vue
+++ b/client/src/ui/components/bd/setting/File.vue
@@ -29,7 +29,7 @@
 
 <script>
     import { shell } from 'electron';
-    import { ClientIPC } from 'common';
+    import { Utils, ClientIPC } from 'common';
     import { MiOpenInNew, MiMinus } from '../../common';
     import path from 'path';
 
@@ -51,7 +51,7 @@
             },
             removeItem(file_path) {
                 if (this.setting.disabled) return;
-                this.setting = this.setting.value.filter(f => f !== file_path);
+                Utils.removeFromArray(this.setting.value, file_path);
             }
         }
     }