diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.html b/packages/rocketchat-authorization/client/views/permissionsRole.html
index 78d0c5c29ec7f1cd9075a551cfe7d63bad9cee95..71a1fb2e138dff28de502288fc88cb10559efa3b 100644
--- a/packages/rocketchat-authorization/client/views/permissionsRole.html
+++ b/packages/rocketchat-authorization/client/views/permissionsRole.html
@@ -24,7 +24,7 @@
 						<button name="save" class="button primary">{{_ "Save"}}</button>
 
 						{{#if editable}}
-							<button name="delete" class="button red delete-role">{{_ "Delete"}}</button>
+							<button name="delete" class="button delete-role">{{_ "Delete"}}</button>
 						{{/if}}
 					</div>
 				</form>
diff --git a/packages/rocketchat-emoji-custom/admin/emojiInfo.html b/packages/rocketchat-emoji-custom/admin/emojiInfo.html
index 16e971a71f6a1f46401b5b95ddb10d51a3020f8f..99f6f4e9ef6447597e2429c5d344e18dff6f56a6 100644
--- a/packages/rocketchat-emoji-custom/admin/emojiInfo.html
+++ b/packages/rocketchat-emoji-custom/admin/emojiInfo.html
@@ -15,8 +15,8 @@
 		{{/with}}
 		<nav>
 			{{#if hasPermission 'manage-emoji'}}
-			<button class='button lightblue edit-emoji button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
-			<button class='button delete red button-block'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
+			<button class='button edit-emoji button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
+			<button class='button delete button-block'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
 			{{/if}}
 		</nav>
 	{{/if}}
diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.html b/packages/rocketchat-integrations/client/views/integrationsIncoming.html
index 73e26c2315157b96b110d03ad19c937dfa24a9fe..36ff289704ae8aac98d1c8af0a8cb1ee14980a95 100644
--- a/packages/rocketchat-integrations/client/views/integrationsIncoming.html
+++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.html
@@ -130,7 +130,7 @@
 				</div>
 				<div class="submit">
 					{{#if data.token}}
-						<button class="button red delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
+						<button class="button delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
 					{{/if}}
 					<button class="button save"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html b/packages/rocketchat-integrations/client/views/integrationsOutgoing.html
index 505894f8dad148208bf193861597d97b96aecca8..b65ff6fef04f27eb0ff1dbf7b9615856b3cf1e22 100644
--- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html
+++ b/packages/rocketchat-integrations/client/views/integrationsOutgoing.html
@@ -137,7 +137,7 @@
 				</div>
 				<div class="submit">
 					{{#if data.token}}
-						<button class="button red delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
+						<button class="button delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
 					{{/if}}
 					<button class="button save"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.html b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.html
index 7cd7e0d0b5cee89ef15f7374d211a60591b87632..2229140be81e7314745d07c93bb892cb45753b36 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.html
+++ b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.html
@@ -31,7 +31,7 @@
 					<input type="text" class="form-control" id="to" name="to">
 
 					<button class="button">{{_ "Filter"}}</button>
-				</div>		
+				</div>
 			<!--Added by Deepankar-->
 		</form>
 	</fieldset>
@@ -60,6 +60,6 @@
 		</table>
 	</div>
 	<div class="text-center">
-		<button class="button load-more lightblue">{{_ "Load_more"}}</button>
+		<button class="button load-more">{{_ "Load_more"}}</button>
 	</div>
 </template>
diff --git a/packages/rocketchat-livechat/client/views/app/livechatIntegrations.html b/packages/rocketchat-livechat/client/views/app/livechatIntegrations.html
index d0aabcfaf44c49abb36a0c9d9c68294e71144479..0c197ceff6c3e58d09069cd87c019767c1bab7c5 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatIntegrations.html
+++ b/packages/rocketchat-livechat/client/views/app/livechatIntegrations.html
@@ -34,7 +34,7 @@
 			<div class="submit">
 				<button type="button" class="button secondary reset-settings"><i class="icon-ccw"></i>{{_ "Reset"}}</button>
 				<button class="button save"><i class="icon-floppy"></i>{{_ "Save"}}</button>
-				<button type="button" class="button lightblue test" disabled="{{disableTest}}">{{_ "Send_Test"}}</button>
+				<button type="button" class="button test" disabled="{{disableTest}}">{{_ "Send_Test"}}</button>
 			</div>
 		</form>
 	</div>
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.html b/packages/rocketchat-livechat/client/views/app/livechatTriggers.html
index 98e5bd9b9e50aeecbed1a2240d142aa0d825f435..ee8e33cb4828d88c1acbb79663cb3ef69f425b26 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatTriggers.html
+++ b/packages/rocketchat-livechat/client/views/app/livechatTriggers.html
@@ -24,7 +24,7 @@
 				</div>
 			</fieldset>
 			<div class="submit">
-				<button type="button" class="button red delete-trigger">{{_ "Delete"}}</button>
+				<button type="button" class="button delete-trigger">{{_ "Delete"}}</button>
 				<button class="button save"><i class="icon-floppy"></i><span>{{_ "Save"}}</span></button>
 			</div>
 		</div>
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
index bd7ee4afc7469902f1f95ef7300e10549a8edb20..f202e1df4728485fdecd211bf0e5e03e98b3f2ae 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
@@ -45,7 +45,7 @@
 
 			{{#if canSeeButtons}}
 				<nav class="centered-buttons">
-					<button class='button lightblue edit-livechat button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
+					<button class='button edit-livechat button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
 					{{#if roomOpen}}
 						<button class='button close-livechat button-block'><span><i class='icon-download'></i> {{_ "Close"}}</span></button>
 						<button class="button forward-livechat"><span><i class="icon-forward"></i> {{_ "Forward"}}</span></button>
diff --git a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.html b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.html
index 650fc71853db4f0d0548d1100577c6cf0b016100..30bce6259efa4a0c921ec7f28e0fc6832ef5e1ed 100644
--- a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.html
+++ b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.html
@@ -60,7 +60,7 @@
 				</div>
 				<div class="submit">
 					{{#if data.clientId}}
-						<button class="button red delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
+						<button class="button delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
 					{{/if}}
 					<button class="button save"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.html b/packages/rocketchat-otr/client/views/otrFlexTab.html
index 0fdd260fac00e4b57e9cd9a5c22cf56196ddfb53..0265d99d0be6c43fde624b4aa363659978553d92 100644
--- a/packages/rocketchat-otr/client/views/otrFlexTab.html
+++ b/packages/rocketchat-otr/client/views/otrFlexTab.html
@@ -10,7 +10,7 @@
 						{{#if userIsOnline}}
 							{{#if established}}
 								<button class="button refresh"><span>{{_ "Refresh_keys"}}</span></button>
-								<button class="button red end"><span>{{_ "End_OTR"}}</span></button>
+								<button class="button end"><span>{{_ "End_OTR"}}</span></button>
 							{{else}} {{#if establishing}}
 								{{_ "Please_wait_while_OTR_is_being_established"}}
 							{{else}}
diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index 0a31d27214487b8af5ad81e64d919b9499c01a5b..59c28ef0bc99a8ddb36d848e30341a3bc915ccf3 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -601,8 +601,8 @@ label.required:after {
 	&:extend(.unselectable);
 	display: inline-block;
 	padding: 9px 12px;
-	font-weight: 500;
-	font-size: 13px;
+	font-weight: 600;
+	font-size: 14px;
 	text-align: center;
 	text-transform: uppercase;
 	word-spacing: 0;
@@ -613,37 +613,6 @@ label.required:after {
 		position: relative;
 		z-index: 2;
 	}
-	&:before {
-		content: " ";
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		opacity: 0;
-		z-index: 1;
-	}
-	&:hover {
-		text-decoration: none;
-		&:before {
-			opacity: 1;
-		}
-	}
-	&.delete,
-	&.remove,
-	&.short {
-		min-width: 100px;
-	}
-	&.lightblue {
-		min-width: 100px;
-	}
-	&.clean {
-		font-size: 14px;
-		box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
-		&.primary {
-			font-weight: 600;
-		}
-	}
 	&.button-block {
 		display: block;
 		margin-bottom: 4px;
diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
index cc8fd68d367bfcdc21ea19e753685ecee8bbbf59..3773f0b48d0bbe64d6a3ba20b3e11e8e83206d2d 100755
--- a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
+++ b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
@@ -1,17 +1,34 @@
-.custom-scroll(@background, @thumb, @width: 8px, @height: 8px) {
-	-ms-overflow-style: -ms-autohiding-scrollbar;
-	&::-webkit-scrollbar {
-		height: @height;
-		width: @width;
-		background: @background;
-	}
-	&::-webkit-scrollbar-thumb {
-		background-color: @thumb;
-		-webkit-border-radius: 50px;
-	}
-	&::-webkit-scrollbar-corner {
-		background-color: @background;
-	}
+/** ----------------------------------------------------------------------------
+ * Derivative colours (fixed variants of inherited variables)
+ */
+
+@primary-action-color: @action-buttons-color;
+@secondary-action-color: @primary-font-color;
+@success-color: rgba(53, 172, 25, 1.0);
+@error-color: rgba(188, 32, 49, 1.0);
+@pending-color: #fcb316;
+@component-color: @input-font-color;
+@selection-color: @info-active-font-color;
+
+@primary-background-contrast: contrast(@primary-background-color, #444);
+@primary-action-contrast: contrast(@primary-action-color, #444);
+@secondary-action-contrast: contrast(@secondary-action-color, #444);
+@selection-background: lighten(@selection-color, 30%);
+@success-background: lighten(@success-color, 40%);
+@success-border: lighten(@success-color, 30%);
+@error-background: lighten(@error-color, 40%);
+@error-border: lighten(@error-color, 30%);
+@error-contrast: contrast(@error-color);
+@pending-background: lighten(@pending-color, 40%);
+@pending-border: lighten(@pending-color, 30%);
+@window-border-color: @component-color;
+
+/** ----------------------------------------------------------------------------
+ * Document components
+ */
+
+html {
+	.custom-scroll(transparent, @custom-scrollbar-color, 0);
 }
 
 a {
@@ -213,34 +230,29 @@ label.required:after {
 
 // new layout buttons
 .button {
-	color: rgba(255, 255, 255, 0.85);
-	background-color: @action-buttons-color;
-	&:before {
-		background-color: rgba(0, 0, 0, 0.1);
-	}
-	&:hover {
-		color: #FFF;
-	}
-	&.secondary {
-		background-color: @tertiary-background-color;
-		color: @primary-font-color;
-		&:before {
-			background-color: rgba(0, 0, 0, 0.045);
-		}
-	}
+	.buttonColors(@secondary-action-contrast, @secondary-action-color);
+	&.button-primary,
+	&.primary,
+	&.save,
+	&.send,
+	&.start {
+		.buttonColors(@primary-action-contrast, @primary-action-color);
+	}
+	// TODO: Secondary button usage needs refactor and guidelines to be consistent
+	// &.back,
+	// &.cancel,
+	// &.secondary {
+	// 	.buttonColors(@secondary-action-contrast,@secondary-action-color);
+	// }
 	&.delete,
+	&.delete-role,
+	&.end,
+	&.logout,
+	&.mute-user,
 	&.remove,
-	&.red {
-		background-color: #bc2031;
-	}
-	&.lightblue {
-		background-color: #02acec;
-		&:disabled {
-			background-color: desaturate(#02acec, 20%);
-		}
-	}
-	&.clean {
-		background-color: @clean-buttons-color;
+	&.remove-user,
+	&.stop-call {
+		.buttonColors(@error-contrast, @error-color);
 	}
 	&.external-login {
 		color: white;
diff --git a/packages/rocketchat-ui-account/account/accountProfile.html b/packages/rocketchat-ui-account/account/accountProfile.html
index 91a8a12e8c9e18d7b0f8204066d31a82db09ba26..16445cb026909905d6d2512fbb1ba0fd0895bfe1 100644
--- a/packages/rocketchat-ui-account/account/accountProfile.html
+++ b/packages/rocketchat-ui-account/account/accountProfile.html
@@ -60,11 +60,11 @@
 					<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
 				<div class="logoutOthers">
-					<button class="button red logout">{{_ "Logout_Others"}}</button>
+					<button class="button logout">{{_ "Logout_Others"}}</button>
 				</div>
 				{{#if allowDeleteOwnAccount}}
 				<div class="delete-account text-right">
-					<button class="button red delete"><i class="icon-trash"></i><span>{{_ "Delete_my_account"}}</span></button>
+					<button class="button delete"><i class="icon-trash"></i><span>{{_ "Delete_my_account"}}</span></button>
 				</div>
 				{{/if}}
 			</div>
diff --git a/packages/rocketchat-ui-admin/admin/admin.html b/packages/rocketchat-ui-admin/admin/admin.html
index 66cb59b2bb095e057190125fd8671bd5eae89b00..6d08e31eb5867dbcfba90d288a7435798b572414 100644
--- a/packages/rocketchat-ui-admin/admin/admin.html
+++ b/packages/rocketchat-ui-admin/admin/admin.html
@@ -129,7 +129,7 @@
 													<div class="settings-file-preview">
 														<div class="preview" style="background-image:url({{value.url}}?_dc={{random}});"></div>
 														<div class="action">
-															<button type="button" class="button red delete delete-asset"><i class="icon-trash"></i>{{_ 'Delete'}}</button>
+															<button type="button" class="button delete delete-asset"><i class="icon-trash"></i>{{_ 'Delete'}}</button>
 														</div>
 													</div>
 												{{else}}
diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html
index 1b195e072b5f31ab7532a3263d688cee111a0efc..0616f7d03352443bdeb5a7cd8c57900831e3e604 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html
+++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html
@@ -51,16 +51,16 @@
 					{{/if}}
 					{{#if canSetOwner}}
 						{{#if isOwner}}
-							<button class="button button-block unset-owner lightblue"><span>{{_ "Remove_as_owner"}}</span></button>
+							<button class="button button-block unset-owner"><span>{{_ "Remove_as_owner"}}</span></button>
 						{{else}}
-							<button class="button button-block set-owner lightblue"><span>{{_ "Set_as_owner"}}</span></button>
+							<button class="button button-block set-owner"><span>{{_ "Set_as_owner"}}</span></button>
 						{{/if}}
 					{{/if}}
 					{{#if canSetModerator}}
 						{{#if isModerator}}
-							<button class="button button-block unset-moderator lightblue"><span>{{_ "Remove_as_moderator"}}</span></button>
+							<button class="button button-block unset-moderator"><span>{{_ "Remove_as_moderator"}}</span></button>
 						{{else}}
-							<button class="button button-block set-moderator lightblue"><span>{{_ "Set_as_moderator"}}</span></button>
+							<button class="button button-block set-moderator"><span>{{_ "Set_as_moderator"}}</span></button>
 						{{/if}}
 					{{/if}}
 					{{#if canRemoveUser}}
@@ -77,13 +77,13 @@
 
 				{{#unless hideAdminControls}}
 					{{#if hasPermission 'edit-other-user-info'}}
-					<button class='button lightblue edit-user button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
+					<button class='button edit-user button-block'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
 					{{/if}}
 					{{#if hasPermission 'assign-admin-role'}}
 						{{#if hasAdminRole}}
-						<button class='button secondary lightblue remove-admin button-block'><span><i class='icon-shield'></i> {{_ "Remove_Admin"}}</span></button>
+						<button class='button secondary remove-admin button-block'><span><i class='icon-shield'></i> {{_ "Remove_Admin"}}</span></button>
 						{{else}}
-						<button class='button secondary lightblue make-admin button-block'><span><i class='icon-shield'></i> {{_ "Make_Admin"}}</span></button>
+						<button class='button secondary make-admin button-block'><span><i class='icon-shield'></i> {{_ "Make_Admin"}}</span></button>
 						{{/if}}
 					{{/if}}
 					{{#if hasPermission 'edit-other-user-active-status'}}
@@ -94,7 +94,7 @@
 						{{/if}}
 					{{/if}}
 					{{#if hasPermission 'delete-user'}}
-					<button class='button delete red button-block'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
+					<button class='button delete button-block'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
 					{{/if}}
 				{{/unless}}
 
diff --git a/packages/rocketchat-ui-sidenav/side-nav/createChannelFlex.html b/packages/rocketchat-ui-sidenav/side-nav/createChannelFlex.html
index 0324248b479f1e62bf90c908b74dc23048723aeb..d188757768f49eb507351c1b16bf836e2dd477eb 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/createChannelFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/createChannelFlex.html
@@ -51,14 +51,14 @@
 				</div>
 			{{/if}}
 			<div class="input-submit">
-				<button class="button clean primary save-channel">{{_ "Create" }}</button>
-				<button class="button clean cancel-channel">{{_ "Cancel" }}</button>
+				<button class="button primary save-channel">{{_ "Create" }}</button>
+				<button class="button cancel-channel">{{_ "Cancel" }}</button>
 			</div>
 		</div>
 	</div>
 	<footer>
 		<div>
-			<button class="button clean all">{{_ "All_channels"}}</button>
+			<button class="button all">{{_ "All_channels"}}</button>
 		</div>
 	</footer>
 </template>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html b/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
index 386416718540d5e1f335bb35b93cc224fd05d6be..acb8bdb1349c7ae18830c43fb3c0d668fe905706 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
@@ -55,14 +55,14 @@
 				</div>
 			{{/if}}
 			<div class="input-submit">
-				<button class="button clean primary save-channel">{{_ "Create" }}</button>
-				<button class="button clean cancel-channel">{{_ "Cancel" }}</button>
+				<button class="button primary save-channel">{{_ "Create" }}</button>
+				<button class="button cancel-channel">{{_ "Cancel" }}</button>
 			</div>
 		</div>
 	</div>
 	<footer>
 		<div>
-			<button class="button clean all">{{_ "All_channels"}}</button>
+			<button class="button all">{{_ "All_channels"}}</button>
 		</div>
 	</footer>
 </template>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html b/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html
index c9fd8d7508868f57c120c170cac69aabfce81c0a..78dd378cac3a851d4e5b625097de9bfd425da75b 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html
@@ -20,8 +20,8 @@
 				</div>
 			{{/if}}
 			<div class="input-submit">
-				<button class="button clean primary save-direct-message">{{_ "Create" }}</button>
-				<button class="button clean cancel-direct-message">{{_ "Cancel" }}</button>
+				<button class="button primary save-direct-message">{{_ "Create" }}</button>
+				<button class="button cancel-direct-message">{{_ "Cancel" }}</button>
 			</div>
 		</div>
 	</div>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/listChannelsFlex.html b/packages/rocketchat-ui-sidenav/side-nav/listChannelsFlex.html
index 6f45cfe662edcd03c447fc90457b204e0b676008..1e13c7323e6dfc4603ca99474137a130208cfad8 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/listChannelsFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/listChannelsFlex.html
@@ -67,7 +67,7 @@
 	<footer>
 		<div>
 		{{#if hasPermission 'create-c'}}
-			<button class="button clean create">{{_ "Create_new"}}</button>
+			<button class="button create">{{_ "Create_new"}}</button>
 		{{/if}}
 		</div>
 	</footer>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/listCombinedFlex.html b/packages/rocketchat-ui-sidenav/side-nav/listCombinedFlex.html
index 8f8f502d9d13dcef515d2e6990f20a79c6b95742..ec27b4764d44d2b9ba6ef7340233490c191669de 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/listCombinedFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/listCombinedFlex.html
@@ -75,7 +75,7 @@
 	<footer>
 		<div>
 		{{#if canCreate}}
-			<button class="button clean create">{{_ "Create_new"}}</button>
+			<button class="button create">{{_ "Create_new"}}</button>
 		{{/if}}
 		</div>
 	</footer>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.html b/packages/rocketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.html
index 5e2cc7e73308f996b9ac1455e0a194637d9bebb3..7f032f25df85689fdd1f071eed66e4f2b29518b4 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.html
@@ -52,7 +52,7 @@
 	</div>
 	<footer>
 		<div>
-			<button class="button clean create">{{_ "Create_new"}}</button>
+			<button class="button create">{{_ "Create_new"}}</button>
 		</div>
 	</footer>
 </template>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html b/packages/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html
index 6d2bd5bbef0f3b90147f34482feb30873525d2ee..a434b28ce8b977218ae55fd6d1ea8f5665bddefb 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html
@@ -51,8 +51,8 @@
 				</div>
 			{{/if}}
 			<div class="input-submit">
-				<button class="button clean primary save-pvt-group">{{_ "Create" }}</button>
-				<button class="button clean cancel-pvt-group">{{_ "Cancel" }}</button>
+				<button class="button primary save-pvt-group">{{_ "Create" }}</button>
+				<button class="button cancel-pvt-group">{{_ "Cancel" }}</button>
 			</div>
 		</div>
 	</div>