diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
index ea24c4f4fa..d3db768b56 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -228,7 +228,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
         }
         
         if let telegramDice = self.telegramDice {
-            let animationNode = ManagedDiceAnimationNode(context: item.context, emoji: telegramDice.emoji)
+            let animationNode = ManagedDiceAnimationNode(context: item.context, emoji: telegramDice.emoji.strippedEmoji)
             if !item.message.effectivelyIncoming(item.context.account.peerId) {
                 animationNode.success = { [weak self] in
                     if let strongSelf = self, let item = strongSelf.item {
diff --git a/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift b/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift
index 9738f2b163..1c03f653ec 100644
--- a/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift
+++ b/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift
@@ -72,7 +72,7 @@ private func rollingAnimationItem(account: Account, emojis: Signal<[TelegramMedi
             return .single(ManagedAnimationItem(source: .local("Darts_Aiming"), loop: true))
         case "🏀":
             return .single(ManagedAnimationItem(source: .local("Basketball_Bouncing"), loop: true))
-        case "⚽️":
+        case "⚽":
             return .single(ManagedAnimationItem(source: .local("Football_Bouncing"), loop: true))
         default:
             return animationItem(account: account, emojis: emojis, emoji: emoji, value: nil, loop: true)
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
index 66f5041b99..8be7944ed0 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
@@ -5140,6 +5140,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             })
         }
         
+        if self.isSettings {
+            contentHeight = max(contentHeight, layout.size.height + 140.0 + (self.headerNode.twoLineInfo ? 17.0 : 0.0) - layout.intrinsicInsets.bottom)
+        }
         self.scrollNode.view.contentSize = CGSize(width: layout.size.width, height: contentHeight)
         if self.isSettings {
             self.scrollNode.view.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0)