From 3fa222ad614219f2936de2595ee699a395f96686 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 2 Jan 2018 19:46:54 -0200
Subject: [PATCH] Fix custom emoji size on sidebar item

---
 .../client/imports/components/emojiPicker.css                 | 4 ++--
 .../client/imports/components/sidebar/sidebar-item.css        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/emojiPicker.css b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
index c0e7050ecbf0..30574c4681e9 100644
--- a/packages/rocketchat-theme/client/imports/components/emojiPicker.css
+++ b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
@@ -254,6 +254,6 @@
 }
 
 .emoji.big {
-	width: 44px !important;
-	height: 44px !important;
+	width: 44px;
+	height: 44px;
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 779e02e6c689..a4713450b11a 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -229,7 +229,8 @@
 		font-size: 12px;
 		line-height: normal;
 
-		& .emojione {
+		& .emojione,
+		& .emoji, {
 			width: 13px !important;
 			min-width: 13px;
 			height: 13px !important;