diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 687adb5be2a0..3563ba9a5435 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -1880,8 +1880,6 @@
 	& .user {
 		display: inline-block;
 
-		margin-right: 5px;
-
 		font-family: inherit;
 		font-size: 0.875rem;
 
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ca6cb58691bc..1aa9dac16caa 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -619,10 +619,6 @@
   "Avg_response_time": "Average of Response Time",
   "away": "away",
   "Away": "Away",
-  "away_female": "away",
-  "Away_female": "Away",
-  "away_male": "away",
-  "Away_male": "Away",
   "Back": "Back",
   "Back_to_applications": "Back to applications",
   "Back_to_chat": "Back to chat",
@@ -700,10 +696,6 @@
   "Business_hours_updated": "Business hours updated",
   "busy": "busy",
   "Busy": "Busy",
-  "busy_female": "busy",
-  "Busy_female": "Busy",
-  "busy_male": "busy",
-  "Busy_male": "Busy",
   "By": "By",
   "by": "by",
   "By_author": "By __author__",
@@ -1004,11 +996,11 @@
   "Conversations_per_day": "Conversations per Day",
   "Convert": "Convert",
   "Convert_Ascii_Emojis": "Convert ASCII to Emoji",
-  "Converting_channel_to_a_team": "You are converting this Channel to a Team. All members will be kept.",
-  "Converting_team_to_channel": "Converting Team to Channel",
   "Convert_to_channel": "Convert to Channel",
+  "Converting_channel_to_a_team": "You are converting this Channel to a Team. All members will be kept.",
   "Converted__roomName__to_team": "<strong>converted</strong> #__roomName__ to a Team",
   "Converted__roomName__to_channel": "<strong>converted</strong> #__roomName__ to a Channel",
+  "Converting_team_to_channel": "Converting Team to Channel",
   "Copied": "Copied",
   "Copy": "Copy",
   "Copy_text": "Copy Text",
@@ -2352,8 +2344,6 @@
   "IRC_Private_Message": "Output of the PRIVMSG command.",
   "IRC_Quit": "Output upon quitting an IRC session.",
   "is_typing": "is typing",
-  "is_typing_female": "is typing",
-  "is_typing_male": "is typing",
   "Issue_Links": "Issue tracker links",
   "IssueLinks_Incompatible": "Warning: do not enable this and the 'Hex Color Preview' at the same time.",
   "IssueLinks_LinkTemplate": "Template for issue links",
@@ -4493,12 +4483,8 @@
   "User_is_now_an_admin": "User is now an admin",
   "User_is_unblocked": "User is unblocked",
   "User_joined_channel": "Has joined the channel.",
-  "User_joined_channel_female": "Has joined the channel.",
-  "User_joined_channel_male": "Has joined the channel.",
   "User_joined_conversation": "Has joined the conversation",
   "User_joined_team": "<strong>joined</strong> this Team",
-  "User_joined_team_female": "<strong>joined</strong> this Team",
-  "User_joined_team_male": "<strong>joined</strong> this Team",
   "User_left": "Has left the channel.",
   "User_left_team": "<strong>left</strong> this Team",
   "User_logged_out": "User is logged out",