diff --git a/submodules/Display/Source/CAAnimationUtils.swift b/submodules/Display/Source/CAAnimationUtils.swift
index 11d512fa51..6240ea033e 100644
--- a/submodules/Display/Source/CAAnimationUtils.swift
+++ b/submodules/Display/Source/CAAnimationUtils.swift
@@ -104,7 +104,7 @@ public extension CALayer {
             
             return animation
         } else if timingFunction == kCAMediaTimingFunctionSpring {
-            if #available(iOS 26.0, *) {
+            if #available(iOS 26.0, *), abs(duration - 0.3832) <= 0.0001 {
                 let animation = make26SpringAnimationImpl(keyPath, duration)
                 animation.fromValue = from
                 animation.toValue = to
diff --git a/submodules/TelegramUI/Components/TabBarComponent/Sources/TabBarComponent.swift b/submodules/TelegramUI/Components/TabBarComponent/Sources/TabBarComponent.swift
index e836ccbc63..9b89c814e5 100644
--- a/submodules/TelegramUI/Components/TabBarComponent/Sources/TabBarComponent.swift
+++ b/submodules/TelegramUI/Components/TabBarComponent/Sources/TabBarComponent.swift
@@ -91,12 +91,19 @@ public final class TabBarComponent: Component {
             
             if #available(iOS 26.0, *) {
                 self.nativeTabBar = UITabBar()
+                self.nativeTabBar?.traitOverrides.verticalSizeClass = .compact
+                self.nativeTabBar?.traitOverrides.horizontalSizeClass = .compact
             } else {
                 self.nativeTabBar = nil
             }
             
             super.init(frame: frame)
             
+            if #available(iOS 17.0, *) {
+                self.traitOverrides.verticalSizeClass = .compact
+                self.traitOverrides.horizontalSizeClass = .compact
+            }
+            
             self.addSubview(self.contextGestureContainerView)
             
             if let nativeTabBar = self.nativeTabBar {