diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
index 3c353185e19e..612da29d654f 100644
--- a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
+++ b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
@@ -50,7 +50,6 @@ html.rtl .flex-tab {
 		}
 
 		& .editing {
-			margin: -2px 0 -1px -9px;
 			padding-right: 80px;
 			font-size: 14px;
 		}
diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json
index c760d61a3560..d5cb0fc15cbb 100644
--- a/packages/rocketchat-livechat/app/package-lock.json
+++ b/packages/rocketchat-livechat/app/package-lock.json
@@ -649,6 +649,13 @@
         "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
       }
     },
+    "string_decoder": {
+      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "requires": {
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+      }
+    },
     "stringstream": {
       "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
       "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 59c9a35863c5..824861da1266 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3429,7 +3429,6 @@ body:not(.is-cordova) {
 		overflow-x: visible;
 
 		width: var(--flex-tab-width);
-		height: calc(100vh - 61px);
 
 		& .control {
 			& .header {
@@ -3516,23 +3515,14 @@ body:not(.is-cordova) {
 		}
 
 		& .content {
-			position: absolute;
-			top: auto;
-			left: 0;
-
-			overflow-x: hidden;
-			overflow-y: auto;
-
-			width: 100%;
-			height: 100%;
-			-webkit-overflow-scrolling: touch;
-
 			& > div {
+				overflow-y: auto;
+
 				transition: transform 0.45s cubic-bezier(0.5, 0, 0, 1), opacity 0.125s ease-out 0.1s;
 			}
 
 			& > .animated-hidden {
-				transform: translateX(100%);
+				transform: translateX(calc(100% + 40px));
 
 				opacity: 0;
 			}
@@ -3568,6 +3558,10 @@ body:not(.is-cordova) {
 			}
 		}
 
+		& .channel-settings .button {
+			visibility: initial;
+		}
+
 		& footer {
 			position: absolute;
 			z-index: 100;
diff --git a/packages/rocketchat-theme/server/colors.less b/packages/rocketchat-theme/server/colors.less
index 627cea3d8e3f..631d1d143331 100755
--- a/packages/rocketchat-theme/server/colors.less
+++ b/packages/rocketchat-theme/server/colors.less
@@ -714,10 +714,6 @@ input:-webkit-autofill {
 			}
 		}
 
-		.button {
-			.buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color);
-		}
-
 		.input.checkbox.toggle {
 			input:checked + label::before {
 				background-color: @primary-background-color;
diff --git a/tests/pageobjects/flex-tab.page.js b/tests/pageobjects/flex-tab.page.js
index 383b45dc068c..0c0104148a12 100644
--- a/tests/pageobjects/flex-tab.page.js
+++ b/tests/pageobjects/flex-tab.page.js
@@ -79,9 +79,9 @@ class FlexTab extends Page {
 	get usersSendInvitationTab() { return browser.element('.tab-button:not(.hidden) .tab-button-icon--send'); }
 	get usersAddUserTab() { return browser.element('.tab-button:not(.hidden) .tab-button-icon--plus'); }
 	get usersSendInvitationTextArea() { return browser.element('#inviteEmails'); }
-	get usersButtonCancel() { return browser.element('button.cancel'); }
-	get usersSendInvitationSend() { return browser.element('button.send'); }
-	get usersButtonSave() { return browser.element('button.save'); }
+	get usersButtonCancel() { return browser.element('.button.cancel'); }
+	get usersSendInvitationSend() { return browser.element('.button.send'); }
+	get usersButtonSave() { return browser.element('.button.save'); }
 	get usersAddUserName() { return browser.element('#name'); }
 	get usersAddUserUsername() { return browser.element('#username'); }
 	get usersAddUserEmail() { return browser.element('#email'); }