diff --git a/submodules/Camera/Sources/Camera.swift b/submodules/Camera/Sources/Camera.swift
index 5ba6baab29..0f56597b9a 100644
--- a/submodules/Camera/Sources/Camera.swift
+++ b/submodules/Camera/Sources/Camera.swift
@@ -256,7 +256,7 @@ private final class CameraContext {
                 self._positionPromise.set(targetPosition)
                 self.modeChange = .position
                 
-                mainDeviceContext.configure(position: targetPosition, previewView: self.simplePreviewView, audio: self.initialConfiguration.audio, photo: self.initialConfiguration.photo, metadata: self.initialConfiguration.metadata)
+                mainDeviceContext.configure(position: targetPosition, previewView: self.simplePreviewView, audio: self.initialConfiguration.audio, photo: self.initialConfiguration.photo, metadata: self.initialConfiguration.metadata, preferWide: self.initialConfiguration.preferWide)
                 
                 self.queue.after(0.5) {
                     self.modeChange = .none
diff --git a/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift b/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift
index 9f932b44cf..446862b82c 100644
--- a/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift
+++ b/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift
@@ -312,7 +312,8 @@ public final class ChatTextInputMediaRecordingButton: TGModernConversationInputM
                 mediumBlobRange: (0.52, 0.87),
                 bigBlobRange: (0.57, 1.00)
             )
-            blobView.setColor(self.theme.chat.inputPanel.actionControlFillColor)
+            let theme = self.hidesOnLock ? defaultDarkColorPresentationTheme : self.theme
+            blobView.setColor(theme.chat.inputPanel.actionControlFillColor)
             self.micDecorationValue = blobView
             return blobView
         }
@@ -382,13 +383,14 @@ public final class ChatTextInputMediaRecordingButton: TGModernConversationInputM
     
     private func updateAnimation(previousMode: ChatTextInputMediaRecordingButtonMode) {
         let image: UIImage?
+        let theme = self.hidesOnLock ? defaultDarkColorPresentationTheme : self.theme
         switch self.mode {
             case .audio:
-                self.icon = PresentationResourcesChat.chatInputPanelVoiceActiveButtonImage(self.theme)
-                image = PresentationResourcesChat.chatInputPanelVoiceButtonImage(self.theme)
+                self.icon = PresentationResourcesChat.chatInputPanelVoiceActiveButtonImage(theme)
+                image = PresentationResourcesChat.chatInputPanelVoiceButtonImage(theme)
             case .video:
-                self.icon = PresentationResourcesChat.chatInputPanelVideoActiveButtonImage(self.theme)
-                image = PresentationResourcesChat.chatInputPanelVoiceButtonImage(self.theme)
+                self.icon = PresentationResourcesChat.chatInputPanelVideoActiveButtonImage(theme)
+                image = PresentationResourcesChat.chatInputPanelVoiceButtonImage(theme)
         }
         
         let size = self.bounds.size
diff --git a/submodules/TelegramUI/Components/Stories/ForwardInfoPanelComponent/Sources/ForwardInfoPanelComponent.swift b/submodules/TelegramUI/Components/Stories/ForwardInfoPanelComponent/Sources/ForwardInfoPanelComponent.swift
index 2f5ab53ea1..922c35d720 100644
--- a/submodules/TelegramUI/Components/Stories/ForwardInfoPanelComponent/Sources/ForwardInfoPanelComponent.swift
+++ b/submodules/TelegramUI/Components/Stories/ForwardInfoPanelComponent/Sources/ForwardInfoPanelComponent.swift
@@ -86,6 +86,7 @@ public final class ForwardInfoPanelComponent: Component {
             self.state = state
             
             var titleOffset: CGFloat = 0.0
+            let sideInset: CGFloat = !component.text.isEmpty ? 9.0 : 6.0
             
             let iconView: UIImageView
             if let current = self.iconView {
@@ -97,12 +98,10 @@ public final class ForwardInfoPanelComponent: Component {
                 self.addSubview(iconView)
             }
             if let image = iconView.image {
-                iconView.frame = CGRect(origin: CGPoint(x: 9.0 + UIScreenPixel, y: 5.0), size: image.size)
+                iconView.frame = CGRect(origin: CGPoint(x: sideInset + UIScreenPixel, y: 5.0), size: image.size)
             }
             titleOffset += 13.0
        
-            
-            let sideInset: CGFloat = 9.0
             let titleSize = self.title.update(
                 transition: .immediate,
                 component: AnyComponent(MultilineTextComponent(
diff --git a/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
index 379772d9a6..695fbeb214 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
@@ -83,7 +83,7 @@ func chatHistoryEntriesForView(
                 associatedThreadInfo: nil,
                 associatedStories: [:]
             )
-        } else if let peer = channelPeer as? TelegramChannel, case .broadcast = peer.info, case .member = peer.participationStatus {
+        } else if let peer = channelPeer as? TelegramChannel, case .broadcast = peer.info, case .member = peer.participationStatus, !peer.flags.contains(.isCreator) {
             joinMessage = Message(
                 stableId: UInt32.max - 1000,
                 stableVersion: 0,