From 67279c1b4805376caea29986209e3949b2a05d9a Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Tue, 10 Jan 2023 04:49:45 +0100
Subject: [PATCH] Forums: Various fixes 5 (#2271)

---
 src/components/middle/composer/CustomEmojiPicker.tsx | 2 +-
 src/components/middle/composer/StickerSet.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/middle/composer/CustomEmojiPicker.tsx b/src/components/middle/composer/CustomEmojiPicker.tsx
index b8dbafb7b..b8c55dd0b 100644
--- a/src/components/middle/composer/CustomEmojiPicker.tsx
+++ b/src/components/middle/composer/CustomEmojiPicker.tsx
@@ -296,7 +296,7 @@ const CustomEmojiPicker: FC<OwnProps & StateProps> = ({
             shouldRender={activeSetIndex >= i - 1 && activeSetIndex <= i + 1}
             isSavedMessages={isSavedMessages}
             shouldHideRecentHeader={withDefaultTopicIcons}
-            withDefaultTopicIcon={withDefaultTopicIcons}
+            withDefaultTopicIcon={stickerSet.id === RECENT_SYMBOL_SET_ID}
             isCustomEmojiPicker
             isCurrentUserPremium={isCurrentUserPremium}
             onStickerSelect={handleEmojiSelect}
diff --git a/src/components/middle/composer/StickerSet.tsx b/src/components/middle/composer/StickerSet.tsx
index 6eebb4367..46b82cfdf 100644
--- a/src/components/middle/composer/StickerSet.tsx
+++ b/src/components/middle/composer/StickerSet.tsx
@@ -48,7 +48,7 @@ type OwnProps = {
 
 const STICKER_MARGIN = IS_SINGLE_COLUMN_LAYOUT ? 8 : 16;
 const EMOJI_MARGIN = IS_SINGLE_COLUMN_LAYOUT ? 8 : 10;
-const CONTAINER_PADDING = 8;
+const CONTAINER_PADDING = IS_SINGLE_COLUMN_LAYOUT ? 8 : 0;
 
 const ITEMS_PER_ROW_FALLBACK = 8;