diff --git a/submodules/Components/PagerComponent/Sources/PagerComponent.swift b/submodules/Components/PagerComponent/Sources/PagerComponent.swift
index 022076b735..42f1c2b07d 100644
--- a/submodules/Components/PagerComponent/Sources/PagerComponent.swift
+++ b/submodules/Components/PagerComponent/Sources/PagerComponent.swift
@@ -14,7 +14,7 @@ open class PagerExternalTopPanelContainer: SparseContainerView {
 }
 
 public protocol PagerContentViewWithBackground: UIView {
-    func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition)
+    func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, bottomPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition)
 }
 
 public protocol PagerTopPanelView: UIView {
@@ -721,6 +721,7 @@ public final class PagerComponent<ChildEnvironmentType: Equatable, TopPanelEnvir
             }
             
             var bottomPanelOffset: CGFloat = 0.0
+            var bottomPanelHeight: CGFloat = 0.0
             if let bottomPanel = component.bottomPanel {
                 let bottomPanelView: ComponentHostView<PagerComponentPanelEnvironment<TopPanelEnvironment>>
                 var bottomPanelTransition = panelStateTransition
@@ -767,14 +768,27 @@ public final class PagerComponent<ChildEnvironmentType: Equatable, TopPanelEnvir
                     bottomPanelOffset = bottomPanelSize.height
                 }
                 
-                panelStateTransition.setFrame(view: bottomPanelView, frame: CGRect(origin: CGPoint(x: 0.0, y: availableSize.height - bottomPanelSize.height + bottomPanelOffset), size: bottomPanelSize))
+                let bottomPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: availableSize.height - bottomPanelSize.height + bottomPanelOffset), size: bottomPanelSize)
+                
+                panelStateTransition.setFrame(view: bottomPanelView, frame: bottomPanelFrame)
+                
+                if let externalTintMaskContainer = component.externalTintMaskContainer, let bottomPanelView = bottomPanelView.componentView as? PagerTopPanelView {
+                    if bottomPanelView.tintContentMask !== externalTintMaskContainer {
+                        externalTintMaskContainer.addSubview(bottomPanelView.tintContentMask)
+                    }
+                    panelStateTransition.setFrame(view: bottomPanelView.tintContentMask, frame: bottomPanelFrame)
+                }
                 
                 contentInsets.bottom += bottomPanelSize.height
+                bottomPanelHeight = max(0.0, bottomPanelSize.height - bottomPanelOffset)
             } else {
                 if let bottomPanelView = self.bottomPanelView {
                     self.bottomPanelView = nil
                     
                     bottomPanelView.removeFromSuperview()
+                    if let bottomPanelView = bottomPanelView.componentView as? PagerTopPanelView {
+                        bottomPanelView.tintContentMask.removeFromSuperview()
+                    }
                 }
                 
                 self.bottomPanelHeight = 0.0
@@ -961,7 +975,7 @@ public final class PagerComponent<ChildEnvironmentType: Equatable, TopPanelEnvir
                         }
                         
                         if let contentViewWithBackground = contentView.view.componentView as? PagerContentViewWithBackground {
-                            contentViewWithBackground.pagerUpdateBackground(backgroundFrame: backgroundFrame, topPanelHeight: topPanelHeight, externalTintMaskContainer: component.externalTintMaskContainer == nil ? nil : contentView.tintMaskContainer, transition: contentTransition)
+                            contentViewWithBackground.pagerUpdateBackground(backgroundFrame: CGRect(origin: CGPoint(), size: CGSize(width: backgroundFrame.width, height: availableSize.height)), topPanelHeight: topPanelHeight, bottomPanelHeight: bottomPanelHeight, externalTintMaskContainer: component.externalTintMaskContainer == nil ? nil : contentView.tintMaskContainer, transition: contentTransition)
                         }
                     }
                 }
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiPagerContentComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiPagerContentComponent.swift
index bb3da9d9c9..3f94209d63 100644
--- a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiPagerContentComponent.swift
+++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiPagerContentComponent.swift
@@ -4054,7 +4054,7 @@ public final class EmojiPagerContentComponent: Component {
             self.state?.updated(transition: ComponentTransition(animation: .curve(duration: 0.4, curve: .spring)).withUserData(ContentAnimation(type: .groupExpanded(id: groupId))))
         }
         
-        public func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition) {
+        public func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, bottomPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition) {
             guard let component = self.component, let keyboardChildEnvironment = self.keyboardChildEnvironment, let pagerEnvironment = self.pagerEnvironment else {
                 return
             }
@@ -4151,11 +4151,11 @@ public final class EmojiPagerContentComponent: Component {
                     if self.mirrorContentClippingView?.layer.mask != tintFadingMaskLayer {
                         self.mirrorContentClippingView?.layer.mask = tintFadingMaskLayer
                     }
-                    let maskFrame = CGRect(origin: CGPoint(x: 0.0, y: topPanelHeight - 40.0), size: backgroundFrame.size)
+                    let maskFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: backgroundFrame.size)
                     transition.setFrame(layer: maskLayer, frame: maskFrame)
                     transition.setFrame(layer: tintFadingMaskLayer, frame: maskLayer.frame)
-                    maskLayer.update(size: maskFrame.size, transition: transition)
-                    tintFadingMaskLayer.update(size: maskFrame.size, transition: transition)
+                    maskLayer.update(size: maskFrame.size, topPanelHeight: topPanelHeight, bottomPanelHeight: bottomPanelHeight, transition: transition)
+                    tintFadingMaskLayer.update(size: maskFrame.size, topPanelHeight: topPanelHeight, bottomPanelHeight: bottomPanelHeight, transition: transition)
                 }
             } else if component.warpContentsOnEdges {
                 self.backgroundView.isHidden = true
@@ -5001,7 +5001,7 @@ private final class FadingMaskLayer: SimpleLayer {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func update(size: CGSize, transition: ComponentTransition) {
+    func update(size: CGSize, topPanelHeight: CGFloat, bottomPanelHeight: CGFloat, transition: ComponentTransition) {
         let gradientHeight: CGFloat = 66.0
         if self.gradientLayer.contents == nil {
             if !self.isHard {
@@ -5022,10 +5022,9 @@ private final class FadingMaskLayer: SimpleLayer {
         transition.setFrame(layer: self.gradientLayer, frame: CGRect(origin: .zero, size: CGSize(width: size.width, height: gradientHeight)))
         transition.setFrame(layer: self.gradientFillLayer, frame: self.gradientLayer.frame)
         if self.isHard {
-            let hardHeight: CGFloat = 40.0
-            transition.setFrame(layer: self.fillLayer, frame: CGRect(origin: CGPoint(x: 0.0, y: hardHeight), size: CGSize(width: size.width, height: size.height - hardHeight)))
+            transition.setFrame(layer: self.fillLayer, frame: CGRect(origin: CGPoint(x: 0.0, y: topPanelHeight), size: CGSize(width: size.width, height: size.height - topPanelHeight - bottomPanelHeight)))
         } else {
-            transition.setFrame(layer: self.fillLayer, frame: CGRect(origin: CGPoint(x: 0.0, y: gradientHeight), size: CGSize(width: size.width, height: size.height - gradientHeight)))
+            transition.setFrame(layer: self.fillLayer, frame: CGRect(origin: CGPoint(x: 0.0, y: gradientHeight + topPanelHeight - 40.0), size: CGSize(width: size.width, height: size.height - gradientHeight)))
         }
     }
 }
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboard.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboard.swift
index 1f9034b864..aa67230486 100644
--- a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboard.swift
+++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboard.swift
@@ -401,16 +401,13 @@ public final class EntityKeyboardComponent: Component {
                 ))))
                 contentIcons.append(PagerComponentContentIcon(id: "masks", imageName: "Chat/Input/Media/EntityInputMasksIcon", title: component.strings.EmojiInput_TabMasks))
                 if let _ = component.maskContent?.inputInteractionHolder.inputInteraction?.openStickerSettings {
-                    contentAccessoryRightButtons.append(AnyComponentWithIdentity(id: "masks", component: AnyComponent(Button(
-                        content: AnyComponent(BundleIconComponent(
-                            name: "Chat/Input/Media/EntityInputSettingsIcon",
-                            tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                            maxSize: nil
-                        )),
+                    contentAccessoryRightButtons.append(AnyComponentWithIdentity(id: "masks", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                        icon: "Chat/Input/Media/EntityInputSettingsIcon",
+                        color: component.theme.chat.inputPanel.inputControlColor,
                         action: {
                             maskContent.inputInteractionHolder.inputInteraction?.openStickerSettings?()
                         }
-                    ).minSize(CGSize(width: 38.0, height: 38.0)))))
+                    ))))
                 }
             }
             
@@ -418,16 +415,13 @@ public final class EntityKeyboardComponent: Component {
                 contents.append(AnyComponentWithIdentity(id: "gifs", component: AnyComponent(gifContent)))
                 contentIcons.append(PagerComponentContentIcon(id: "gifs", imageName: "Chat/Input/Media/EntityInputGifsIcon", title: component.strings.EmojiInput_TabGifs))
                 if let addImage = component.stickerContent?.inputInteractionHolder.inputInteraction?.addImage {
-                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "gifs", component: AnyComponent(Button(
-                        content: AnyComponent(BundleIconComponent(
-                            name: "Media Editor/AddImage",
-                            tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                            maxSize: nil
-                        )),
+                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "gifs", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                        icon: "Media Editor/AddImage",
+                        color: component.theme.chat.inputPanel.inputControlColor,
                         action: {
                             addImage()
                         }
-                    ).minSize(CGSize(width: 38.0, height: 38.0)))))
+                    ))))
                 }
             }
             
@@ -541,28 +535,22 @@ public final class EntityKeyboardComponent: Component {
                 ))))
                 contentIcons.append(PagerComponentContentIcon(id: "stickers", imageName: "Chat/Input/Media/EntityInputStickersIcon", title: component.strings.EmojiInput_TabStickers))
                 if let _ = component.stickerContent?.inputInteractionHolder.inputInteraction?.openStickerSettings {
-                    contentAccessoryRightButtons.append(AnyComponentWithIdentity(id: "stickers", component: AnyComponent(Button(
-                        content: AnyComponent(BundleIconComponent(
-                            name: "Chat/Input/Media/EntityInputSettingsIcon",
-                            tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                            maxSize: nil
-                        )),
+                    contentAccessoryRightButtons.append(AnyComponentWithIdentity(id: "stickers", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                        icon: "Chat/Input/Media/EntityInputSettingsIcon",
+                        color: component.theme.chat.inputPanel.inputControlColor,
                         action: {
                             stickerContent.inputInteractionHolder.inputInteraction?.openStickerSettings?()
                         }
-                    ).minSize(CGSize(width: 38.0, height: 38.0)))))
+                    ))))
                 }
                 if let addImage = component.stickerContent?.inputInteractionHolder.inputInteraction?.addImage {
-                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "stickers", component: AnyComponent(Button(
-                        content: AnyComponent(BundleIconComponent(
-                            name: "Media Editor/AddImage",
-                            tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                            maxSize: nil
-                        )),
+                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "stickers", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                        icon: "Media Editor/AddImage",
+                        color: component.theme.chat.inputPanel.inputControlColor,
                         action: {
                             addImage()
                         }
-                    ).minSize(CGSize(width: 38.0, height: 38.0)))))
+                    ))))
                 }
             }
             
@@ -659,48 +647,40 @@ public final class EntityKeyboardComponent: Component {
                 ))))
                 contentIcons.append(PagerComponentContentIcon(id: "emoji", imageName: "Chat/Input/Media/EntityInputEmojiIcon", title: component.strings.EmojiInput_TabEmoji))
                 if let _ = deleteBackwards {
-                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "emoji", component: AnyComponent(Button(
-                        content: AnyComponent(BundleIconComponent(
-                            name: "Chat/Input/Media/EntityInputGlobeIcon",
-                            tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                            maxSize: nil
-                        )),
+                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "emoji", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                        icon: "Chat/Input/Media/EntityInputGlobeIcon",
+                        color: component.theme.chat.inputPanel.inputControlColor,
                         action: { [weak self] in
                             guard let strongSelf = self, let component = strongSelf.component else {
                                 return
                             }
                             component.switchToTextInput()
                         }
-                    ).minSize(CGSize(width: 38.0, height: 38.0)))))
+                    ))))
                 } else if let addImage = component.emojiContent?.inputInteractionHolder.inputInteraction?.addImage {
-                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "emoji", component: AnyComponent(Button(
-                        content: AnyComponent(BundleIconComponent(
-                            name: "Media Editor/AddImage",
-                            tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                            maxSize: nil
-                        )),
+                    contentAccessoryLeftButtons.append(AnyComponentWithIdentity(id: "emoji", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                        icon: "Media Editor/AddImage",
+                        color: component.theme.chat.inputPanel.inputControlColor,
                         action: {
                             addImage()
                         }
-                    ).minSize(CGSize(width: 38.0, height: 38.0)))))
+                    ))))
                 }
             }
                             
             if let _ = deleteBackwards {
-                contentAccessoryRightButtons.append(AnyComponentWithIdentity(id: "emoji", component: AnyComponent(Button(
-                    content: AnyComponent(BundleIconComponent(
-                        name: "Chat/Input/Media/EntityInputClearIcon",
-                        tintColor: component.theme.chat.inputMediaPanel.panelIconColor,
-                        maxSize: nil
-                    )),
+                contentAccessoryRightButtons.append(AnyComponentWithIdentity(id: "emoji", component: AnyComponent(EntityKeyboardBottomPanelButton(
+                    icon: "Chat/Input/Media/EntityInputClearIcon",
+                    color: component.theme.chat.inputPanel.inputControlColor,
                     action: {
                         deleteBackwards?()
                         AudioServicesPlaySystemSound(1155)
+                    },
+                    holdAction: {
+                        deleteBackwards?()
+                        AudioServicesPlaySystemSound(1155)
                     }
-                ).withHoldAction({ _ in
-                    deleteBackwards?()
-                    AudioServicesPlaySystemSound(1155)
-                }).minSize(CGSize(width: 38.0, height: 38.0)))))
+                ))))
             }
             
             let panelHideBehavior: PagerComponentPanelHideBehavior
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelButton.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelButton.swift
new file mode 100644
index 0000000000..faa4d87d05
--- /dev/null
+++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelButton.swift
@@ -0,0 +1,176 @@
+import Foundation
+import UIKit
+import Display
+import ComponentFlow
+import PagerComponent
+import ComponentDisplayAdapters
+import BundleIconComponent
+import GlassBackgroundComponent
+import AppBundle
+
+final class EntityKeyboardBottomPanelButton: Component {
+    let icon: String
+    let color: UIColor
+    let action: () -> Void
+    let holdAction: (() -> Void)?
+    
+    init(
+        icon: String,
+        color: UIColor,
+        action: @escaping () -> Void,
+        holdAction: (() -> Void)? = nil
+    ) {
+        self.icon = icon
+        self.color = color
+        self.action = action
+        self.holdAction = holdAction
+    }
+    
+    static func ==(lhs: EntityKeyboardBottomPanelButton, rhs: EntityKeyboardBottomPanelButton) -> Bool {
+        if lhs.icon != rhs.icon {
+            return false
+        }
+        if lhs.color != rhs.color {
+            return false
+        }
+        if (lhs.holdAction == nil) != (rhs.holdAction == nil) {
+            return false
+        }
+        return true
+    }
+    
+    final class View: HighlightTrackingButton {
+        let iconView: GlassBackgroundView.ContentImageView
+        let tintMaskContainer: UIView
+
+        private var holdActionTriggerred: Bool = false
+        private var holdActionTimer: Timer?
+        
+        var component: EntityKeyboardBottomPanelButton?
+
+        private var currentIsHighlighted: Bool = false {
+            didSet {
+                if self.currentIsHighlighted != oldValue {
+                    self.updateAlpha(transition: .immediate)
+                }
+            }
+        }
+        
+        override init(frame: CGRect) {
+            self.iconView = GlassBackgroundView.ContentImageView()
+            self.iconView.isUserInteractionEnabled = false
+            
+            self.tintMaskContainer = UIView()
+            self.tintMaskContainer.addSubview(self.iconView.tintMask)
+            
+            super.init(frame: frame)
+
+            self.addSubview(self.iconView)
+            
+            self.addTarget(self, action: #selector(self.pressed), for: .touchUpInside)
+        }
+        
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+        deinit {
+            self.holdActionTimer?.invalidate()
+        }
+        
+        @objc private func pressed() {
+            if self.holdActionTriggerred {
+                self.holdActionTriggerred = false
+            } else {
+                self.component?.action()
+            }
+        }
+
+        override public func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
+            self.currentIsHighlighted = true
+            
+            self.holdActionTriggerred = false
+            
+            if self.component?.holdAction != nil {
+                self.holdActionTriggerred = true
+                self.component?.action()
+                
+                self.holdActionTimer?.invalidate()
+                let holdActionTimer = Timer(timeInterval: 0.5, repeats: false, block: { [weak self] _ in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.holdActionTimer?.invalidate()
+                    strongSelf.component?.holdAction?()
+                    strongSelf.beginExecuteHoldActionTimer()
+                })
+                self.holdActionTimer = holdActionTimer
+                RunLoop.main.add(holdActionTimer, forMode: .common)
+            }
+            
+            return super.beginTracking(touch, with: event)
+        }
+        
+        private func beginExecuteHoldActionTimer() {
+            self.holdActionTimer?.invalidate()
+            let holdActionTimer = Timer(timeInterval: 0.1, repeats: true, block: { [weak self] _ in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.component?.holdAction?()
+            })
+            self.holdActionTimer = holdActionTimer
+            RunLoop.main.add(holdActionTimer, forMode: .common)
+        }
+        
+        override public func endTracking(_ touch: UITouch?, with event: UIEvent?) {
+            self.currentIsHighlighted = false
+            
+            self.holdActionTimer?.invalidate()
+            self.holdActionTimer = nil
+            
+            super.endTracking(touch, with: event)
+        }
+        
+        override public func cancelTracking(with event: UIEvent?) {
+            self.currentIsHighlighted = false
+            
+            self.holdActionTimer?.invalidate()
+            self.holdActionTimer = nil
+            
+            super.cancelTracking(with: event)
+        }
+
+        private func updateAlpha(transition: ComponentTransition) {
+            let alpha: CGFloat = self.currentIsHighlighted ? 0.6 : 1.0
+            transition.setAlpha(view: self.iconView, alpha: alpha)
+        }
+        
+        func update(component: EntityKeyboardBottomPanelButton, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+            if self.component?.icon != component.icon {
+                self.iconView.image = UIImage(bundleImageName: component.icon)?.withRenderingMode(.alwaysTemplate)
+            }
+
+            self.component = component
+
+            self.iconView.tintColor = component.color
+            
+            let size = CGSize(width: 38.0, height: 38.0)
+            
+            if let image = self.iconView.image {
+                let iconFrame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) * 0.5), y: floor((size.height - image.size.height) * 0.5)), size: image.size)
+                self.iconView.frame = iconFrame
+            }
+            
+            return size
+        }
+    }
+    
+    func makeView() -> View {
+        return View(frame: CGRect())
+    }
+    
+    func update(view: View, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+        return view.update(component: self, availableSize: availableSize, state: state, environment: environment, transition: transition)
+    }
+}
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelComponent.swift
index 7a62ca691c..5db313c31f 100644
--- a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelComponent.swift
+++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelComponent.swift
@@ -7,6 +7,7 @@ import TelegramPresentationData
 import TelegramCore
 import ComponentDisplayAdapters
 import BundleIconComponent
+import GlassBackgroundComponent
 
 private final class BottomPanelIconComponent: Component {
     let title: String
@@ -41,14 +42,18 @@ private final class BottomPanelIconComponent: Component {
     }
     
     final class View: UIView {
-        let contentView: UIImageView
+        let contentView: GlassBackgroundView.ContentImageView
+        let tintMaskContainer: UIView
         
         var component: BottomPanelIconComponent?
         
         override init(frame: CGRect) {
-            self.contentView = UIImageView()
+            self.contentView = GlassBackgroundView.ContentImageView()
             self.contentView.isUserInteractionEnabled = false
             
+            self.tintMaskContainer = UIView()
+            self.tintMaskContainer.addSubview(self.contentView.tintMask)
+            
             super.init(frame: frame)
             
             self.addSubview(self.contentView)
@@ -84,7 +89,7 @@ private final class BottomPanelIconComponent: Component {
             let textSize = self.contentView.image?.size ?? CGSize()
             let size = CGSize(width: textSize.width + textInset * 2.0, height: 28.0)
             
-            let color = component.isHighlighted ? component.theme.chat.inputMediaPanel.panelHighlightedIconColor : component.theme.chat.inputMediaPanel.panelIconColor
+            let color = component.theme.chat.inputPanel.inputControlColor
             
             if self.contentView.tintColor != color {
                 if !transition.animation.isImmediate {
@@ -139,7 +144,7 @@ final class EntityKeyboardBottomPanelComponent: Component {
         return true
     }
     
-    final class View: UIView {
+    final class View: UIView, PagerTopPanelView {
         private final class AccessoryButtonView {
             let id: AnyHashable
             var component: AnyComponent<Empty>
@@ -154,25 +159,44 @@ final class EntityKeyboardBottomPanelComponent: Component {
         
         private let backgroundView: BlurredBackgroundView
         private let separatorView: UIView
+        private let tintSeparatorView: UIView
         private var leftAccessoryButton: AccessoryButtonView?
         private var rightAccessoryButton: AccessoryButtonView?
         
         private var iconViews: [AnyHashable: ComponentHostView<Empty>] = [:]
         private var highlightedIconBackgroundView: UIView
+        private var highlightedTintIconBackgroundView: UIView
+        
+        let tintContentMask: UIView
         
         private var component: EntityKeyboardBottomPanelComponent?
         
         override init(frame: CGRect) {
+            self.tintContentMask = UIView()
+            
             self.backgroundView = BlurredBackgroundView(color: .clear, enableBlur: true, customBlurRadius: 10.0)
             
             self.separatorView = UIView()
             self.separatorView.isUserInteractionEnabled = false
+            self.tintSeparatorView = UIView()
+            self.tintSeparatorView.isUserInteractionEnabled = false
+            self.tintSeparatorView.backgroundColor = UIColor(white: 0.0, alpha: 0.7)
+            
+            self.tintContentMask.addSubview(self.tintSeparatorView)
             
             self.highlightedIconBackgroundView = UIView()
             self.highlightedIconBackgroundView.isUserInteractionEnabled = false
             self.highlightedIconBackgroundView.layer.cornerRadius = 10.0
             self.highlightedIconBackgroundView.clipsToBounds = true
             
+            self.highlightedTintIconBackgroundView = UIView()
+            self.highlightedTintIconBackgroundView.isUserInteractionEnabled = false
+            self.highlightedTintIconBackgroundView.layer.cornerRadius = 10.0
+            self.highlightedTintIconBackgroundView.clipsToBounds = true
+            self.highlightedTintIconBackgroundView.backgroundColor = UIColor(white: 0.0, alpha: 0.1)
+            
+            self.tintContentMask.addSubview(self.highlightedTintIconBackgroundView)
+            
             super.init(frame: frame)
             
             self.addSubview(self.backgroundView)
@@ -186,7 +210,8 @@ final class EntityKeyboardBottomPanelComponent: Component {
         
         func update(component: EntityKeyboardBottomPanelComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<EnvironmentType>, transition: ComponentTransition) -> CGSize {
             if self.component?.theme !== component.theme {
-                self.separatorView.backgroundColor = component.theme.chat.inputPanel.panelSeparatorColor
+                self.separatorView.backgroundColor = component.theme.list.itemPlainSeparatorColor.withMultipliedAlpha(0.5)
+                
                 self.backgroundView.updateColor(color: component.theme.chat.inputPanel.panelBackgroundColor.withMultipliedAlpha(1.0), transition: .immediate)
                 self.highlightedIconBackgroundView.backgroundColor = component.theme.chat.inputMediaPanel.panelHighlightedIconBackgroundColor
             }
@@ -232,7 +257,14 @@ final class EntityKeyboardBottomPanelComponent: Component {
                     environment: {},
                     containerSize: CGSize(width: .greatestFiniteMagnitude, height: intrinsicHeight)
                 )
-                leftAccessoryButtonTransition.setFrame(view: leftAccessoryButton.view, frame: CGRect(origin: CGPoint(x: component.containerInsets.left + 2.0, y: accessoryButtonOffset), size: leftAccessoryButtonSize))
+                let leftAccessoryButtonFrame = CGRect(origin: CGPoint(x: component.containerInsets.left + 2.0, y: accessoryButtonOffset), size: leftAccessoryButtonSize)
+                leftAccessoryButtonTransition.setFrame(view: leftAccessoryButton.view, frame: leftAccessoryButtonFrame)
+                if let leftAccessoryButtonView = leftAccessoryButton.view.componentView as? PagerTopPanelView {
+                    if leftAccessoryButtonView.tintContentMask.superview == nil {
+                        self.tintContentMask.addSubview(leftAccessoryButtonView.tintContentMask)
+                    }
+                    leftAccessoryButtonTransition.setFrame(view: leftAccessoryButtonView.tintContentMask, frame: leftAccessoryButtonFrame)
+                }
             } else {
                 self.leftAccessoryButton = nil
             }
@@ -240,18 +272,29 @@ final class EntityKeyboardBottomPanelComponent: Component {
             if previousLeftAccessoryButton?.view !== self.leftAccessoryButton?.view {
                 if case .none = transition.animation {
                     previousLeftAccessoryButton?.view.removeFromSuperview()
+                    if let previousLeftAccessoryButton = previousLeftAccessoryButton?.view.componentView as? PagerTopPanelView {
+                        previousLeftAccessoryButton.tintContentMask.removeFromSuperview()
+                    }
                 } else {
                     if let previousLeftAccessoryButton = previousLeftAccessoryButton {
                         let previousLeftAccessoryButtonView = previousLeftAccessoryButton.view
                         previousLeftAccessoryButtonView.layer.animateScale(from: 1.0, to: 0.01, duration: 0.2, removeOnCompletion: false)
                         previousLeftAccessoryButtonView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak previousLeftAccessoryButtonView] _ in
                             previousLeftAccessoryButtonView?.removeFromSuperview()
+                            if let previousLeftAccessoryButton = previousLeftAccessoryButtonView?.componentView as? PagerTopPanelView {
+                                previousLeftAccessoryButton.tintContentMask.removeFromSuperview()
+                            }
                         })
                     }
                     
                     if let leftAccessoryButtonView = self.leftAccessoryButton?.view {
                         leftAccessoryButtonView.layer.animateScale(from: 0.01, to: 1.0, duration: 0.2)
                         leftAccessoryButtonView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                        
+                        if let leftAccessoryButtonView = leftAccessoryButtonView.componentView as? PagerTopPanelView {
+                            leftAccessoryButtonView.tintContentMask.layer.animateScale(from: 0.01, to: 1.0, duration: 0.2)
+                            leftAccessoryButtonView.tintContentMask.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                        }
                     }
                 }
             }
@@ -284,7 +327,15 @@ final class EntityKeyboardBottomPanelComponent: Component {
                     environment: {},
                     containerSize: CGSize(width: .greatestFiniteMagnitude, height: intrinsicHeight)
                 )
-                rightAccessoryButtonTransition.setFrame(view: rightAccessoryButton.view, frame: CGRect(origin: CGPoint(x: availableSize.width - component.containerInsets.right - 2.0 - rightAccessoryButtonSize.width, y: accessoryButtonOffset), size: rightAccessoryButtonSize))
+                
+                let rightAccessoryButtonFrame = CGRect(origin: CGPoint(x: availableSize.width - component.containerInsets.right - 2.0 - rightAccessoryButtonSize.width, y: accessoryButtonOffset), size: rightAccessoryButtonSize)
+                rightAccessoryButtonTransition.setFrame(view: rightAccessoryButton.view, frame: rightAccessoryButtonFrame)
+                if let rightAccessoryButtonView = rightAccessoryButton.view.componentView as? PagerTopPanelView {
+                    if rightAccessoryButtonView.tintContentMask.superview == nil {
+                        self.tintContentMask.addSubview(rightAccessoryButtonView.tintContentMask)
+                    }
+                    rightAccessoryButtonTransition.setFrame(view: rightAccessoryButtonView.tintContentMask, frame: rightAccessoryButtonFrame)
+                }
             } else {
                 self.rightAccessoryButton = nil
             }
@@ -292,18 +343,29 @@ final class EntityKeyboardBottomPanelComponent: Component {
             if previousRightAccessoryButton?.view !== self.rightAccessoryButton?.view {
                 if case .none = transition.animation {
                     previousRightAccessoryButton?.view.removeFromSuperview()
+                    if let previousRightAccessoryButtonView = previousRightAccessoryButton?.view.componentView as? PagerTopPanelView {
+                        previousRightAccessoryButtonView.tintContentMask.removeFromSuperview()
+                    }
                 } else {
                     if let previousRightAccessoryButton = previousRightAccessoryButton {
                         let previousRightAccessoryButtonView = previousRightAccessoryButton.view
                         previousRightAccessoryButtonView.layer.animateScale(from: 1.0, to: 0.01, duration: 0.2, removeOnCompletion: false)
                         previousRightAccessoryButtonView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak previousRightAccessoryButtonView] _ in
                             previousRightAccessoryButtonView?.removeFromSuperview()
+                            if let previousRightAccessoryButtonView = previousRightAccessoryButtonView?.componentView as? PagerTopPanelView {
+                                previousRightAccessoryButtonView.tintContentMask.removeFromSuperview()
+                            }
                         })
                     }
                     
                     if let rightAccessoryButtonView = self.rightAccessoryButton?.view {
                         rightAccessoryButtonView.layer.animateScale(from: 0.01, to: 1.0, duration: 0.2)
                         rightAccessoryButtonView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                        
+                        if let rightAccessoryButtonView = rightAccessoryButtonView.componentView as? PagerTopPanelView {
+                            rightAccessoryButtonView.tintContentMask.layer.animateScale(from: 0.01, to: 1.0, duration: 0.2)
+                            rightAccessoryButtonView.tintContentMask.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                        }
                     }
                 }
             }
@@ -369,12 +431,22 @@ final class EntityKeyboardBottomPanelComponent: Component {
                     let iconFrame = CGRect(origin: nextIconOrigin, size: iconInfo.size)
                     iconInfo.transition.setFrame(view: iconView, frame: iconFrame, completion: nil)
                     
+                    if let iconView = iconView.componentView as? BottomPanelIconComponent.View {
+                        if iconView.tintMaskContainer.superview == nil {
+                            self.tintContentMask.addSubview(iconView.tintMaskContainer)
+                        }
+                        iconInfo.transition.setFrame(view: iconView.tintMaskContainer, frame: iconFrame, completion: nil)
+                    }
+                    
                     if let activeContentId = activeContentId, activeContentId == icon.id {
                         self.highlightedIconBackgroundView.isHidden = false
+                        self.highlightedTintIconBackgroundView.isHidden = false
                         transition.setFrame(view: self.highlightedIconBackgroundView, frame: iconFrame)
+                        transition.setFrame(view: self.highlightedTintIconBackgroundView, frame: iconFrame)
                         
                         let cornerRadius: CGFloat = min(iconFrame.width, iconFrame.height) / 2.0
                         transition.setCornerRadius(layer: self.highlightedIconBackgroundView.layer, cornerRadius: cornerRadius)
+                        transition.setCornerRadius(layer: self.highlightedTintIconBackgroundView.layer, cornerRadius: cornerRadius)
                     }
                     
                     nextIconOrigin.x += iconInfo.size.width + iconSpacing
@@ -397,9 +469,10 @@ final class EntityKeyboardBottomPanelComponent: Component {
             }
             
             transition.setFrame(view: self.separatorView, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: availableSize.width, height: UIScreenPixel)))
+            transition.setFrame(view: self.tintSeparatorView, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: availableSize.width, height: UIScreenPixel)))
             
             transition.setFrame(view: self.backgroundView, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: availableSize.width, height: height)))
-            self.backgroundView.update(size: CGSize(width: availableSize.width, height: height), transition: transition.containedViewLayoutTransition)
+            //self.backgroundView.update(size: CGSize(width: availableSize.width, height: height), transition: transition.containedViewLayoutTransition)
             
             self.component = component
             
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/GifPagerContentComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/GifPagerContentComponent.swift
index 0899c92b11..203f4da517 100644
--- a/submodules/TelegramUI/Components/EntityKeyboard/Sources/GifPagerContentComponent.swift
+++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/GifPagerContentComponent.swift
@@ -867,7 +867,7 @@ public final class GifPagerContentComponent: Component {
             }
         }
         
-        public func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition) {
+        public func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, bottomPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition) {
             if let externalTintMaskContainer {
                 if self.mirrorSearchHeaderContainer.superview !== externalTintMaskContainer {
                     externalTintMaskContainer.addSubview(self.mirrorSearchHeaderContainer)