diff --git a/packages/rocketchat-theme/client/imports/base.less b/packages/rocketchat-theme/client/imports/base.less
index 32183dc2db5..727679cfc0a 100644
--- a/packages/rocketchat-theme/client/imports/base.less
+++ b/packages/rocketchat-theme/client/imports/base.less
@@ -3020,6 +3020,10 @@ body:not(.is-cordova) {
 		min-height: 26px;
 		padding: 5px 15px 0 37px;
 
+		&:not(.system) .message-cog-container {
+			display: inline-block;
+		}
+
 		.body {
 			display: inline;
 
@@ -3087,10 +3091,6 @@ body:not(.is-cordova) {
 			}
 		}
 	}
-
-	.message-cog-container {
-		display: inline-block;
-	}
 }
 
 // FLEX-TAB and FLEX-TAB views