diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index f208f82f9f..10bade670d 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -7910,3 +7910,6 @@ Sorry for the inconvenience.";
 "StickerPack.EmojiCount_any" = "%@ emoji";
 
 "StickerSettings.EmojiContextInfo" = "If you archive an emoji set, you can quickly restore it later from the Archived Emoji section.";
+
+"StickerPack.CopyLinks" = "Copy Links";
+"Conversation.LinksCopied" = "Links copied to clipboard";
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift b/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
index ef35698c49..0e266423e0 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
@@ -586,7 +586,10 @@ private final class StickerPackContainer: ASDisplayNode {
                 strongSelf.controller?.present(shareController, in: .window(.root))
             }
         })))
-        items.append(.action(ContextMenuActionItem(text: strings.StickerPack_CopyLink, icon: { theme in
+        
+        let copyTitle = self.currentStickerPacks.count > 1 ? strings.StickerPack_CopyLinks : strings.StickerPack_CopyLink
+        let copyText = self.currentStickerPacks.count > 1 ? strings.Conversation_LinksCopied : strings.Conversation_LinkCopied
+        items.append(.action(ContextMenuActionItem(text: copyTitle, icon: { theme in
             return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Link"), color: theme.contextMenu.primaryColor)
         }, action: {  [weak self] _, f in
             f(.default)
@@ -595,7 +598,7 @@ private final class StickerPackContainer: ASDisplayNode {
             
             if let strongSelf = self {
                 let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .linkCopied(text: presentationData.strings.Conversation_LinkCopied), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
+                strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .linkCopied(text: copyText), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
             }
         })))
         
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index 8c5e7ef83e..a50abe0a4b 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -1093,7 +1093,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     
                     var disableTransitionAnimations = false
                     var actionsSignal: Signal<ContextController.Items, NoError> = .single(actions)
-                    if actions.tip == nil, let entitiesAttribute = message.textEntitiesAttribute {
+                    if let entitiesAttribute = message.textEntitiesAttribute {
                         var emojiFileIds: [Int64] = []
                         for entity in entitiesAttribute.entities {
                             if case let .CustomEmoji(_, fileId) = entity.type {