diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index f95700856..d05e514c3 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -43,6 +43,9 @@
   width: 25vw;
   z-index: 5;
 
+  background-color: var(--background-primary-color);
+  border-left: 1px solid var(--border-color);
+
   &.show {
     transform: none;
     transition: transform 0.3s ease-in-out;
@@ -118,9 +121,7 @@
     background-color: inherit;
     outline: none;
     position: relative;
-
-    border-left: var(--border-session);
-    border-top: var(--border-session);
+    border-top: 1px solid var(--border-color);
   }
 
   .conversation-info-panel {
@@ -160,7 +161,6 @@
   padding: 0px var(--margins-md);
   min-height: min-content;
   border-top: 1px solid var(--border-color);
-  border-left: 1px solid var(--border-color);
   z-index: 1;
 
   .session-icon-button {
diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss
index 0a651b143..69342de9f 100644
--- a/stylesheets/_session_group_panel.scss
+++ b/stylesheets/_session_group_panel.scss
@@ -3,8 +3,6 @@
   flex-direction: column;
   height: 100vh;
   width: -webkit-fill-available;
-  background: var(--color-cell-background);
-  border-left: var(--border-session);
 
   align-items: center;
 
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index d85e49724..a3b923ebc 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -75,6 +75,8 @@ $session-compose-margin: 20px;
   position: relative;
   height: 100vh;
   flex-shrink: 0;
+  border-left: 1px solid var(--border-color);
+  border-right: 1px solid var(--border-color);
 
   &-session {
     display: flex;
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index e06146910..cb0849def 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -147,10 +147,10 @@ const StyledLeaveButton = styled.div`
   .session-button {
     margin-top: auto;
     width: 100%;
-    height: var(--composition-container-height);
+    min-height: calc(var(--composition-container-height) + 1px); // include border in height
     flex-shrink: 0;
     align-items: center;
-    border-top: var(--border-color);
+    border-top: 1px solid var(--border-color);
     border-radius: 0px;
 
     &:not(.disabled) {