diff --git a/src/app/tasks/task-additional-info/task-additional-info.component.scss b/src/app/tasks/task-additional-info/task-additional-info.component.scss
index f8bd79eb7a..3cae253b1e 100644
--- a/src/app/tasks/task-additional-info/task-additional-info.component.scss
+++ b/src/app/tasks/task-additional-info/task-additional-info.component.scss
@@ -51,7 +51,9 @@
 
 .tab-content {
   padding: $s;
-
+  @include dark-theme {
+    color: $dark-theme-text-color-lighter;
+  }
   h3 {
     margin-bottom: $s;
   }
diff --git a/src/app/tasks/task/task.component.html b/src/app/tasks/task/task.component.html
index ef922843d6..c2a0ad8b3c 100644
--- a/src/app/tasks/task/task.component.html
+++ b/src/app/tasks/task/task.component.html
@@ -1,4 +1,6 @@
 <div class="inner-wrapper bg-standard"
+     [class.bg-primary]="isCurrent"
+     [class.color-contrast]="isCurrent"
      [class.isNotesOpen]="task.isNotesOpen">
 
   <div class="first-line">
diff --git a/src/app/tasks/task/task.component.scss b/src/app/tasks/task/task.component.scss
index 24e976e5ad..eea4b8254c 100644
--- a/src/app/tasks/task/task.component.scss
+++ b/src/app/tasks/task/task.component.scss
@@ -56,7 +56,7 @@ $this-first-line-min-height: 40px;
   }
 
   &.isCurrent > .inner-wrapper {
-    background: $c-accent;
+    //background: $c-accent;
     box-shadow: $this-active-shadow;
 
     .first-line {
@@ -179,7 +179,7 @@ $this-first-line-min-height: 40px;
 
   .show-notes-btn {
     mat-icon {
-      transition: $transition-standard;
+      transition: transform $transition-standard;
       backface-visibility: hidden;
     }