diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index befbb3a9d..281e693ab 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -176,8 +176,9 @@ BlazeComponent.extendComponent({
     return ret;
   },
   isBackgroundImage() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return currentBoard.backgroundImageURL === $(".attachment-thumbnail-img").attr("src");
+    //const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    //return currentBoard.backgroundImageURL === $(".attachment-thumbnail-img").attr("src");
+    return false;
   },
   events() {
     return [
@@ -196,9 +197,7 @@ BlazeComponent.extendComponent({
           Popup.back();
         },
         'click .js-add-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          currentBoard.setBackgroundImageURL($(".attachment-thumbnail-img").attr("src"));
-          Utils.setBackgroundImage();
+          Utils.setBackgroundImage($(".attachment-thumbnail-img").attr("src"));
           Popup.back();
           event.preventDefault();
         },
@@ -208,6 +207,7 @@ BlazeComponent.extendComponent({
           Utils.setBackgroundImage();
           Popup.back();
           Utils.reload();
+          event.preventDefault();
         },
         'click .js-move-storage-fs'() {
           Meteor.call('moveAttachmentToStorage', this.data()._id, "fs");
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 4fa0900f4..e611fdbc4 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -152,7 +152,7 @@ template(name="boardChangeBackgroundImagePopup")
     br
     hr
     div
-      button.js-remove-background.negate.wide.card-details-red.right {{_ 'unset-color'}}
+      button.js-remove-background-image.negate.wide.card-details-red.right {{_ 'unset-color'}}
 
 template(name="boardInfoOnMyBoardsPopup")
   form.board-info-on-my-boards
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index 6a205eecb..9bd40452c 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -691,6 +691,14 @@ BlazeComponent.extendComponent({
           Popup.back();
           event.preventDefault();
         },
+        'click .js-remove-background-image'() {
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          currentBoard.setBackgroundImageURL("");
+          Utils.setBackgroundImage("");
+          Popup.back();
+          //Utils.reload();
+          event.preventDefault();
+        },
       },
     ];
   },
diff --git a/client/lib/utils.js b/client/lib/utils.js
index 021ce640f..b8ce08065 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -1,8 +1,15 @@
 Utils = {
-  setBackgroundImage() {
+  setBackgroundImage(url) {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (currentBoard.backgroundImageURL) {
-      $(".board-wrapper,.board-wrapper .board-canvas").css({"background":"url(" + currentBoard.backgroundImageURL + ")","background-size":"cover"});
+    if (url !== currentBoard.backgroundImageURL) {
+      if (url) {
+        currentBoard.setBackgroundImageURL(url);
+      } else {
+        currentBoard.setBackgroundImageURL("");
+      }
+    }
+    if (url) {
+      $(".board-wrapper,.board-wrapper .board-canvas").css({"background":"url(" + url + ")","background-size":"cover"});
       $(".minicard").css({"padding":"8px 8px 2px","box-shadow":"0 2px 3px rgba(0, 0, 0, 0.37)"});
       $(".minicard .minicard-members,.minicard .minicard-assignees,.minicard .minicard-creator").css({"margin": "12px -0px 0px 5px"});
       $(".list").css({"margin":"8px","height":"fit-content","border-left":"none","border-radius":"3px"});
@@ -13,22 +20,8 @@ Utils = {
       $("#header #header-main-bar .board-header-btn").css({"padding":"2px","margin":"0 5px"});
       $(".swimlane").css({"background":"none"});
       $(".board-canvas").css({"background":"none"});
-    }
-  },
-  unsetBackgroundImage() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (currentBoard.backgroundImageURL) {
-      $(".board-wrapper,.board-wrapper .board-canvas").css({"background":"none","background-size":"auto"});
-      $(".minicard").css({"padding":"6px 8px 2px","box-shadow":"0 1px 2px rgba(0,0,0,0.15)"});
-      $(".minicard .minicard-members,.minicard .minicard-assignees,.minicard .minicard-creator").css({"margin": "12px -0px 4px 5px"});
-      $(".list").css({"margin":"0px","height":"fit-content","border-left":"none","border-radius":"0px"});
-      $(".list-header-add").css({"padding":"10px 12px 4px"});
-      $(".list-header").css({"padding":"15px 12px 4px","border-top-left-radius":"3px","border-top-right-radius":"3px"});
-      $(".list-header .list-header-name").css({"font-size":"15px","line-height":"15px"});
-      $(".list-header .list-header-menu").css({"padding":"none"});
-      $("#header #header-main-bar .board-header-btn").css({"padding":"2px","margin":"0 5px"});
-      $(".swimlane").css({"background":"none"});
-      $(".board-canvas").css({"background":"none"});
+    } else {
+      $(".board-wrapper,.board-wrapper .board-canvas").css({"background": currentBoard.background.color});
     }
   },
   /** returns the current board id