diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index e252c7f6f..9376aa3f2 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1520,6 +1520,12 @@
   .module-avatar {
     background-color: $color-dark-85;
   }
+
+  &--is-blocked {
+    @include themify($themes) {
+      border-left: 4px solid themed('destructive') !important;
+    }
+  }
 }
 
 .module-conversation-list-item__unread-count {
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 5456d8aae..abcad5b3c 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -344,8 +344,6 @@ textarea {
   }
 }
 
-$session-element-border-green: 4px solid $session-color-green;
-
 /* CONVERSATION AND MESSAGES */
 
 @mixin standard-icon-button() {
diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss
index 5cee99926..4096f899a 100644
--- a/stylesheets/_session_group_panel.scss
+++ b/stylesheets/_session_group_panel.scss
@@ -132,7 +132,9 @@
             margin: 0 auto;
             width: 70%;
             padding-top: 0.5rem;
-            border-bottom: $session-element-border-green;
+            @include themify($themes) {
+              border-bottom: themed('sessionUnreadBorder');
+            }
           }
         }
       }
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 45b3160c2..7338410aa 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -48,8 +48,8 @@ $session-compose-margin: 20px;
     }
 
     &--has-unread {
-      border-left: $session-element-border-green !important;
       @include themify($themes) {
+        border-left: themed('sessionUnreadBorder');
         background: themed('conversationItemHasUnread');
       }
     }
diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss
index b2ba60f25..baef39f70 100644
--- a/stylesheets/_theme_dark.scss
+++ b/stylesheets/_theme_dark.scss
@@ -664,17 +664,8 @@
   .module-empty-state {
     color: $color-dark-55;
   }
-
   // Module: Conversation List Item
 
-  .module-conversation-list-item--has-unread {
-    border-left: 4px solid $color-loki-green;
-  }
-
-  .module-conversation-list-item--is-blocked {
-    border-left: 4px solid $session-color-danger;
-  }
-
   .module-conversation-list-item--is-selected {
     background-color: $color-dark-70;
   }
diff --git a/stylesheets/themes.scss b/stylesheets/themes.scss
index 070d34596..45abec93d 100644
--- a/stylesheets/themes.scss
+++ b/stylesheets/themes.scss
@@ -41,6 +41,7 @@ $themes: (
     conversationItemSelected: #f0f0f0,
     clickableHovered: #dfdfdf,
     sessionBorder: 1px solid #f1f1f1,
+    sessionUnreadBorder: 4px solid $accentLightTheme,
     leftpaneOverlayBackground: $white,
     // scrollbars
       scrollBarTrack: #fcfcfc,
@@ -91,6 +92,7 @@ $themes: (
     conversationItemSelected: #404040,
     clickableHovered: #414347,
     sessionBorder: 1px solid rgba($white, 0.06),
+    sessionUnreadBorder: 4px solid $accentDarkTheme,
     leftpaneOverlayBackground: linear-gradient(180deg, #171717 0%, #121212 100%),
     // scrollbars
       scrollBarTrack: #1b1b1b,