diff --git a/packages/rocketchat-theme/client/imports/base.less b/packages/rocketchat-theme/client/imports/base.less
index 5baac87b0d51..a81e5f797c96 100644
--- a/packages/rocketchat-theme/client/imports/base.less
+++ b/packages/rocketchat-theme/client/imports/base.less
@@ -2439,14 +2439,6 @@ label.required::after {
 				input::-webkit-file-upload-button {
 					cursor: pointer;
 				}
-
-				&.active {
-					background-color: rgb(241, 241, 241);
-
-					i {
-						.transform(rotate(90deg));
-					}
-				}
 			}
 		}
 
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index c06de97e56d5..1e76c2b20d0f 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -3,7 +3,7 @@
 		<form class="message-form" method="post" action="/">
 			{{> messagePopupConfig getPopupConfig}}
 
-			<div class="message-input">
+			<div class="message-input border-component-color">
 
 				<div class="input-message-container">
 
@@ -100,8 +100,8 @@
 				<span>~<strike>{{_ "strike"}}</strike>~</span>
 				{{/if}}
 				{{#if showMarkdownCode}}
-				<code class="inline">`{{_ "inline_code"}}`</code>
-				<code class="inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
+				<code class="code-colors inline">`{{_ "inline_code"}}`</code>
+				<code class="code-colors inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
 				{{/if}}
 				{{#if katexSyntax}}
 				<span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span>