diff --git a/Telegram/NotificationService/Serialization.m b/Telegram/NotificationService/Serialization.m
index f886eaeea4..3d92dca7b9 100644
--- a/Telegram/NotificationService/Serialization.m
+++ b/Telegram/NotificationService/Serialization.m
@@ -3,7 +3,7 @@
 @implementation Serialization
 
 - (NSUInteger)currentLayer {
-    return 114;
+    return 117;
 }
 
 - (id _Nullable)parseMessage:(NSData * _Nullable)data {
diff --git a/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
index a973bd9e7d..e316234f0b 100644
--- a/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
@@ -669,7 +669,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                         }
                     }
                     
-                    if !strongSelf.reactionNodes.isEmpty {
+                    /*if !strongSelf.reactionNodes.isEmpty {
                         if strongSelf.reactionButtonNode == nil {
                             let reactionButtonNode = HighlightTrackingButtonNode()
                             strongSelf.reactionButtonNode = reactionButtonNode
@@ -695,7 +695,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                     } else if let reactionButtonNode = strongSelf.reactionButtonNode {
                         strongSelf.reactionButtonNode = nil
                         reactionButtonNode.removeFromSupernode()
-                    }
+                    }*/
                 }
             })
         }
diff --git a/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift b/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
index cd5135ebb5..faf078dc30 100644
--- a/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
+++ b/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
@@ -14,7 +14,13 @@ import AppBundle
 func paneGifSearchForQuery(account: Account, query: String, updateActivity: ((Bool) -> Void)?) -> Signal<[FileMediaReference]?, NoError> {
     let delayRequest = true
     
-    let contextBot = resolvePeerByName(account: account, name: "gif")
+    let contextBot = account.postbox.transaction { transaction -> String in
+        let configuration = currentSearchBotsConfiguration(transaction: transaction)
+        return configuration.gifBotUsername ?? "gif"
+    }
+    |> mapToSignal { botName -> Signal<PeerId?, NoError> in
+        return resolvePeerByName(account: account, name: botName)
+    }
     |> mapToSignal { peerId -> Signal<Peer?, NoError> in
         if let peerId = peerId {
             return account.postbox.loadedPeerWithId(peerId)
@@ -78,7 +84,7 @@ func paneGifSearchForQuery(account: Account, query: String, updateActivity: ((Bo
                     }
                     
                     if type == "gif", let thumbnailResource = imageResource, let content = content, let dimensions = content.dimensions {
-                        let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: uniqueId ?? 0), partialReference: nil, resource: content.resource, previewRepresentations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: thumbnailResource)], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: dimensions, flags: [])])
+                        let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: uniqueId ?? 0), partialReference: nil, resource: thumbnailResource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: dimensions, flags: [])])
                         references.append(FileMediaReference.standalone(media: file))
                     }
                 case let .internalReference(_, _, _, _, _, _, file, _):