diff --git a/resources/sass/_buttons.scss b/resources/sass/_buttons.scss
index 83d17352d..fb3af06e8 100644
--- a/resources/sass/_buttons.scss
+++ b/resources/sass/_buttons.scss
@@ -48,9 +48,10 @@ button {
 
 .button.outline {
   background-color: transparent;
-  @include lightDark(color, #666, #aaa);
+  @include lightDark(color, #666, #AAA);
   fill: currentColor;
-  border: 1px solid #CCC;
+  border: 1px solid;
+  @include lightDark(border-color, #CCC, #666);
   &:hover, &:focus, &:active {
     border: 1px solid #CCC;
     box-shadow: none;
@@ -122,7 +123,7 @@ button {
 .icon-button:hover {
   background-color: rgba(0, 0, 0, 0.05);
   border-radius: 4px;
-  border-color: #DDD;
+  @include lightDark(border-color, #DDD, #444);
   cursor: pointer;
 }
 
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 2aba3bd74..9fdd5a611 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -802,13 +802,14 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1);
 }
 .content-permissions-row {
-  border: 1.5px solid #E2E2E2;
+  border: 1.5px solid;
+  @include lightDark(border-color, #E2E2E2, #444);
   border-bottom-width: 0;
   label {
     padding-bottom: 0;
   }
   &:hover {
-    background-color: #F2F2F2;
+    @include lightDark(background-color, #F2F2F2, #333);
   }
 }
 .content-permissions-row:first-child {