diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 536f37ea9..01ac68502 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -940,8 +940,8 @@ label {
 
   .session-id-section {
     display: flex;
+    align-items: center;
     flex-direction: column;
-    justify-content: center;
 
     .panel-text-divider {
       margin-top: 35px;
@@ -1200,7 +1200,7 @@ label {
 
 .discussion-container {
   .module-message {
-    font-family: "SF Pro Text";
+    font-family: 'SF Pro Text';
     border-radius: 5px;
   }
 }
@@ -1273,9 +1273,6 @@ label {
     border-color: $session-color-white;
   }
 
-  label:before {
-    transition: all $session-transition-duration ease;
-  }
 }
 .user-details-dialog {
   .session-id-editable {
diff --git a/ts/components/DevicePairingDialog.tsx b/ts/components/DevicePairingDialog.tsx
index c74036b49..9af2f2ce5 100644
--- a/ts/components/DevicePairingDialog.tsx
+++ b/ts/components/DevicePairingDialog.tsx
@@ -131,14 +131,9 @@ export class DevicePairingDialog extends React.Component<Props, State> {
   }
 
   public renderQrCodeView() {
-    const theme = window.Events.getThemeSetting();
     const requestReceived = this.hasReceivedRequests();
     const title = window.i18n('pairingDevice');
 
-    // Foreground equivalent to .session-modal background color
-    const bgColor = 'rgba(0, 0, 0, 0)';
-    const fgColor = theme === 'dark' ? '#FFFFFF' : '#1B1B1B';
-
     return (
       <SessionModal title={title} onOk={() => null} onClose={this.closeDialog}>
         <div className="session-modal__centered">
@@ -149,11 +144,9 @@ export class DevicePairingDialog extends React.Component<Props, State> {
           </small>
           <div className="spacer-lg" />
 
-          <div id="qr">
+          <div className="qr-image">
             <QRCode
               value={window.textsecure.storage.user.getNumber()}
-              bgColor={bgColor}
-              fgColor={fgColor}
               level="L"
             />
           </div>
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 27195eccc..dd96a1d74 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -217,7 +217,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
     return (
       <div className="session-settings">
         <SettingsHeader
-          disableLinkDeviceButton={shouldRenderPasswordLock}
+          showLinkDeviceButton={!shouldRenderPasswordLock}
           category={category}
         />
         {shouldRenderPasswordLock ? (
diff --git a/ts/components/session/settings/SessionSettingsHeader.tsx b/ts/components/session/settings/SessionSettingsHeader.tsx
index 0de5eb643..b5dc93df0 100644
--- a/ts/components/session/settings/SessionSettingsHeader.tsx
+++ b/ts/components/session/settings/SessionSettingsHeader.tsx
@@ -5,11 +5,13 @@ import { SessionSettingCategory, SettingsViewProps } from './SessionSettings';
 import { SessionButton } from '../SessionButton';
 
 interface Props extends SettingsViewProps {
+  showLinkDeviceButton: boolean | null;
   disableLinkDeviceButton: boolean | null;
 }
 
 export class SettingsHeader extends React.Component<Props, any> {
   public static defaultProps = {
+    showLinkDeviceButton: false,
     disableLinkDeviceButton: true,
   };
 
@@ -64,7 +66,9 @@ export class SettingsHeader extends React.Component<Props, any> {
         ? `${categoryTitlePrefix.slice(0, -1)} Settings`
         : `${categoryTitlePrefix} Settings`;
     const showSearch = false;
-    const showAddDevice = category === SessionSettingCategory.Devices;
+    const showAddDevice =
+      category === SessionSettingCategory.Devices &&
+      this.props.showLinkDeviceButton;
 
     return (
       <div className="session-settings-header">