diff --git a/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
index d6c9f0dd2e..3fa59cf22c 100644
--- a/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
@@ -418,7 +418,7 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
             return .openMessage
         }
         
-        if let backgroundNode = self.backgroundNode, backgroundNode.frame.contains(point.offsetBy(dx: 0.0, dy: -10.0)) {
+        if let backgroundNode = self.backgroundNode, backgroundNode.frame.contains(point) {
             return .openMessage
         } else {
             return .none
diff --git a/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
index 946202a582..c163e938b1 100644
--- a/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
@@ -366,7 +366,7 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
         self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
         
         if let icon = self.iconNode.image {
-            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 9.0), size: icon.size)
+            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 10.0), size: icon.size)
         }
         
         var imageTextInset: CGFloat = 0.0
diff --git a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
index a95ac172d8..f45fdc528d 100644
--- a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
@@ -281,7 +281,7 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
         self.validLayout = (size, interfaceState)
 
         let bounds = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: 45.0))
-        let inset: CGFloat = interfaceState.renderedPeer == nil ? 19.0 : 55.0
+        let inset: CGFloat = 55.0
         let leftInset: CGFloat = inset
         let rightInset: CGFloat = inset
         let textLineInset: CGFloat = 10.0
@@ -297,7 +297,7 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
         self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
 
         if let icon = self.iconNode.image {
-            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 9.0), size: icon.size)
+            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 10.0), size: icon.size)
         }
         
         let titleSize = self.titleNode.updateLayout(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset, height: bounds.size.height))
diff --git a/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
index 0f75590bbb..ddb7dca857 100644
--- a/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
@@ -264,7 +264,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
         }
         
         if let icon = self.iconNode.image {
-            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 9.0), size: icon.size)
+            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 10.0), size: icon.size)
         }
         
         var imageTextInset: CGFloat = 0.0
diff --git a/submodules/TelegramUI/Sources/WebpagePreviewAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/WebpagePreviewAccessoryPanelNode.swift
index 672dfb2e37..27ac9eb311 100644
--- a/submodules/TelegramUI/Sources/WebpagePreviewAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/WebpagePreviewAccessoryPanelNode.swift
@@ -165,7 +165,7 @@ final class WebpagePreviewAccessoryPanelNode: AccessoryPanelNode {
         self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
         
         if let icon = self.iconNode.image {
-            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 9.0), size: icon.size)
+            self.iconNode.frame = CGRect(origin: CGPoint(x: 7.0, y: 10.0), size: icon.size)
         }
         
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)