diff --git a/js/modules/signal.js b/js/modules/signal.js
index c84917ff9..76c8a5d3c 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -107,18 +107,12 @@ const {
   MessageDetail,
 } = require('../../ts/components/conversation/MessageDetail');
 const { Quote } = require('../../ts/components/conversation/Quote');
-const {
-  ResetSessionNotification,
-} = require('../../ts/components/conversation/ResetSessionNotification');
 const {
   TimerNotification,
 } = require('../../ts/components/conversation/TimerNotification');
 const {
   TypingBubble,
 } = require('../../ts/components/conversation/TypingBubble');
-const {
-  VerificationNotification,
-} = require('../../ts/components/conversation/VerificationNotification');
 
 // State
 const { createLeftPane } = require('../../ts/state/roots/createLeftPane');
@@ -297,13 +291,11 @@ exports.setup = (options = {}) => {
     MessageBody,
     MessageDetail,
     Quote,
-    ResetSessionNotification,
     TimerNotification,
     Types: {
       Message: MediaGalleryMessage,
     },
     TypingBubble,
-    VerificationNotification,
   };
 
   const Roots = {
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index b15113348..39e364c19 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -12,7 +12,7 @@
 */
 
 // eslint-disable-next-line func-names
-(function () {
+(function() {
   'use strict';
 
   window.Whisper = window.Whisper || {};
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 2847f4ecd..0dbeeff96 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -42,19 +42,6 @@
       this.onUnload();
     },
     getRenderInfo() {
-      const { Components } = window.Signal;
-
-      if (this.model.propsForVerificationNotification) {
-        return {
-          Component: Components.VerificationNotification,
-          props: this.model.propsForVerificationNotification,
-        };
-      } else if (this.model.isSessionRestoration()) {
-        return {
-          Component: Components.ResetSessionNotification,
-          props: this.model.getPropsForResetSessionNotification(),
-        };
-      }
       return null;
     },
     render() {
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index b7c3d1e09..46695f5f9 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -1121,7 +1121,10 @@ label {
       max-width: 90%;
       width: 600px;
 
-      background-color: $session-shade-4;
+      @include themify($themes) {
+        background: themed('composeViewBackground');
+        color: themed('textColor');
+      }
       border: 1px solid $session-shade-8;
       border-radius: 5px;
 
@@ -1132,8 +1135,10 @@ label {
 
       input {
         width: 100%;
-        color: $session-color-white;
-        background-color: $session-shade-7;
+        @include themify($themes) {
+          background: themed('inputBackground');
+          color: themed('textColor');
+        }
         padding: $session-margin-xs $session-margin-md;
         margin-bottom: $session-margin-lg;
         outline: none;
diff --git a/ts/components/conversation/VerificationNotification.tsx b/ts/components/conversation/VerificationNotification.tsx
index b475288e1..8f1844b46 100644
--- a/ts/components/conversation/VerificationNotification.tsx
+++ b/ts/components/conversation/VerificationNotification.tsx
@@ -13,14 +13,19 @@ interface Contact {
 }
 
 type Props = {
+  // tslint:disable: react-unused-props-and-state
   type: 'markVerified' | 'markNotVerified';
   isLocal: boolean;
   contact: Contact;
 };
 
 export const VerificationNotification = (props: Props) => {
+  const { type } = props;
+  const suffix =
+    type === 'markVerified' ? 'mark-verified' : 'mark-not-verified';
+
   const getStringId = () => {
-    const { isLocal, type } = props;
+    const { isLocal } = props;
 
     switch (type) {
       case 'markVerified':
@@ -60,10 +65,6 @@ export const VerificationNotification = (props: Props) => {
     );
   };
 
-  const { type } = props;
-  const suffix =
-    type === 'markVerified' ? 'mark-verified' : 'mark-not-verified';
-
   return (
     <div className="module-verification-notification">
       <div className={`module-verification-notification__icon--${suffix}`} />
diff --git a/ts/window.d.ts b/ts/window.d.ts
index a5eefa58d..96eb99b79 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -12,7 +12,7 @@ import { LibTextsecure } from '../libtextsecure';
 import { ConversationType } from '../js/modules/data';
 import { RecoveryPhraseUtil } from '../libloki/modules/mnemonic';
 import { ConfirmationDialogParams } from '../background';
-import { } from 'styled-components/cssprop';
+import {} from 'styled-components/cssprop';
 
 import { ConversationControllerType } from '../js/ConversationController';
 import { any } from 'underscore';