diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index b90fb354947..3228c1cb502 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -1099,12 +1099,9 @@ label.required:after {
     			display: inline-block;
 			}
 		}
-		&.label-top {
-			position: relative;
-			i {
-				position: absolute;
-				left: 7px;
-				top: 26px;
+		&.no-icon {
+			input {
+				padding: 0 8px;
 			}
 		}
 	}
diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
index ba15de74f57..5cbc16396ee 100755
--- a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
+++ b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
@@ -102,6 +102,11 @@ blockquote:before {
 			border-color: fade(@primary-background-contrast, 50%);
 		}
 	}
+	.input.checkbox.toggle {
+		input:checked + label:before {
+			background-color: @primary-action-color;
+		}
+	}
 }
 
 .flex-tab {
diff --git a/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html b/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
index 145bbed5915..5cd08d27b01 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
@@ -7,10 +7,9 @@
 	<div class="content">
 		<div class="wrapper">
 			<h4>{{_ "Create_new" }}</h4>
-			<div class="input-line label-top">
+			<div class="input-line no-icon">
 				<span>{{_ "Name"}}</span>
 				<input type="text" id="channel-name" class="required" dir="auto" placeholder="{{_ 'Enter_name_here'}}">
-				<i class="icon-hash"></i>
 			</div>
 			<div class="input-line toggle">
 				<span>{{_ "Private"}}</span>
@@ -26,10 +25,9 @@
 					<label for="channel-ro"></label>
 				</div>
 			</div>
-			<div class="input-line label-top">
+			<div class="input-line no-icon">
 				<label for="channel-members">{{_ "Select_users"}}</label>
 				{{> inputAutocomplete settings=autocompleteSettings id="channel-members" class="search" placeholder=(_ "Search_by_username") autocomplete="off"}}
-				<i class="icon-search"></i>
 				<ul class="selected-users">
 					{{#each selectedUsers}}
 						<li>{{.}} <i class="icon-cancel remove-room-member"></i></li>
diff --git a/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html b/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html
index 78dd378cac3..93d2597fee2 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/directMessagesFlex.html
@@ -7,7 +7,7 @@
 	<div class="content">
 		<div class="wrapper">
 			<h4>{{_ "Create_new"}}</h4>
-			<div class="input-line">
+			<div class="input-line no-icon">
 				<label for="who">{{_ "Select_user" }}</label>
 				{{> inputAutocomplete settings=autocompleteSettings id="who" class="required search" autocomplete="off" placeholder=(_ "Search_by_username")}}
 			</div>