diff --git a/src/app/GUI/BoxesList/boolpropertywidget.cpp b/src/app/GUI/BoxesList/boolpropertywidget.cpp
index 76379be5c..330c15ff0 100644
--- a/src/app/GUI/BoxesList/boolpropertywidget.cpp
+++ b/src/app/GUI/BoxesList/boolpropertywidget.cpp
@@ -26,6 +26,7 @@
 #include "boolpropertywidget.h"
 #include "GUI/mainwindow.h"
 #include "GUI/global.h"
+#include "themesupport.h"
 
 BoolPropertyWidget::BoolPropertyWidget(QWidget *parent) :
     QWidget(parent) {
@@ -64,11 +65,11 @@ void BoolPropertyWidget::paintEvent(QPaintEvent *) {
     }
 
     p.setRenderHint(QPainter::Antialiasing);
-    p.setBrush(Qt::white);
+    p.setBrush(ThemeSupport::getThemeButtonBorderColor());
     if(mHovered) {
-        p.setPen(Qt::white);
+        p.setPen(ThemeSupport::getThemeHighlightSelectedColor());
     } else {
-        p.setPen(Qt::black);
+        p.setPen(ThemeSupport::getThemeButtonBaseColor());
     }
 
     p.drawRoundedRect(rect().adjusted(1, 1, -1, -1), 5., 5.);
@@ -80,7 +81,7 @@ void BoolPropertyWidget::paintEvent(QPaintEvent *) {
         value = mTarget->getValue();
     }
     if(value) {
-        p.setPen(QPen(Qt::black, 2.));
+        p.setPen(QPen(Qt::white, 2.));
         p.drawLine(QPoint(6, height()/2), QPoint(width()/2, height() - 6));
         p.drawLine(QPoint(width()/2, height() - 6), QPoint(width() - 6, 6));
     }
diff --git a/src/app/GUI/BoxesList/boxtargetwidget.cpp b/src/app/GUI/BoxesList/boxtargetwidget.cpp
index 447a70ed2..b913ae698 100644
--- a/src/app/GUI/BoxesList/boxtargetwidget.cpp
+++ b/src/app/GUI/BoxesList/boxtargetwidget.cpp
@@ -31,6 +31,7 @@
 #include "Properties/boxtargetproperty.h"
 #include "GUI/mainwindow.h"
 #include "Properties/emimedata.h"
+#include "themesupport.h"
 
 BoxTargetWidget::BoxTargetWidget(QWidget *parent) : QWidget(parent) {
     setAcceptDrops(true);
@@ -122,15 +123,15 @@ void BoxTargetWidget::paintEvent(QPaintEvent *) {
     QPainter p(this);
     if(mProperty->SWT_isDisabled()) p.setOpacity(.5);
     p.setRenderHint(QPainter::Antialiasing);
-    p.setBrush(Qt::white);
+    p.setBrush(ThemeSupport::getThemeButtonBorderColor());
     if(mDragging) {
-        p.setPen(Qt::white);
+        p.setPen(ThemeSupport::getThemeHighlightSelectedColor());
     } else {
-        p.setPen(Qt::black);
+        p.setPen(ThemeSupport::getThemeButtonBaseColor());
     }
     p.drawRoundedRect(rect().adjusted(1, 1, -1, -1), 5., 5.);
 
-    p.setPen(Qt::black);
+    p.setPen(Qt::white);
     const auto target = mProperty->getTarget();
     if(!target) {
         p.drawText(rect(), Qt::AlignCenter, "-none-");