diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index eb759e179..c2f9b00f0 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -976,7 +976,7 @@
     "message": "You don't have any messages, yet."
   },
   "noMessagesSubtitle": {
-    "message": "Would you like to join Session's public chat?"
+    "message": "Would you like to join Session's open group?"
   },
   "pairNewDevice": {
     "message": "Pair New Device"
@@ -2131,7 +2131,7 @@
   },
   "banUser": {
     "message": "Ban User",
-    "description": "Ban user from public chat by public key."
+    "description": "Ban user from open group by public key."
   },
   "banUserConfirm": {
     "message": "Are you sure you want to ban user?",
@@ -2214,9 +2214,9 @@
       "Title for the dialog box used to update an existing private group"
   },
   "updatePublicGroupDialogTitle": {
-    "message": "Updating a Public Chat Channel",
+    "message": "Updating a open group Channel",
     "description":
-      "Title for the dialog box used to update an existing public chat channel"
+      "Title for the dialog box used to update an existing open group channel"
   },
   "showSeed": {
     "message": "Show Seed",
@@ -2407,7 +2407,7 @@
     "message": "Failed to connect to server. Check URL"
   },
   "connectToServerSuccess": {
-    "message": "Successfully connected to new public chat server"
+    "message": "Successfully connected to new open group server"
   },
   "setPasswordFail": {
     "message": "Failed to set password"
@@ -2614,9 +2614,6 @@
   "beginYourSession": {
     "message": "Begin<br />your<br />Session."
   },
-  "welcomeToSession": {
-    "message": "Welcome to Session"
-  },
   "welcomeToYourSession": {
     "message": "Welcome to your Session"
   },
@@ -2773,7 +2770,7 @@
     "message": "Join Open Group"
   },
   "joinPublicChat": {
-    "message": "Join Public Chat"
+    "message": "Join open group"
   },
   "next": {
     "message": "Next"
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 2f879d9c3..9535c20ec 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -366,6 +366,7 @@
 
 .bottom-bar {
   box-sizing: content-box;
+  margin-bottom: 8px;
   $button-width: 36px;
 
   form.active {
@@ -431,8 +432,8 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    margin-right: 6px;
-    margin-bottom: 6px;
+    margin-bottom: 8px;
+    padding-left: 0px $session-margin-md;
 
     .send-message {
       flex-grow: 1;
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 5f0749aaf..c86f7b3a9 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -198,15 +198,13 @@ $session-conversation-header-height: 60px;
 
 * {
   user-select: none;
-}
-
-.text-selectable {
-  user-select: text;
 
-  &::selection {
-    border-radius: 3px;
-    padding: 3px;
-    background: rgba($session-color-green, 0.6);
+  .text-selectable, input, textarea {
+    user-select: text;
+  
+    &::selection {
+      background: rgba($session-color-green, 0.6);
+    }
   }
 }
 
@@ -1353,14 +1351,13 @@ label {
 
 .bottom-bar {
   .compose {
-    min-height: 60px;
     max-height: 200px;
   }
 
   .send-message-container {
     display: flex;
     flex-grow: 1;
-    min-height: 60px;
+    height: 48px;
     margin-bottom: -5px;
   }
 
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index ee8bd0e7a..89ae7f6cf 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -405,8 +405,9 @@ $session-compose-margin: 20px;
   display: flex;
   flex-direction: row;
   position: absolute;
-  bottom: 0px;
+  bottom: 2px;
   width: 100%;
+  
 
   @at-root .light-theme #{&} {
     background-color: $session-color-white;
@@ -539,6 +540,10 @@ $session-compose-margin: 20px;
 
   &-bottom-buttons {
     @include bottom-buttons();
+    
+    .session-button {
+      height: 57px;
+    }
   }
 }
 
diff --git a/stylesheets/_session_signin.scss b/stylesheets/_session_signin.scss
index 66b5fd5c2..e0dce956c 100644
--- a/stylesheets/_session_signin.scss
+++ b/stylesheets/_session_signin.scss
@@ -191,7 +191,7 @@
   }
 
   &-terms-conditions-agreement {
-    padding-top: 10px;
+    padding-top: $session-margin-md;
     color: $session-color-light-grey;
     text-align: center;
     font-size: 12px;
@@ -227,7 +227,6 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    height: 94px;
     padding: 20px;
     border-radius: 8px;
     border: 2px solid #353535;
@@ -243,7 +242,7 @@
       line-height: 18px;
       text-align: center;
       overflow-wrap: break-word;
-      padding: 20px 5px 20px 5px;
+      padding: 0px 5px 20px 5px;
       display: inline-block;
       font-family: 'SpaceMono';
       user-select: all;