diff --git a/submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift b/submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift
index d148d5ce77..16bb1ed6ea 100644
--- a/submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift
+++ b/submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift
@@ -420,7 +420,7 @@ public final class GiftItemComponent: Component {
             }
             
             var animationTransition = transition
-            if self.animationFile != animationFile, let emoji {
+            if self.animationLayer == nil || self.animationFile != animationFile, let emoji {
                 animationTransition = .immediate
                 self.animationFile = animationFile
                 if let animationLayer = self.animationLayer {
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNavigationButtonContainerNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNavigationButtonContainerNode.swift
index 98202da6c3..58e1dbcf3d 100644
--- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNavigationButtonContainerNode.swift
+++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNavigationButtonContainerNode.swift
@@ -236,9 +236,13 @@ final class PeerInfoHeaderNavigationButtonContainerNode: SparseNode {
                     buttonNode.alpha = 0.0
                     transition.updateAlpha(node: buttonNode, alpha: alphaFactor * alphaFactor)
                     
-                    transition.updateSublayerTransformOffset(layer: buttonNode.layer, offset: CGPoint(x: accumulatedRightButtonOffset, y: 0.0))
-                    if self.backgroundContentColor.alpha != 0.0 {
-                        accumulatedRightButtonOffset -= 6.0
+                    if !spec.isForExpandedView {
+                        transition.updateSublayerTransformOffset(layer: buttonNode.layer, offset: CGPoint(x: accumulatedRightButtonOffset, y: 0.0))
+                        if self.backgroundContentColor.alpha != 0.0 {
+                            accumulatedRightButtonOffset -= 6.0
+                        }
+                    } else {
+                        transition.updateSublayerTransformOffset(layer: buttonNode.layer, offset: .zero)
                     }
                 } else {
                     transition.updateFrameAdditiveToCenter(node: buttonNode, frame: buttonFrame)