diff --git a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
index b976b4e931f1..531558e1df9d 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
@@ -7,10 +7,14 @@
 	animation-name: fadeIn;
 	animation-duration: 1s;
 
+	margin: 0 -25px;
+
 	&__wrapper {
 		overflow-x: hidden;
 		overflow-y: auto;
 
+		padding: 0 25px;
+
 		height: 100%;
 	}
 
diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index af893a638533..60eceaaa7da1 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -25,6 +25,8 @@
 
 		display: flex;
 
+		margin: 0 30px;
+
 		color: var(--modal-back-button-color);
 		align-items: center;
 	}
diff --git a/packages/rocketchat-theme/client/imports/forms/switch.css b/packages/rocketchat-theme/client/imports/forms/switch.css
index aa614e9f0a96..59cec0934adc 100644
--- a/packages/rocketchat-theme/client/imports/forms/switch.css
+++ b/packages/rocketchat-theme/client/imports/forms/switch.css
@@ -1,4 +1,6 @@
 .rc-switch {
+	padding: 0 0.25rem;
+
 	&__label {
 		display: flex;