diff --git a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
index da6911a3a5..95ba00a378 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
@@ -927,60 +927,63 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                     globalExpandType = .none
                 }
                 
-                let lowercasedQuery = finalQuery.lowercased()
-                if presentationData.strings.DialogList_SavedMessages.lowercased().hasPrefix(lowercasedQuery) || "saved messages".hasPrefix(lowercasedQuery) {
-                    if !existingPeerIds.contains(accountPeer.id), filteredPeer(accountPeer, accountPeer) {
-                        existingPeerIds.insert(accountPeer.id)
-                        entries.append(.localPeer(accountPeer, nil, nil, index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, localExpandType))
-                        index += 1
-                    }
-                }
-                
-                var numberOfLocalPeers = 0
-                for renderedPeer in foundLocalPeers.peers {
-                    if case .expand = localExpandType, numberOfLocalPeers >= 5 {
-                        break
+                if let _ = messageTags {
+                } else {
+                    let lowercasedQuery = finalQuery.lowercased()
+                    if presentationData.strings.DialogList_SavedMessages.lowercased().hasPrefix(lowercasedQuery) || "saved messages".hasPrefix(lowercasedQuery) {
+                        if !existingPeerIds.contains(accountPeer.id), filteredPeer(accountPeer, accountPeer) {
+                            existingPeerIds.insert(accountPeer.id)
+                            entries.append(.localPeer(accountPeer, nil, nil, index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, localExpandType))
+                            index += 1
+                        }
                     }
                     
-                    if let peer = renderedPeer.peers[renderedPeer.peerId], peer.id != context.account.peerId, filteredPeer(peer, accountPeer) {
-                        if !existingPeerIds.contains(peer.id) {
-                            existingPeerIds.insert(peer.id)
-                            var associatedPeer: Peer?
-                            if let associatedPeerId = peer.associatedPeerId {
-                                associatedPeer = renderedPeer.peers[associatedPeerId]
+                    var numberOfLocalPeers = 0
+                    for renderedPeer in foundLocalPeers.peers {
+                        if case .expand = localExpandType, numberOfLocalPeers >= 5 {
+                            break
+                        }
+                        
+                        if let peer = renderedPeer.peers[renderedPeer.peerId], peer.id != context.account.peerId, filteredPeer(peer, accountPeer) {
+                            if !existingPeerIds.contains(peer.id) {
+                                existingPeerIds.insert(peer.id)
+                                var associatedPeer: Peer?
+                                if let associatedPeerId = peer.associatedPeerId {
+                                    associatedPeer = renderedPeer.peers[associatedPeerId]
+                                }
+                                entries.append(.localPeer(peer, associatedPeer, foundLocalPeers.unread[peer.id], index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, localExpandType))
+                                index += 1
+                                numberOfLocalPeers += 1
                             }
-                            entries.append(.localPeer(peer, associatedPeer, foundLocalPeers.unread[peer.id], index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, localExpandType))
+                        }
+                    }
+                    
+                    for peer in foundRemotePeers.0 {
+                        if case .expand = localExpandType, numberOfLocalPeers >= 5 {
+                            break
+                        }
+                        
+                        if !existingPeerIds.contains(peer.peer.id), filteredPeer(peer.peer, accountPeer) {
+                            existingPeerIds.insert(peer.peer.id)
+                            entries.append(.localPeer(peer.peer, nil, nil, index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, localExpandType))
                             index += 1
                             numberOfLocalPeers += 1
                         }
                     }
-                }
-                
-                for peer in foundRemotePeers.0 {
-                    if case .expand = localExpandType, numberOfLocalPeers >= 5 {
-                        break
-                    }
-                    
-                    if !existingPeerIds.contains(peer.peer.id), filteredPeer(peer.peer, accountPeer) {
-                        existingPeerIds.insert(peer.peer.id)
-                        entries.append(.localPeer(peer.peer, nil, nil, index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, localExpandType))
-                        index += 1
-                        numberOfLocalPeers += 1
-                    }
-                }
 
-                var numberOfGlobalPeers = 0
-                index = 0
-                for peer in foundRemotePeers.1 {
-                    if case .expand = globalExpandType, numberOfGlobalPeers >= 3 {
-                        break
-                    }
-                    
-                    if !existingPeerIds.contains(peer.peer.id), filteredPeer(peer.peer, accountPeer) {
-                        existingPeerIds.insert(peer.peer.id)
-                        entries.append(.globalPeer(peer, nil, index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, globalExpandType))
-                        index += 1
-                        numberOfGlobalPeers += 1
+                    var numberOfGlobalPeers = 0
+                    index = 0
+                    for peer in foundRemotePeers.1 {
+                        if case .expand = globalExpandType, numberOfGlobalPeers >= 3 {
+                            break
+                        }
+                        
+                        if !existingPeerIds.contains(peer.peer.id), filteredPeer(peer.peer, accountPeer) {
+                            existingPeerIds.insert(peer.peer.id)
+                            entries.append(.globalPeer(peer, nil, index, presentationData.theme, presentationData.strings, presentationData.nameSortOrder, presentationData.nameDisplayOrder, globalExpandType))
+                            index += 1
+                            numberOfGlobalPeers += 1
+                        }
                     }
                 }
                 
diff --git a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
index 22e0f39a3a..8961bf8c87 100644
--- a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
+++ b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
@@ -1005,8 +1005,10 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
         self.updateButtonsMode()
         self.updateDimVisibility()
         
-        if self.incomingVideoViewRequested && self.outgoingVideoViewRequested {
-            self.displayedCameraTooltip = true
+        if self.incomingVideoViewRequested || self.outgoingVideoViewRequested {
+            if self.incomingVideoViewRequested && self.outgoingVideoViewRequested {
+                self.displayedCameraTooltip = true
+            }
             self.displayedCameraConfirmation = true
         }
         if self.incomingVideoViewRequested && !self.outgoingVideoViewRequested && !self.displayedCameraTooltip && (self.toastContent?.isEmpty ?? true) {
diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
index 2aa29887cd..065fbfd7b5 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
@@ -308,10 +308,13 @@ public final class PrincipalThemeEssentialGraphics {
             self.clockFreeMinImage = emptyImage
             self.dateAndStatusMediaBackground = emptyImage
             self.dateAndStatusFreeBackground = emptyImage
-            self.incomingDateAndStatusImpressionIcon = emptyImage
-            self.outgoingDateAndStatusImpressionIcon = emptyImage
-            self.mediaImpressionIcon = emptyImage
-            self.freeImpressionIcon = emptyImage
+                
+            let impressionCountImage = UIImage(bundleImageName: "Chat/Message/ImpressionCount")!
+            self.incomingDateAndStatusImpressionIcon = generateTintedImage(image: impressionCountImage, color: theme.message.incoming.secondaryTextColor)!
+            self.outgoingDateAndStatusImpressionIcon = generateTintedImage(image: impressionCountImage, color: theme.message.outgoing.secondaryTextColor)!
+            self.mediaImpressionIcon = generateTintedImage(image: impressionCountImage, color: .white)!
+            self.freeImpressionIcon = generateTintedImage(image: impressionCountImage, color: serviceColor.primaryText)!
+            
             self.radialIndicatorFileIconIncoming = emptyImage
             self.radialIndicatorFileIconOutgoing = emptyImage
         } else {
diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
index 04e3869f03..b27c890dba 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -1109,7 +1109,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                             |> deliverOnMainQueue
                         }
                         
-                        let beatingHearts: [UInt32] = [0x2764, 0x1F90E, 0x1F9E1, 0x1F49A, 0x1F49C, 0x1F49B, 0x1F5A4, 0x1F90D]
+                        let beatingHearts: [UInt32] = [0x2764, 0x1F90E, 0x1F9E1, 0x1F499, 0x1F49A, 0x1F49C, 0x1F49B, 0x1F5A4, 0x1F90D]
                         let peach = 0x1F351
                         
                         if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, beatingHearts.contains(firstScalar.value) || firstScalar.value == peach {
diff --git a/submodules/TelegramUI/Sources/PrefetchManager.swift b/submodules/TelegramUI/Sources/PrefetchManager.swift
index f95df18e5b..314a814da1 100644
--- a/submodules/TelegramUI/Sources/PrefetchManager.swift
+++ b/submodules/TelegramUI/Sources/PrefetchManager.swift
@@ -38,7 +38,7 @@ private final class PrefetchManagerImpl {
         |> map { networkType -> MediaAutoDownloadNetworkType in
             switch networkType {
                 case .none, .cellular:
-                    return.cellular
+                    return .cellular
                 case .wifi:
                     return .wifi
             }