diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 28d8c6db2..eb759e179 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2609,7 +2609,7 @@
   },
   "ByUsingThisService...": {
     "message":
-      "By using this service, you agree to our <a href=\"https://getsession.org/privacy-policy/\">Terms and Conditions</a> and <a href=\"https://getsession.org/privacy-policy/\" target=\"_blank\">Privacy Statement</a>"
+      "By using this service, you agree to our <a href=\"https://getsession.org/legal/#tos\">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy/\" target=\"_blank\">Privacy Policy</a>"
   },
   "beginYourSession": {
     "message": "Begin<br />your<br />Session."
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 493aac60a..bd98b42eb 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -36,7 +36,6 @@
 }
 
 // Module: Message
-
 .module-message {
   position: relative;
   display: inline-flex;
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 5c3497ba8..933da6f03 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -136,7 +136,7 @@ div.spacer-lg {
 
 // Blur for modals
 .loki-dialog ~ .index.inbox {
-  filter: blur(1px);
+  filter: blur(2px);
   transition: filter 0.1s;
 }
 
@@ -156,10 +156,6 @@ div.spacer-lg {
   width: 100%;
 }
 
-::selection {
-  background: rgba($session-color-green, 0.6);
-}
-
 input,
 textarea {
   caret-color: $session-color-green !important;
@@ -200,14 +196,15 @@ $session-conversation-header-height: 60px;
   font-family: $session-font-family;
 }
 
-a,
-div,
-span,
-label {
+* {
+  user-select: none;
+}
+
+.text-selectable {
   user-select: text;
 
-  &::selection {
-    background: $session-shade-17;
+  ::selection {
+    background: rgba($session-color-green, 0.6);
   }
 }
 
@@ -592,6 +589,11 @@ label {
   .close-button {
     float: left;
   }
+
+  .session-button.default.danger {
+    display: flex;
+    width: 80px;
+  }
 }
 .message-selection-overlay div[role='button'] {
   display: inline-block;
diff --git a/ts/components/EditProfileDialog.tsx b/ts/components/EditProfileDialog.tsx
index 1a560dfc7..b05e35184 100644
--- a/ts/components/EditProfileDialog.tsx
+++ b/ts/components/EditProfileDialog.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import classNames from 'classnames';
 import { QRCode } from 'react-qr-svg';
 
 import { Avatar } from './Avatar';
@@ -109,7 +110,7 @@ export class EditProfileDialog extends React.Component<Props, State> {
           <div className="panel-text-divider">
             <span>{window.i18n('yourSessionID')}</span>
           </div>
-          <p className="session-id-section-display">{sessionID}</p>
+          <p className={classNames('text-selectable', 'session-id-section-display')}>{sessionID}</p>
 
           <div className="spacer-lg" />
 
diff --git a/ts/components/conversation/MessageBody.tsx b/ts/components/conversation/MessageBody.tsx
index f0af43dff..4da493324 100644
--- a/ts/components/conversation/MessageBody.tsx
+++ b/ts/components/conversation/MessageBody.tsx
@@ -88,7 +88,7 @@ export class MessageBody extends React.Component<Props> {
     const { i18n, textPending } = this.props;
 
     return (
-      <span>
+      <span className="text-selectable">
         {jsx}
         {textPending ? (
           <span className="module-message-body__highlight">