diff --git a/js/views/beta_release_disclaimer_view.js b/js/views/beta_release_disclaimer_view.js
index 908403594..e93d9a5be 100644
--- a/js/views/beta_release_disclaimer_view.js
+++ b/js/views/beta_release_disclaimer_view.js
@@ -19,7 +19,7 @@
         Component: window.Signal.Components.SessionConfirm,
         props: {
           title: window.i18n('betaDisclaimerTitle'),
-          message: window.i18n('betaDisclaimerSubtitle'  2),
+          message: window.i18n('betaDisclaimerSubtitle'),
           messageSub: window.i18n('betaDisclaimerDescription'),
           hideCancel: true,
           onClickOk: this.close,
diff --git a/stylesheets/_mentions.scss b/stylesheets/_mentions.scss
index 882470bc5..625c2a9e2 100644
--- a/stylesheets/_mentions.scss
+++ b/stylesheets/_mentions.scss
@@ -134,11 +134,6 @@
     padding: 4px;
     user-select: none;
 
-    &:hover:not(.member-selected) {
-      background-color: $color-light-20;
-    }
-
-    background-color: $color-light-10;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -153,10 +148,6 @@
       color: darkslategrey;
     }
   }
-
-  .member-selected {
-    background-color: $color-light-35;
-  }
 }
 
 .mention-profile-name {
@@ -179,29 +170,6 @@
   background-color: rgba(255, 197, 50, 0.2);
 }
 
-.dark-theme {
-  .member-list-container,
-  .create-group-dialog,
-  .invite-friends-dialog {
-    .member-item {
-      &:hover:not(.member-selected) {
-        background-color: $color-dark-55;
-      }
-
-      background-color: $color-dark-70;
-
-      color: white;
-
-      .pubkey-part {
-        color: rgb(230, 230, 230);
-      }
-    }
-
-    .member-selected {
-      background-color: $color-dark-60;
-    }
-  }
-}
 
 .module-conversation-list-item--mentioned-us {
   border-left: 4px solid #ffb000 !important;
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 8927e3ee6..0e78aeed8 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -338,7 +338,7 @@ $session_message-container-border-radius: 5px;
     border-radius: 0px;
   }
 
-  &:hover {
+  & > *:not(svg):hover{
     filter: brightness(80%);
   }
 }
@@ -1160,3 +1160,20 @@ button.module-scroll-down {
   }
   
 }
+
+/* Memberlist */
+.member-list-container .member {
+
+  &-item{
+    padding: $session-margin-sm;
+    background-color: $session-shade-5;
+
+    &:hover:not(.member-selected) {
+      background-color: $session-shade-7;
+    }
+  }
+
+  &-selected {
+    background-color: $session-shade-8;
+  }
+}
\ No newline at end of file
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 5ff2a5688..a1d1b1282 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -79,7 +79,6 @@ export class SettingsView extends React.Component<SettingsViewProps> {
         setFn: window.toggleLinkPreview,
         content: {},
       },
-
       {
         id: 'notification-setting',
         title: window.i18n('notificationSettingsDialog'),