diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
index 62fcbedaae..916d6920ff 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
@@ -1423,7 +1423,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                                 videoNode = current
                             } else {
                                 videoNode = AvatarVideoNode(context: item.context)
-                                strongSelf.avatarNode.addSubnode(videoNode)
+                                strongSelf.avatarNode.contentNode.addSubnode(videoNode)
                                 strongSelf.avatarVideoNode = videoNode
                             }
                             videoNode.update(peer: peer, photo: photo, size: CGSize(width: 60.0, height: 60.0))
diff --git a/submodules/TelegramUI/Components/Chat/ChatAvatarNavigationNode/Sources/ChatAvatarNavigationNode.swift b/submodules/TelegramUI/Components/Chat/ChatAvatarNavigationNode/Sources/ChatAvatarNavigationNode.swift
index 44a09a8595..66b4bfd8f7 100644
--- a/submodules/TelegramUI/Components/Chat/ChatAvatarNavigationNode/Sources/ChatAvatarNavigationNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatAvatarNavigationNode/Sources/ChatAvatarNavigationNode.swift
@@ -150,7 +150,7 @@ public final class ChatAvatarNavigationNode: ASDisplayNode {
                             videoNode = current
                         } else {
                             videoNode = AvatarVideoNode(context: context)
-                            strongSelf.avatarNode.addSubnode(videoNode)
+                            strongSelf.avatarNode.contentNode.addSubnode(videoNode)
                             strongSelf.avatarVideoNode = videoNode
                         }
                         videoNode.update(peer: peer, photo: photo, size: CGSize(width: 37.0, height: 37.0))
diff --git a/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift b/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
index 637356d4aa..b17be544a9 100644
--- a/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
+++ b/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
@@ -326,7 +326,7 @@ public final class ChatListNavigationBar: Component {
                 
                 if offset <= -60.0 {
                     storiesUnlocked = true
-                } else if offset >= -56.0 {
+                } else if offset >= -58.0 {
                     storiesUnlocked = false
                 } else {
                     storiesUnlocked = self.storiesUnlocked
diff --git a/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
index bb601c6744..62fc5e9647 100644
--- a/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
@@ -556,7 +556,7 @@ final class ChatMessageAvatarHeaderNode: ListViewItemHeaderNode {
                             videoNode = current
                         } else {
                             videoNode = AvatarVideoNode(context: context)
-                            strongSelf.avatarNode.addSubnode(videoNode)
+                            strongSelf.avatarNode.contentNode.addSubnode(videoNode)
                             strongSelf.avatarVideoNode = videoNode
                         }
                         videoNode.update(peer: EnginePeer(peer), photo: photo, size: CGSize(width: 38.0, height: 38.0))
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
index 20f7ed27d1..9955dbcff8 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
@@ -712,7 +712,7 @@ final class PeerInfoAvatarTransformContainerNode: ASDisplayNode {
                         shape.path = maskPath.cgPath
                         videoNode.layer.mask = shape
                                                             
-                        self.containerNode.addSubnode(videoNode)
+                        self.avatarNode.contentNode.addSubnode(videoNode)
                     }
                 } else {
                     if let markupNode = self.markupNode {
@@ -751,7 +751,7 @@ final class PeerInfoAvatarTransformContainerNode: ASDisplayNode {
                 if self.canAttachVideo {
                     videoNode.updateLayout(size: self.avatarNode.frame.size, transition: .immediate)
                 }
-                videoNode.frame = self.avatarNode.frame
+                videoNode.frame = self.avatarNode.contentNode.bounds
                 
                 if isExpanded == videoNode.canAttachContent {
                     self.isExpanded = isExpanded
@@ -1115,7 +1115,7 @@ final class PeerInfoEditingAvatarNode: ASDisplayNode {
             if self.canAttachVideo {
                 videoNode.updateLayout(size: self.avatarNode.frame.size, transition: .immediate)
             }
-            videoNode.frame = self.avatarNode.frame
+            videoNode.frame = self.avatarNode.contentNode.bounds
             
             if isEditing != videoNode.canAttachContent {
                 videoNode.canAttachContent = isEditing && self.canAttachVideo