diff --git a/submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift b/submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift
index 23fe009606..b7cd11f010 100644
--- a/submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift
+++ b/submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift
@@ -975,6 +975,11 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega
         }
         self.otherButton.addTarget(self, action: #selector(self.otherButtonPressed), forControlEvents: .touchUpInside)
         
+        var ignoreGiftThemes = false
+        if let data = self.context.currentAppConfiguration.with({ $0 }).data, let _ = data["ios_killswitch_disable_gift_themes"] {
+            ignoreGiftThemes = true
+        }
+        
         self.disposable.set(combineLatest(
             queue: Queue.mainQueue(),
             self.context.engine.themes.getChatThemes(accountManager: self.context.sharedContext.accountManager),
@@ -1028,6 +1033,9 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega
             ))
                         
             var giftThemes = uniqueGiftChatThemesState.themes
+            if ignoreGiftThemes {
+                giftThemes = []
+            }
             var existingIds = Set<String>()
             if let initiallySelectedTheme, case .gift = initiallySelectedTheme {
                 let initialThemeIndex = giftThemes.firstIndex(where: { $0.id == initiallySelectedTheme.id })
diff --git a/submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift b/submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift
index df5bce8ccf..ae78039072 100644
--- a/submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift
+++ b/submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift
@@ -1171,7 +1171,12 @@ private final class GiftViewSheetContent: CombinedComponent {
                     self?.shareGift()
                 })))
                 
-                if gift.flags.contains(.isThemeAvailable) {
+                var ignoreGiftThemes = false
+                if let data = self.context.currentAppConfiguration.with({ $0 }).data, let _ = data["ios_killswitch_disable_gift_themes"] {
+                    ignoreGiftThemes = true
+                }
+                
+                if gift.flags.contains(.isThemeAvailable) && !ignoreGiftThemes {
                     items.append(.action(ContextMenuActionItem(text: presentationData.strings.Gift_View_Context_SetAsTheme, icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/ApplyTheme"), color: theme.contextMenu.primaryColor)
                     }, action: { [weak self] c, _ in
diff --git a/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsScreen.swift b/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsScreen.swift
index fa0006025b..52d60129f8 100644
--- a/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsScreen.swift
+++ b/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsScreen.swift
@@ -673,7 +673,6 @@ final class StarsTransactionsScreenComponent: Component {
             let withdrawAvailable = (self.revenueState?.balances.overallRevenue.amount.value ?? 0) > 0
              
             if component.starsContext.ton {
-                //TODO:localize
                 let proceedsSize = self.proceedsView.update(
                     transition: .immediate,
                     component: AnyComponent(ListSectionComponent(