diff --git a/submodules/PremiumUI/Sources/PremiumDemoScreen.swift b/submodules/PremiumUI/Sources/PremiumDemoScreen.swift
index 6031f0cb16..2c80a1cb54 100644
--- a/submodules/PremiumUI/Sources/PremiumDemoScreen.swift
+++ b/submodules/PremiumUI/Sources/PremiumDemoScreen.swift
@@ -904,7 +904,7 @@ private final class DemoSheetContent: CombinedComponent {
                             PageComponent(
                                 content: AnyComponent(PhoneDemoComponent(
                                     context: component.context,
-                                    position: .top,
+                                    position: .bottom,
                                     videoFile: configuration.videos["animated_emoji"],
                                     decoration: .emoji
                                 )),
diff --git a/submodules/PremiumUI/Sources/PremiumIntroScreen.swift b/submodules/PremiumUI/Sources/PremiumIntroScreen.swift
index 1eda525bf1..823359e6bd 100644
--- a/submodules/PremiumUI/Sources/PremiumIntroScreen.swift
+++ b/submodules/PremiumUI/Sources/PremiumIntroScreen.swift
@@ -255,11 +255,11 @@ private struct PremiumIntroConfiguration {
             .noAds,
             .uniqueReactions,
             .premiumStickers,
+            .animatedEmoji,
             .advancedChatManagement,
             .profileBadge,
             .animatedUserpics,
-            .appIcons,
-            .animatedEmoji
+            .appIcons
         ])
     }
     
@@ -288,9 +288,6 @@ private struct PremiumIntroConfiguration {
             if perks.count < 4 {
                 perks = PremiumIntroConfiguration.defaultValue.perks
             }
-            if !perks.contains(.appIcons) {
-                perks.append(.appIcons)
-            }
             return PremiumIntroConfiguration(perks: perks)
         } else {
             return .defaultValue
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index dd544f6faf..47c422d6e8 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -1106,11 +1106,15 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             |> then(
                                 context.engine.stickers.resolveInlineStickers(fileIds: emojiFileIds)
                                 |> mapToSignal { files -> Signal<ContextController.Items, NoError> in
-                                    var packReferences = Set<StickerPackReference>()
+                                    var packReferences: [StickerPackReference] = []
+                                    var existingIds = Set<Int64>()
                                     for (_, file) in files {
                                         loop: for attribute in file.attributes {
                                             if case let .CustomEmoji(_, _, packReference) = attribute, let packReference = packReference {
-                                                packReferences.insert(packReference)
+                                                if case let .id(id, _) = packReference, !existingIds.contains(id) {
+                                                    packReferences.append(packReference)
+                                                    existingIds.insert(id)
+                                                }
                                                 break loop
                                             }
                                         }