diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index a24334281aa25..89f36607485ba 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -245,8 +245,8 @@ <h3 title="{{name}}" class="rc-user-info__name">{{> icon block="rc-header__icon"
 		{{#if canLeaveRoom}}
 		<button class="rc-button rc-button--icon rc-button--outline rc-button--cancel js-leave">{{> icon icon='sign-out'}}{{_ 'Leave'}}</button>
 		{{/if}}
-		<!-- {{#if canDeleteRoom}}
-		<button class="rc-button rc-button-outline rc-button-cancel js-delete" title="{{_ 'Delete'}}">{{> icon icon='trash'}}{{_ 'Delete'}}</button>
-		{{/if}} -->
 	</div>
+	{{#if canDeleteRoom}}
+	<button class="rc-button rc-button-outline rc-button-cancel js-delete rc-button--cancel rc-button--stack" title="{{_ 'Delete'}}">{{> icon icon='trash'}}{{_ 'Delete'}}</button>
+	{{/if}}
 </template>
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
index 3e13b3e067770..2f85b8d4389f2 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.js
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -14,7 +14,7 @@ const common = {
 		});
 
 		const roomType = room && room.t;
-		return roomType && RocketChat.roomTypes.roomTypes[room.t].canBeDeleted(room);
+		return roomType && RocketChat.roomTypes.roomTypes[roomType].canBeDeleted(room);
 	},
 	canEditRoom() {
 		const { _id } = Template.instance().room;
diff --git a/packages/rocketchat-theme/client/imports/forms/button.css b/packages/rocketchat-theme/client/imports/forms/button.css
index fc19732a90cc5..b23df6a93aab3 100644
--- a/packages/rocketchat-theme/client/imports/forms/button.css
+++ b/packages/rocketchat-theme/client/imports/forms/button.css
@@ -4,7 +4,11 @@
 	}
 
 	&--icon > svg {
-		margin: 0 5px;
+		margin: 0 5px 0 -5px;
+
+		.rtl & {
+			margin: 0 -5px 0 5px;
+		}
 
 		font-size: 20px;
 		fill: currentColor;
@@ -107,6 +111,9 @@
 		border-style: solid;
 		background: transparent;
 	}
+	&--stack {
+		width: 100%;
+	}
 
 	&.loading {
 		position: relative;