diff --git a/fonts/SFProText-Regular.ttf b/fonts/SFProText-Regular.ttf
new file mode 100644
index 000000000..b63615e93
Binary files /dev/null and b/fonts/SFProText-Regular.ttf differ
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index af1ac86de..1b2bb2144 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -368,9 +368,6 @@
   $button-width: 36px;
 
   form.active {
-    textarea {
-      border: solid 1px $blue;
-    }
   }
 
   form.send {
diff --git a/stylesheets/_emoji.scss b/stylesheets/_emoji.scss
index 77b636ddb..1e43e7de1 100644
--- a/stylesheets/_emoji.scss
+++ b/stylesheets/_emoji.scss
@@ -82,13 +82,11 @@ img.emoji.jumbo {
 }
 
 button.emoji {
-  width: 36px;
-  height: 36px;
   padding: 0;
   opacity: 0.5;
   border: none;
   background: transparent;
-  margin-top: 3px;
+  margin-left: 15px;
 
   &:before {
     content: '';
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 183c7baa8..b65f504ce 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -26,6 +26,10 @@
   src: url('../fonts/Wasa-Bold.otf') format('opentype');
   font-weight: bold;
 }
+@font-face {
+  font-family: 'SFPro';
+  src: url('../fonts/SFProText-Regular.ttf') format('truetype');
+}
 
 // Session Colors
 $session-font-family: 'Wasa';
@@ -1035,4 +1039,36 @@ label {
 
 .network-status-container{
 
+}
+
+
+.discussion-container {
+
+  .module-message {
+    font-family: SFPro;
+    border-radius: 5px;
+  }
+}
+
+
+.bottom-bar textarea.send-message  {
+  height: 60px;
+  background-color: $session-shade-4;
+  border: none;
+  margin: 0px;
+  padding: 0px $session-margin-lg;
+  font-size: 15px;
+  line-height: 60px;
+
+  @include session-color-subtle($session-color-white);
+}
+
+.bottom-bar form {
+  &.send {
+    background-color: $session-shade-4;
+  }
+
+  &.active textarea {
+    border: none;
+  }
 }
\ No newline at end of file
diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 222f797fc..ad8816603 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -42,7 +42,7 @@
       @include session-color-subtle($session-color-white);
     }
     @at-root .dark-theme #{&} {
-      background-color: $session-shade-11;
+      background-color: $session-shade-8;
     }
   }
 
@@ -101,7 +101,7 @@
 }
 
 .discussion-container {
-  background: none !important;
+  background-color: #141414;
 }
 
 @mixin session-h-title {
diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss
index 1498b8b64..f09656a35 100644
--- a/stylesheets/_theme_dark.scss
+++ b/stylesheets/_theme_dark.scss
@@ -35,15 +35,8 @@ body.dark-theme {
   }
 
   .bottom-bar {
-    form.active {
-      textarea {
-        border: solid 1px $blue;
-      }
-    }
 
     form.send {
-      background-color: $color-gray-95;
-
       &.video-attachment {
         .outer {
           .play.icon {
@@ -54,9 +47,6 @@ body.dark-theme {
     }
 
     .send-message {
-      background-color: $color-dark-85;
-      color: $color-dark-05;
-      border: 1px solid $color-light-60;
       outline: 0;
 
       &[disabled='disabled'] {
diff --git a/ts/components/AddServerDialog.tsx b/ts/components/AddServerDialog.tsx
index c3087b592..fb2581a05 100644
--- a/ts/components/AddServerDialog.tsx
+++ b/ts/components/AddServerDialog.tsx
@@ -141,8 +141,8 @@ export class AddServerDialog extends React.Component<Props, State> {
 
       const connectionResult = this.attemptConnection(serverURL, channelId);
 
-      // Give 5s maximum for promise to revole. Else, throw error.
-      const maxConnectionDuration = 5000;
+      // Give 10s maximum for promise to revole. Else, throw error.
+      const maxConnectionDuration = 10000;
       const connectionTimeout = setTimeout(() => {
         if (!this.state.success) {
           this.showView('default', i18n('connectToServerFail'));